[yt-svn] commit/yt: xarthisius: Merged in atmyers/yt (pull request #2089)

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/53d2048d1cce/
Changeset:   53d2048d1cce
Branch:      yt
User:        xarthisius
Date:        2016-03-30 18:30:10+00:00
Summary:     Merged in atmyers/yt (pull request #2089)

Fix the Orion 2 field definitions. Closes #1054
Affected #:  3 files

diff -r 9625fb44ed8778de289dd42d501dc9bedc1ee1c4 -r 53d2048d1cce8017fdf9bc13d2a2705c66aa0b0c tests/tests_2.7.yaml
--- a/tests/tests_2.7.yaml
+++ b/tests/tests_2.7.yaml
@@ -5,7 +5,7 @@
   local_athena_270:
     - yt/frontends/athena
 
-  local_chombo_270:
+  local_chombo_271:
     - yt/frontends/chombo/tests/test_outputs.py
 
   local_enzo_270:

diff -r 9625fb44ed8778de289dd42d501dc9bedc1ee1c4 -r 53d2048d1cce8017fdf9bc13d2a2705c66aa0b0c yt/frontends/chombo/data_structures.py
--- a/yt/frontends/chombo/data_structures.py
+++ b/yt/frontends/chombo/data_structures.py
@@ -281,7 +281,7 @@
         self.length_unit = self.quan(1.0, "cm")
         self.mass_unit = self.quan(1.0, "g")
         self.time_unit = self.quan(1.0, "s")
-        self.magnetic_unit = self.quan(1.0, "gauss")
+        self.magnetic_unit = self.quan(np.sqrt(4.*np.pi), "gauss")
         self.velocity_unit = self.length_unit / self.time_unit
 
     def _localize(self, f, default):

diff -r 9625fb44ed8778de289dd42d501dc9bedc1ee1c4 -r 53d2048d1cce8017fdf9bc13d2a2705c66aa0b0c yt/frontends/chombo/fields.py
--- a/yt/frontends/chombo/fields.py
+++ b/yt/frontends/chombo/fields.py
@@ -84,26 +84,26 @@
         unit_system = self.ds.unit_system
         def _thermal_energy_density(field, data):
             try:
-                return data['energy-density'] - data['kinetic_energy_density'] - \
-                    data["magnetic_energy_density"]
+                return data["energy-density"] - data["kinetic_energy"] - \
+                    data["magnetic_energy"]
             except YTFieldNotFound:
-                return data['energy-density'] - data['kinetic_energy_density']
+                return data['energy-density'] - data["kinetic_energy"]
 
         def _thermal_energy(field, data):
             return data['thermal_energy_density']/data['density']
 
-        def _magnetic_energy_density(field, data):
+        def _magnetic_energy(field, data):
             ret = data["X-magnfield"]**2
             if data.ds.dimensionality > 1:
                 ret = ret + data["Y-magnfield"]**2
             if data.ds.dimensionality > 2:
                 ret = ret + data["Z-magnfield"]**2
-            return ret/2.0
+            return ret/8.0/np.pi
 
-        def _magnetic_energy(field, data):
-            return data['magnetic_energy_density']/data['density']
+        def _specific_magnetic_energy(field, data):
+            return data['specific_magnetic_energy']/data['density']
 
-        def _kinetic_energy_density(field, data):
+        def _kinetic_energy(field, data):
             p2 = data['X-momentum']**2
             if data.ds.dimensionality > 1:
                 p2 = p2 + data["Y-momentum"]**2
@@ -111,8 +111,8 @@
                 p2 = p2 + data["Z-momentum"]**2
             return 0.5 * p2/data['density']
 
-        def _kinetic_energy(field, data):
-            return data['kinetic_energy_density']/data['density']
+        def _specific_kinetic_energy(field, data):
+            return data['kinetic_energy']/data['density']
 
         def _temperature(field, data):
             c_v = data.ds.quan(data.ds.parameters['radiation.const_cv'], 
@@ -135,16 +135,16 @@
                        units = unit_system["pressure"])
         self.add_field(("gas", "kinetic_energy"),
                        function = _kinetic_energy,
+                       units = unit_system["pressure"])
+        self.add_field(("gas", "specific_kinetic_energy"),
+                       function = _specific_kinetic_energy,
                        units = unit_system["specific_energy"])
-        self.add_field(("gas", "kinetic_energy_density"),
-                       function = _kinetic_energy_density,
-                       units = unit_system["pressure"])
         self.add_field(("gas", "magnetic_energy"),
                        function = _magnetic_energy,
+                       units = unit_system["pressure"])
+        self.add_field(("gas", "specific_magnetic_energy"),
+                       function = _specific_magnetic_energy,
                        units = unit_system["specific_energy"])
-        self.add_field(("gas", "magnetic_energy_density"),
-                       function = _magnetic_energy_density,
-                       units = unit_system["pressure"])
         self.add_field(("gas", "temperature"), function=_temperature,
                        units=unit_system["temperature"])

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.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.spacepope.org/pipermail/yt-svn-spacepope.org/attachments/20160330/4cf7564e/attachment-0001.htm>