[yt-svn] commit/yt: 3 new changesets

[commits-noreply at bitbucket.org]

3 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/7be6e111993a/
Changeset:   7be6e111993a
Branch:      yt
User:        jsoishi
Date:        2013-03-25 17:56:01
Summary:     added check for MHD when computing ThermalEnergy without DualEnergy on
Affected #:  1 file

diff -r 7a62187ba23c171db740b23d0f44169e264283d7 -r 7be6e111993a46fcbd6adb204057e29c18e9780d yt/frontends/enzo/fields.py
--- a/yt/frontends/enzo/fields.py
+++ b/yt/frontends/enzo/fields.py
@@ -134,10 +134,16 @@
         if data.pf["DualEnergyFormalism"]:
             return data["GasEnergy"]
         else:
-            return data["TotalEnergy"] - 0.5*(
-                   data["x-velocity"]**2.0
-                 + data["y-velocity"]**2.0
-                 + data["z-velocity"]**2.0 )
+            if data.pf["HydroMethod"] == 4 or data.pf["HydroMethod"] == 6:
+                return data["TotalEnergy"] - 0.5*(
+                    data["x-velocity"]**2.0
+                    + data["y-velocity"]**2.0
+                    + data["z-velocity"]**2.0 ) - data["MagneticPressure"]
+            else:
+                return data["TotalEnergy"] - 0.5*(
+                    data["x-velocity"]**2.0
+                    + data["y-velocity"]**2.0
+                    + data["z-velocity"]**2.0 )
 add_field("ThermalEnergy", function=_ThermalEnergy,
           units=r"\rm{ergs}/\rm{g}")
 


https://bitbucket.org/yt_analysis/yt/commits/8c458bcc4bce/
Changeset:   8c458bcc4bce
Branch:      yt
User:        jsoishi
Date:        2013-03-25 18:10:26
Summary:     satisfying mjturk' code review.
Affected #:  1 file

diff -r 7be6e111993a46fcbd6adb204057e29c18e9780d -r 8c458bcc4bce43d2ca04442ec05dcce651011e75 yt/frontends/enzo/fields.py
--- a/yt/frontends/enzo/fields.py
+++ b/yt/frontends/enzo/fields.py
@@ -134,16 +134,16 @@
         if data.pf["DualEnergyFormalism"]:
             return data["GasEnergy"]
         else:
-            if data.pf["HydroMethod"] == 4 or data.pf["HydroMethod"] == 6:
+            if data.pf["HydroMethod"] in (4,6):
                 return data["TotalEnergy"] - 0.5*(
                     data["x-velocity"]**2.0
                     + data["y-velocity"]**2.0
                     + data["z-velocity"]**2.0 ) - data["MagneticPressure"]
-            else:
-                return data["TotalEnergy"] - 0.5*(
-                    data["x-velocity"]**2.0
-                    + data["y-velocity"]**2.0
-                    + data["z-velocity"]**2.0 )
+
+            return data["TotalEnergy"] - 0.5*(
+                data["x-velocity"]**2.0
+                + data["y-velocity"]**2.0
+                + data["z-velocity"]**2.0 )
 add_field("ThermalEnergy", function=_ThermalEnergy,
           units=r"\rm{ergs}/\rm{g}")
 


https://bitbucket.org/yt_analysis/yt/commits/c087b133da9c/
Changeset:   c087b133da9c
Branch:      yt
User:        jsoishi
Date:        2013-03-25 18:23:13
Summary:     more cleanup to enhance readability. also, caught a no-op but semantically important physics change.
Affected #:  1 file

diff -r 8c458bcc4bce43d2ca04442ec05dcce651011e75 -r c087b133da9ccdcc5b08d92f3a7d6a94efb6fcaa yt/frontends/enzo/fields.py
--- a/yt/frontends/enzo/fields.py
+++ b/yt/frontends/enzo/fields.py
@@ -130,20 +130,20 @@
 def _ThermalEnergy(field, data):
     if data.pf["HydroMethod"] == 2:
         return data["TotalEnergy"]
-    else:
-        if data.pf["DualEnergyFormalism"]:
-            return data["GasEnergy"]
-        else:
-            if data.pf["HydroMethod"] in (4,6):
-                return data["TotalEnergy"] - 0.5*(
-                    data["x-velocity"]**2.0
-                    + data["y-velocity"]**2.0
-                    + data["z-velocity"]**2.0 ) - data["MagneticPressure"]
+    
+    if data.pf["DualEnergyFormalism"]:
+        return data["GasEnergy"]
 
-            return data["TotalEnergy"] - 0.5*(
-                data["x-velocity"]**2.0
-                + data["y-velocity"]**2.0
-                + data["z-velocity"]**2.0 )
+    if data.pf["HydroMethod"] in (4,6):
+        return data["TotalEnergy"] - 0.5*(
+            data["x-velocity"]**2.0
+            + data["y-velocity"]**2.0
+            + data["z-velocity"]**2.0 ) - data["MagneticEnergy"]
+
+    return data["TotalEnergy"] - 0.5*(
+        data["x-velocity"]**2.0
+        + data["y-velocity"]**2.0
+        + data["z-velocity"]**2.0 )
 add_field("ThermalEnergy", function=_ThermalEnergy,
           units=r"\rm{ergs}/\rm{g}")

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.