Commits

Nathan Goldbaum committed 2f0b4a6 Merge

Merging with tip.

  • Participants
  • Parent commits 7a00a8f, 7ab40c0

Comments (0)

Files changed (3)

File doc/install_script.sh

File contents unchanged.

File yt/frontends/enzo/fields.py

         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
 
 # 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