[yt-svn] commit/yt: 6 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Fri Apr 12 11:32:37 PDT 2013
6 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/96d51cf76c6d/
Changeset: 96d51cf76c6d
Branch: yt
User: ngoldbaum
Date: 2013-04-09 08:10:22
Summary: Reverting a few files ot 8d14a55
Affected #: 3 files
diff -r 875b16c94eca2b2be8c522f1bef12f05094b870e -r 96d51cf76c6d883f3688ad68e65c8cf623c5025c yt/mods.py
--- a/yt/mods.py
+++ b/yt/mods.py
@@ -40,6 +40,9 @@
# also attempt to parse the command line and set up the global state of various
# operations.
+import yt.startup_tasks as __startup_tasks
+unparsed_args = __startup_tasks.unparsed_args
+
from yt.funcs import *
from yt.utilities.logger import ytLogger as mylog
from yt.utilities.performance_counters import yt_counters, time_function
@@ -143,7 +146,7 @@
# Import some helpful math utilities
from yt.utilities.math_utils import \
- ortho_find, quartiles, periodic_position
+ ortho_find, quartiles, periodic_position
# We load plugins. Keep in mind, this can be fairly dangerous -
diff -r 875b16c94eca2b2be8c522f1bef12f05094b870e -r 96d51cf76c6d883f3688ad68e65c8cf623c5025c yt/startup_tasks.py
--- a/yt/startup_tasks.py
+++ b/yt/startup_tasks.py
@@ -120,6 +120,8 @@
parallel_capable = False
if not ytcfg.getboolean("yt","__command_line"):
opts, unparsed_args = parser.parse_known_args()
+ # THIS IS NOT SUCH A GOOD IDEA:
+ #sys.argv = [a for a in unparsed_args]
if opts.parallel:
parallel_capable = turn_on_parallelism()
subparsers = parser.add_subparsers(title="subcommands",
diff -r 875b16c94eca2b2be8c522f1bef12f05094b870e -r 96d51cf76c6d883f3688ad68e65c8cf623c5025c yt/utilities/answer_testing/framework.py
--- a/yt/utilities/answer_testing/framework.py
+++ b/yt/utilities/answer_testing/framework.py
@@ -37,8 +37,8 @@
from matplotlib.testing.compare import compare_images
from nose.plugins import Plugin
from yt.testing import *
-from yt.convenience import load
from yt.config import ytcfg
+from yt.mods import *
from yt.data_objects.static_output import StaticOutput
from yt.utilities.logger import disable_stream_logging
from yt.utilities.command_line import get_yt_version
@@ -159,9 +159,6 @@
if self.store_results is False: return
self.storage.dump(self.result_storage)
- def help(self):
- return "yt answer testing support"
-
class AnswerTestStorage(object):
def __init__(self, reference_name=None, answer_name=None):
self.reference_name = reference_name
https://bitbucket.org/yt_analysis/yt/commits/7a00a8fea1f7/
Changeset: 7a00a8fea1f7
Branch: yt
User: ngoldbaum
Date: 2013-04-09 08:12:20
Summary: Forgot to revert hgignore.
Affected #: 1 file
diff -r 96d51cf76c6d883f3688ad68e65c8cf623c5025c -r 7a00a8fea1f7b982a58791d5887ae0ce8e07a7ba .hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -4,9 +4,7 @@
freetype.cfg
hdf5.cfg
png.cfg
-rockstar.cfg
yt_updater.log
-yt/analysis_modules/halo_finding/rockstar/rockstar_interface.c
yt/frontends/ramses/_ramses_reader.cpp
yt/utilities/amr_utils.c
yt/utilities/kdtree/forthonf2c.h
https://bitbucket.org/yt_analysis/yt/commits/2f0b4a6dc941/
Changeset: 2f0b4a6dc941
Branch: yt
User: ngoldbaum
Date: 2013-04-09 22:12:51
Summary: Merging with tip.
Affected #: 3 files
diff -r 7a00a8fea1f7b982a58791d5887ae0ce8e07a7ba -r 2f0b4a6dc941a717535d630e31e11c56a3734184 yt/frontends/enzo/fields.py
--- a/yt/frontends/enzo/fields.py
+++ b/yt/frontends/enzo/fields.py
@@ -138,7 +138,8 @@
return data["TotalEnergy"] - 0.5*(
data["x-velocity"]**2.0
+ data["y-velocity"]**2.0
- + data["z-velocity"]**2.0 ) - data["MagneticEnergy"]
+ + data["z-velocity"]**2.0 ) \
+ - data["MagneticEnergy"]/data["Density"]
return data["TotalEnergy"] - 0.5*(
data["x-velocity"]**2.0
diff -r 7a00a8fea1f7b982a58791d5887ae0ce8e07a7ba -r 2f0b4a6dc941a717535d630e31e11c56a3734184 yt/mods.py
--- a/yt/mods.py
+++ b/yt/mods.py
@@ -38,7 +38,12 @@
# This next item will handle most of the actual startup procedures, but it will
# also attempt to parse the command line and set up the global state of various
-# operations.
+# operations. The variable unparsed_args is not used internally but is
+# provided as a convenience for users who wish to parse arguments in scripts.
+# See http://lists.spacepope.org/pipermail/yt-dev-spacepope.org/2011-December/
+# 001727.html
+import yt.startup_tasks as __startup_tasks
+unparsed_args = __startup_tasks.unparsed_args
import yt.startup_tasks as __startup_tasks
unparsed_args = __startup_tasks.unparsed_args
https://bitbucket.org/yt_analysis/yt/commits/aad13f055e6e/
Changeset: aad13f055e6e
Branch: yt
User: ngoldbaum
Date: 2013-04-09 22:14:42
Summary: Fixing some merge errors.
Affected #: 3 files
diff -r 2f0b4a6dc941a717535d630e31e11c56a3734184 -r aad13f055e6e0fcb6ad45c2698240b3712a652f7 .hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -4,7 +4,9 @@
freetype.cfg
hdf5.cfg
png.cfg
+rockstar.cfg
yt_updater.log
+yt/analysis_modules/halo_finding/rockstar/rockstar_interface.c
yt/frontends/ramses/_ramses_reader.cpp
yt/utilities/amr_utils.c
yt/utilities/kdtree/forthonf2c.h
diff -r 2f0b4a6dc941a717535d630e31e11c56a3734184 -r aad13f055e6e0fcb6ad45c2698240b3712a652f7 yt/mods.py
--- a/yt/mods.py
+++ b/yt/mods.py
@@ -45,9 +45,6 @@
import yt.startup_tasks as __startup_tasks
unparsed_args = __startup_tasks.unparsed_args
-import yt.startup_tasks as __startup_tasks
-unparsed_args = __startup_tasks.unparsed_args
-
from yt.funcs import *
from yt.utilities.logger import ytLogger as mylog
from yt.utilities.performance_counters import yt_counters, time_function
@@ -151,7 +148,7 @@
# Import some helpful math utilities
from yt.utilities.math_utils import \
- ortho_find, quartiles, periodic_position
+ ortho_find, quartiles, periodic_position
# We load plugins. Keep in mind, this can be fairly dangerous -
diff -r 2f0b4a6dc941a717535d630e31e11c56a3734184 -r aad13f055e6e0fcb6ad45c2698240b3712a652f7 yt/utilities/answer_testing/framework.py
--- a/yt/utilities/answer_testing/framework.py
+++ b/yt/utilities/answer_testing/framework.py
@@ -37,8 +37,8 @@
from matplotlib.testing.compare import compare_images
from nose.plugins import Plugin
from yt.testing import *
+from yt.convenience import load
from yt.config import ytcfg
-from yt.mods import *
from yt.data_objects.static_output import StaticOutput
from yt.utilities.logger import disable_stream_logging
from yt.utilities.command_line import get_yt_version
@@ -159,6 +159,9 @@
if self.store_results is False: return
self.storage.dump(self.result_storage)
+ def help(self):
+ return "yt answer testing support"
+
class AnswerTestStorage(object):
def __init__(self, reference_name=None, answer_name=None):
self.reference_name = reference_name
https://bitbucket.org/yt_analysis/yt/commits/eb7dc8269fdb/
Changeset: eb7dc8269fdb
Branch: yt
User: ngoldbaum
Date: 2013-04-12 20:30:43
Summary: Falling back to hdf5-1.8.9 in the install script.
Affected #: 1 file
Diff not available.
https://bitbucket.org/yt_analysis/yt/commits/7f171073bb43/
Changeset: 7f171073bb43
Branch: yt
User: MatthewTurk
Date: 2013-04-12 20:32:30
Summary: Merged in ngoldbaum/yt (pull request #475)
Updating the dependencies in the install script
Affected #: 4 files
Diff not available.
Repository URL: https://bitbucket.org/yt_analysis/yt/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the yt-svn
mailing list