<html><body>
<p>1 new commit in yt:</p>
<p><a href="https://bitbucket.org/yt_analysis/yt/commits/f9d1b41b06bd/">https://bitbucket.org/yt_analysis/yt/commits/f9d1b41b06bd/</a> Changeset: f9d1b41b06bd Branch: yt User: ngoldbaum Date: 2016-05-11 18:23:06+00:00 Summary: Merged in atmyers/yt (pull request #2165)</p>
<p>[BUGFIX] Give user-added derived fields a default field type. Closes Issue #1029. Affected #: 3 files</p>
<p>diff -r 0b86fcb157653daf6f3abafcb65518cec55b5a50 -r f9d1b41b06bdb68e6642917795f68766c90a304e yt/data_objects/static_output.py --- a/yt/data_objects/static_output.py +++ b/yt/data_objects/static_output.py @@ -597,7 +597,8 @@</p>
<pre>ftype = self._last_freq[0] or ftype
field = (ftype, fname)
if field == self._last_freq:</pre>
<ul><li><p>return self._last_finfo</p></li></ul>
<p>+ if field not in self.field_info.field_aliases.values(): + return self._last_finfo</p>
<pre> if field in self.field_info:
self._last_freq = field
self._last_finfo = self.field_info[(ftype, fname)]</pre>
<p>diff -r 0b86fcb157653daf6f3abafcb65518cec55b5a50 -r f9d1b41b06bdb68e6642917795f68766c90a304e yt/fields/field_info_container.py --- a/yt/fields/field_info_container.py +++ b/yt/fields/field_info_container.py @@ -253,7 +253,17 @@</p>
<pre> self[name] = DerivedField(name, f, **kwargs)
return f
return create_function</pre>
<ul><li><p>self[name] = DerivedField(name, function, **kwargs)</p></li></ul>
<p>+ ptype = kwargs.get("particle_type", False) + if ptype: + ftype = ‘all’ + else: + ftype = self.ds.default_fluid_type + if not isinstance(name, tuple) and (ftype, name) not in self: + tuple_name = (ftype, name) + self[tuple_name] = DerivedField(tuple_name, function, **kwargs) + self.alias(name, tuple_name) + else: + self[name] = DerivedField(name, function, **kwargs)</p>
<pre>def load_all_plugins(self, ftype="gas"):
loaded = []</pre>
<p>diff -r 0b86fcb157653daf6f3abafcb65518cec55b5a50 -r f9d1b41b06bdb68e6642917795f68766c90a304e yt/fields/tests/test_fields.py --- a/yt/fields/tests/test_fields.py +++ b/yt/fields/tests/test_fields.py @@ -4,6 +4,7 @@</p>
<pre> load
from yt.testing import \
fake_random_ds, \</pre>
<p>+ fake_particle_ds, \</p>
<pre>assert_almost_equal, \
assert_equal, \
assert_array_almost_equal_nulp, \</pre>
<p>@@ -313,6 +314,28 @@</p>
<pre> ad['density_alias']
assert ds.derived_field_list[0] == 'density_alias'
</pre>
<p>+def test_add_field_string_aliasing(): + ds = fake_random_ds(16) + + def density_alias(field, data): + return data['density'] + + ds.add_field('density_alias', function=density_alias, units='g/cm**3') + + ds.field_info['density_alias'] + ds.field_info['gas', ‘density_alias’] + + ds = fake_particle_ds() + + def pmass_alias(field, data): + return data['particle_mass'] + + ds.add_field('particle_mass_alias', function=pmass_alias, + units='g', particle_type=True) + + ds.field_info['particle_mass_alias'] + ds.field_info['all', ‘particle_mass_alias’] +</p>
<pre>if __name__ == "__main__":
setup()</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-2ByeRZFC1LslHcg6aJmnQ70VruLbmeLQr27CaRpZcOqexiODA339Qtwpr4LEd2p0fqNv6UYNncbLAYJmHUJhqXPa1GHQw8eDf4xfc7a-2Fd7GNX4BuG9uXxSRe4II7BSz8jn-2FtvRJNE4FKheJf50EXy12Z6gWXzz2pkofBl72mOkhieMAFRVp4Py418D1YRLpRfJrCqsH3mHKTFhSJ6wowCWJWiGaaq1uF-2Fp-2BQ-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>