<html><body>
<p>1 new commit in yt:</p>
<p><a href="https://bitbucket.org/yt_analysis/yt/commits/53d2048d1cce/">https://bitbucket.org/yt_analysis/yt/commits/53d2048d1cce/</a> Changeset: 53d2048d1cce Branch: yt User: xarthisius Date: 2016-03-30 18:30:10+00:00 Summary: Merged in atmyers/yt (pull request #2089)</p>
<p>Fix the Orion 2 field definitions. Closes #1054 Affected #: 3 files</p>
<p>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 @@</p>
<pre> local_athena_270:
- yt/frontends/athena
</pre>
<ul><li><p>local_chombo_270:</p></li></ul>
<p>+ local_chombo_271:</p>
<pre> - yt/frontends/chombo/tests/test_outputs.py
local_enzo_270:</pre>
<p>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 @@</p>
<pre>self.length_unit = self.quan(1.0, "cm")
self.mass_unit = self.quan(1.0, "g")
self.time_unit = self.quan(1.0, "s")</pre>
<ul><li><p>self.magnetic_unit = self.quan(1.0, “gauss”)</p></li></ul>
<p>+ self.magnetic_unit = self.quan(np.sqrt(4.*np.pi), “gauss”)</p>
<pre> self.velocity_unit = self.length_unit / self.time_unit
def _localize(self, f, default):</pre>
<p>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 @@</p>
<pre> unit_system = self.ds.unit_system
def _thermal_energy_density(field, data):
try:</pre>
<ul><li><p>return data['energy-density'] – data['kinetic_energy_density'] – \</p></li>
<li><p>data["magnetic_energy_density"]</p></li></ul>
<p>+ return data["energy-density"] – data["kinetic_energy"] – \ + data["magnetic_energy"]</p>
<pre>except YTFieldNotFound:</pre>
<ul><li><p>return data['energy-density'] – data['kinetic_energy_density']</p></li></ul>
<p>+ return data['energy-density'] – data["kinetic_energy"]</p>
<pre> def _thermal_energy(field, data):
return data['thermal_energy_density']/data['density']
</pre>
<ul><li><p>def _magnetic_energy_density(field, data):</p></li></ul>
<p>+ def _magnetic_energy(field, data):</p>
<pre>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</pre>
<ul><li><p>return ret/2.0</p></li></ul>
<p>+ return ret/8.0/np.pi</p>
<ul><li><p>def _magnetic_energy(field, data):</p></li>
<li><p>return data['magnetic_energy_density']/data['density']</p></li></ul>
<p>+ def _specific_magnetic_energy(field, data): + return data['specific_magnetic_energy']/data['density']</p>
<ul><li><p>def _kinetic_energy_density(field, data):</p></li></ul>
<p>+ def _kinetic_energy(field, data):</p>
<pre>p2 = data['X-momentum']**2
if data.ds.dimensionality > 1:
p2 = p2 + data["Y-momentum"]**2</pre>
<p>@@ -111,8 +111,8 @@</p>
<pre> p2 = p2 + data["Z-momentum"]**2
return 0.5 * p2/data['density']
</pre>
<ul><li><p>def _kinetic_energy(field, data):</p></li>
<li><p>return data['kinetic_energy_density']/data['density']</p></li></ul>
<p>+ def _specific_kinetic_energy(field, data): + return data['kinetic_energy']/data['density']</p>
<pre> def _temperature(field, data):
c_v = data.ds.quan(data.ds.parameters['radiation.const_cv'],</pre>
<p>@@ -135,16 +135,16 @@</p>
<pre>units = unit_system["pressure"])
self.add_field(("gas", "kinetic_energy"),
function = _kinetic_energy,</pre>
<p>+ units = unit_system["pressure"]) + self.add_field(("gas", "specific_kinetic_energy"), + function = _specific_kinetic_energy,</p>
<pre>units = unit_system["specific_energy"])</pre>
<ul><li><p>self.add_field(("gas", "kinetic_energy_density"),</p></li>
<li><p>function = _kinetic_energy_density,</p></li>
<li><p>units = unit_system["pressure"])</p></li></ul>
<pre> self.add_field(("gas", "magnetic_energy"),
function = _magnetic_energy,</pre>
<p>+ units = unit_system["pressure"]) + self.add_field(("gas", "specific_magnetic_energy"), + function = _specific_magnetic_energy,</p>
<pre>units = unit_system["specific_energy"])</pre>
<ul><li><p>self.add_field(("gas", "magnetic_energy_density"),</p></li>
<li><p>function = _magnetic_energy_density,</p></li>
<li><p>units = unit_system["pressure"])</p></li></ul>
<pre> self.add_field(("gas", "temperature"), function=_temperature,
units=unit_system["temperature"])</pre>
<p>Repository URL: <a href="https://bitbucket.org/yt_analysis/yt/">https://bitbucket.org/yt_analysis/yt/</a></p>
<p>—</p>
<p>This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.</p>
<img src="http://link.bitbucket.org/wf/open?upn=ll4ctv0L-2ByeRZFC1LslHcg6aJmnQ70VruLbmeLQr27BBxgzKXwSRk02a6e5nQwUOtBgSP1sMr7TNWycxf-2B5zoRbp1TXnc2fbvsuYigPoZBzB2I2vxjdbxmX3lvjbvuCJkwgDv8uE1zO-2B9c3gWtZwB2lsEPLFMFX6bDv36tBy8tPdNucz8fot-2BCwYymXL9ciJmnaGaH-2BICWMmO3kgdEgtF-2F1EqvSbbYQySDwnYjAYeug-3D" alt="" width="1" height="1" border="0" style="height:1px !important;width:1px !important;border-width:0 !important;margin-top:0 !important;margin-bottom:0 !important;margin-right:0 !important;margin-left:0 !important;padding-top:0 !important;padding-bottom:0 !important;padding-right:0 !important;padding-left:0 !important;"/>
</body></html>