[Yt-svn] yt: 2 new changesets
hg at spacepope.org
hg at spacepope.org
Tue Feb 1 19:36:27 PST 2011
hg Repository: yt
details: yt/rev/67ca50b0cc59
changeset: 3703:67ca50b0cc59
user: Matthew Turk <matthewturk at gmail.com>
date:
Tue Feb 01 22:35:44 2011 -0500
description:
Fixing ortho_ray bug
hg Repository: yt
details: yt/rev/993c49faa159
changeset: 3704:993c49faa159
user: Matthew Turk <matthewturk at gmail.com>
date:
Tue Feb 01 22:35:44 2011 -0500
description:
Fixing ortho_ray bug
diffstat:
.hgtags | 2 +
README | 2 +-
doc/install_script.sh | 126 +-
scripts/iyt | 48 +-
setup.py | 68 +-
yt/analysis_modules/halo_merger_tree/enzofof_merger_tree.py | 42 +-
yt/data_objects/analyzer_objects.py | 64 +-
yt/data_objects/api.py | 14 +-
yt/data_objects/data_containers.py | 8 +-
yt/data_objects/field_info_container.py | 10 +-
yt/data_objects/time_series.py | 82 +-
yt/frontends/ramses/_ramses_reader.cpp | 11579 +++
yt/frontends/ramses/setup.py | 9 +-
yt/mods.py | 4 +-
yt/utilities/_libconfig/AUTHORS | 5 -
yt/utilities/_libconfig/COPYING.LIB | 510 -
yt/utilities/_libconfig/README | 58 -
yt/utilities/_libconfig/README.yt | 20 -
yt/utilities/_libconfig/grammar.c | 2001 -
yt/utilities/_libconfig/grammar.h | 113 -
yt/utilities/_libconfig/libconfig.c | 1585 -
yt/utilities/_libconfig/libconfig.h | 309 -
yt/utilities/_libconfig/parsectx.h | 48 -
yt/utilities/_libconfig/scanctx.c | 171 -
yt/utilities/_libconfig/scanctx.h | 62 -
yt/utilities/_libconfig/scanner.c | 2342 -
yt/utilities/_libconfig/scanner.h | 326 -
yt/utilities/_libconfig/scanner.l | 188 -
yt/utilities/_libconfig/strbuf.c | 58 -
yt/utilities/_libconfig/strbuf.h | 40 -
yt/utilities/_libconfig/wincompat.h | 90 -
yt/utilities/amr_utils.c | 35083 ++++++++++
yt/utilities/libconfig_wrapper.pyx | 167 -
yt/utilities/logger.py | 20 +-
yt/utilities/parallel_tools/parallel_analysis_interface.py | 5 +-
yt/utilities/setup.py | 22 +-
36 files changed, 46816 insertions(+), 8465 deletions(-)
diffs (truncated from 55630 to 300 lines):
diff -r 9d1b301bc361 -r 993c49faa159 .hgtags
--- a/.hgtags Mon Jan 31 10:32:58 2011 -0500
+++ b/.hgtags Tue Feb 01 22:35:44 2011 -0500
@@ -5152,3 +5152,5 @@
0000000000000000000000000000000000000000 svn.993
fff7118f00e25731ccf37cba3082b8fcb73cf90e svn.371
0000000000000000000000000000000000000000 svn.371
+ca6e536c15a60070e6988fd472dc771a1897e170 yt-2.0
+882c41eed5dd4a3cdcbb567bcb79b833e46b1f42 yt-2.0.1
diff -r 9d1b301bc361 -r 993c49faa159 README
--- a/README Mon Jan 31 10:32:58 2011 -0500
+++ b/README Tue Feb 01 22:35:44 2011 -0500
@@ -1,4 +1,4 @@
-Hi there! You've just downloaded yt, an analysis tool for 3D Enzo adaptive
+Hi there! You've just downloaded yt, an analysis tool for Enzo adaptive
mesh refinement datasets. It's written in python and based on the NumPy and
Matplotlib components.
diff -r 9d1b301bc361 -r 993c49faa159 doc/install_script.sh
--- a/doc/install_script.sh Mon Jan 31 10:32:58 2011 -0500
+++ b/doc/install_script.sh Tue Feb 01 22:35:44 2011 -0500
@@ -17,7 +17,7 @@
DEST_SUFFIX="yt-`uname -p`"
DEST_DIR="`pwd`/${DEST_SUFFIX/ /}" # Installation location
-BRANCH="yt" # This is the branch to which we will forcibly update.
+BRANCH="stable" # This is the branch to which we will forcibly update.
# Here's where you put the HDF5 path if you like; otherwise it'll download it
# and install it on its own
@@ -489,68 +489,62 @@
cd $MY_PWD
fi
-function print_afterword
-{
- echo
- echo
- echo "========================================================================"
- echo
- echo "yt is now installed in $DEST_DIR ."
- echo "To run from this new installation, the a few variables need to be"
- echo "prepended with the following information:"
- echo
- echo "YT_DEST => $DEST_DIR"
- echo "PATH => $DEST_DIR/bin/"
- echo "PYTHONPATH => $DEST_DIR/lib/python2.6/site-packages/"
- echo "LD_LIBRARY_PATH => $DEST_DIR/lib/"
- echo
- echo "For interactive data analysis and visualization, we recommend running"
- echo "the IPython interface, which will become more fully featured with time:"
- echo
- echo "$DEST_DIR/bin/iyt"
- echo
- echo "For command line analysis run:"
- echo
- echo "$DEST_DIR/bin/yt"
- echo
- echo "Note of interest: this installation will use the directory:"
- echo " $YT_DIR"
- echo "as the source for all the YT code. This means you probably shouldn't"
- echo "delete it, but on the plus side, any changes you make there are"
- echo "automatically propagated."
- if [ $INST_HG -eq 1 ]
- then
- echo
- echo "Mercurial has also been installed:"
- echo
- echo "$DEST_DIR/bin/hg"
- echo
- fi
- if [ $INST_ENZO -eq 1 ]
- then
- echo "Enzo has also been checked out, but not built."
- echo
- echo "$DEST_DIR/src/enzo-hg-stable"
- echo
- echo "The value of YT_DEST can be used as an HDF5 installation location."
- echo "Questions about Enzo should be directed to the Enzo User List."
- echo
- fi
- echo
- echo "For support, see one of the following websites:"
- echo
- echo " http://yt.enzotools.org/wiki/"
- echo " http://yt.enzotools.org/doc/"
- echo
- echo "Please also join the mailing list:"
- echo
- echo " http://lists.spacepope.org/listinfo.cgi/yt-users-spacepope.org"
- echo
- echo "========================================================================"
- echo
- echo "Oh, look at me, still talking when there's science to do!"
- echo "Good luck, and email the user list if you run into any problems."
-}
-
-print_afterword
-print_afterword >> ${LOG_FILE}
+echo
+echo
+echo "========================================================================"
+echo
+echo "yt is now installed in $DEST_DIR ."
+echo "To run from this new installation, the a few variables need to be"
+echo "prepended with the following information:"
+echo
+echo "YT_DEST => $DEST_DIR"
+echo "PATH => $DEST_DIR/bin/"
+echo "PYTHONPATH => $DEST_DIR/lib/python2.6/site-packages/"
+echo "LD_LIBRARY_PATH => $DEST_DIR/lib/"
+echo
+echo "For interactive data analysis and visualization, we recommend running"
+echo "the IPython interface, which will become more fully featured with time:"
+echo
+echo "$DEST_DIR/bin/iyt"
+echo
+echo "For command line analysis run:"
+echo
+echo "$DEST_DIR/bin/yt"
+echo
+echo "Note of interest: this installation will use the directory:"
+echo " $YT_DIR"
+echo "as the source for all the YT code. This means you probably shouldn't"
+echo "delete it, but on the plus side, any changes you make there are"
+echo "automatically propagated."
+if [ $INST_HG -eq 1 ]
+then
+ echo
+ echo "Mercurial has also been installed:"
+ echo
+ echo "$DEST_DIR/bin/hg"
+ echo
+fi
+if [ $INST_ENZO -eq 1 ]
+then
+ echo "Enzo has also been checked out, but not built."
+ echo
+ echo "$DEST_DIR/src/enzo-hg-stable"
+ echo
+ echo "The value of YT_DEST can be used as an HDF5 installation location."
+ echo "Questions about Enzo should be directed to the Enzo User List."
+ echo
+fi
+echo
+echo "For support, see one of the following websites:"
+echo
+echo " http://yt.enzotools.org/wiki/"
+echo " http://yt.enzotools.org/doc/"
+echo
+echo "Please also join the mailing list:"
+echo
+echo " http://lists.spacepope.org/listinfo.cgi/yt-users-spacepope.org"
+echo
+echo "========================================================================"
+echo
+echo "Oh, look at me, still talking when there's science to do!"
+echo "Good luck, and email the user list if you run into any problems."
diff -r 9d1b301bc361 -r 993c49faa159 scripts/iyt
--- a/scripts/iyt Mon Jan 31 10:32:58 2011 -0500
+++ b/scripts/iyt Tue Feb 01 22:35:44 2011 -0500
@@ -1,7 +1,6 @@
#!python
-import os, re
+import os
from yt.mods import *
-from yt.data_objects.data_containers import AMRData
namespace = locals().copy()
doc = """\
@@ -266,49 +265,4 @@
#main()
-
-# Now we add some tab completers, in the vein of:
-# http://pymel.googlecode.com/svn/trunk/tools/ipymel.py
-# We'll start with some fields.
-
-def yt_fieldname_completer(self, event):
- """Match dictionary completions"""
- #print "python_matches", event.symbol
- #text = event.symbol # Not sure why this no longer works
- text = event.line
- #print repr(text)
- # Another option, seems to work great. Catches things like ''.<tab>
- #print repr(text), dir(text)
- #m = re.match(r"(\S+(\.\w+)*)\.(\w*)$", text)
- m = re.match(r"(\S+(\.\w+)*)\[[\'\\\"](\w*)$", text)
-
- if not m:
- raise IPython.ipapi.TryNext
-
- expr, attr = m.group(1, 3)
- #print "COMPLETING ON ", expr, attr
- #print type(self.Completer), dir(self.Completer)
- #print self.Completer.namespace
- #print self.Completer.global_namespace
- try:
- obj = eval(expr, self.Completer.namespace)
- except:
- try:
- obj = eval(expr, self.Completer.global_namespace)
- except:
- raise IPython.ipapi.TryNext
-
- if isinstance(obj, (AMRData, ) ):
- #print "COMPLETING ON THIS THING"
- all_fields = [f for f in sorted(
- obj.pf.h.field_list + obj.pf.h.derived_field_list)]
- #matches = self.Completer.python_matches(text)
- #print "RETURNING ", all_fields
- return all_fields
-
-
- raise IPython.ipapi.TryNext
-
-ip.set_hook('complete_command', yt_fieldname_completer , re_key = ".*" )
-
ip_shell.mainloop(sys_exit=1,banner=doc)
diff -r 9d1b301bc361 -r 993c49faa159 setup.py
--- a/setup.py Mon Jan 31 10:32:58 2011 -0500
+++ b/setup.py Tue Feb 01 22:35:44 2011 -0500
@@ -5,76 +5,10 @@
import distribute_setup
distribute_setup.use_setuptools()
-from numpy.distutils.misc_util import appendpath
-from numpy.distutils import log
-
-# Verify that we have Cython installed
-try:
- import Cython
-except ImportError as e:
- print "Received error on importing Cython:"
- print e
- print "Now attempting to install Cython"
- import pip
- rv = pip.main(["install",
- "http://yt.enzotools.org/dependencies/Cython-latest.tar.gz"])
- if rv == 1:
- print "Unable to install Cython. Please report this bug to yt-users."
- sys.exit(1)
-
-######
-# This next bit comes from Matthew Brett, to get Cython working with NumPy
-# distutils. I added a bit to get C++ Cython working.
-from os.path import join as pjoin, dirname
-from distutils.dep_util import newer_group
-from distutils.errors import DistutilsError
-
-
-def generate_a_pyrex_source(self, base, ext_name, source, extension):
- ''' Monkey patch for numpy build_src.build_src method
-
- Uses Cython instead of Pyrex.
-
- Assumes Cython is present
- '''
- if self.inplace:
- target_dir = dirname(base)
- else:
- target_dir = appendpath(self.build_src, dirname(base))
- if extension.language == "c++":
- cplus = True
- file_ext = ".cpp"
- else:
- cplus = False
- file_ext = ".c"
- target_file = pjoin(target_dir, ext_name + file_ext)
- depends = [source] + extension.depends
- if self.force or newer_group(depends, target_file, 'newer'):
- import Cython.Compiler.Main
- log.info("cythonc:> %s" % (target_file))
- self.mkpath(target_dir)
- options = Cython.Compiler.Main.CompilationOptions(
- defaults=Cython.Compiler.Main.default_options,
- include_path=extension.include_dirs,
- language=extension.language, cplus = cplus,
- output_file=target_file)
- cython_result = Cython.Compiler.Main.compile(source,
- options=options)
- if cython_result.num_errors != 0:
- raise DistutilsError("%d errors while compiling %r with Cython" \
- % (cython_result.num_errors, source))
- return target_file
-
-
-from numpy.distutils.command import build_src
-build_src.build_src.generate_a_pyrex_source = generate_a_pyrex_source
-# End snippet
-######
-
import setuptools
DATA_FILES = []
-VERSION = "2.1dev"
+VERSION = "2.0stable"
if os.path.exists('MANIFEST'): os.remove('MANIFEST')
More information about the yt-svn
mailing list