<html><body>
<p>4 new commits in yt:</p>
<p><a href="https://bitbucket.org/yt_analysis/yt/commits/da50456d423b/">https://bitbucket.org/yt_analysis/yt/commits/da50456d423b/</a> Changeset: da50456d423b Branch: yt User: ngoldbaum Date: 2016-05-17 16:33:05+00:00 Summary: remove ‘io’ from enzo particle types for active particle datasets</p>
<p>This fixes the ‘all’ particle union, which wasn't being created properly because there aren't any ‘io’ particles in active particle datasets. Affected #: 2 files</p>
<p>diff -r 06b1bf872faa352183a5f8ec91d72937b9c43523 -r da50456d423bf0f34561b93291f98793536a0c6d yt/frontends/enzo/data_structures.py --- a/yt/frontends/enzo/data_structures.py +++ b/yt/frontends/enzo/data_structures.py @@ -444,6 +444,14 @@</p>
<pre>if "AppendActiveParticleType" in self.dataset.parameters:
ap_fields = self._detect_active_particle_fields()
field_list = list(set(field_list).union(ap_fields))</pre>
<p>+ if not any(f[0] == ‘io’ for f in field_list): + ptypes_raw = list(self.dataset.particle_types_raw) + ptypes_raw.remove('io') + self.dataset.particle_types_raw = tuple(ptypes_raw) + + ptypes = list(self.dataset.particle_types) + ptypes.remove('io') + self.dataset.particle_types = tuple(ptypes)</p>
<pre>ptypes = self.dataset.particle_types
ptypes_raw = self.dataset.particle_types_raw
else:</pre>
<p>diff -r 06b1bf872faa352183a5f8ec91d72937b9c43523 -r da50456d423bf0f34561b93291f98793536a0c6d yt/frontends/enzo/tests/test_outputs.py --- a/yt/frontends/enzo/tests/test_outputs.py +++ b/yt/frontends/enzo/tests/test_outputs.py @@ -126,6 +126,8 @@</p>
<pre>def test_active_particle_datasets():
two_sph = data_dir_load(two_sphere_test)
assert 'AccretingParticle' in two_sph.particle_types_raw</pre>
<p>+ assert ‘io’ not in two_sph.particle_types_raw + assert ‘all’ in two_sph.particle_types</p>
<pre> assert_equal(len(two_sph.particle_unions), 0)
pfields = ['GridID', 'creation_time', 'dynamical_time',
'identifier', 'level', 'metallicity', 'particle_mass']</pre>
<p><a href="https://bitbucket.org/yt_analysis/yt/commits/4e887197254e/">https://bitbucket.org/yt_analysis/yt/commits/4e887197254e/</a> Changeset: 4e887197254e Branch: yt User: ngoldbaum Date: 2016-05-17 19:23:19+00:00 Summary: Fix test for number of active particle unions Affected #: 1 file</p>
<p>diff -r da50456d423bf0f34561b93291f98793536a0c6d -r 4e887197254e7d1a7ef1383e2b042fe6b74fbff5 yt/frontends/enzo/tests/test_outputs.py --- a/yt/frontends/enzo/tests/test_outputs.py +++ b/yt/frontends/enzo/tests/test_outputs.py @@ -128,7 +128,7 @@</p>
<pre>assert 'AccretingParticle' in two_sph.particle_types_raw
assert 'io' not in two_sph.particle_types_raw
assert 'all' in two_sph.particle_types</pre>
<ul><li><p>assert_equal(len(two_sph.particle_unions), 0)</p></li></ul>
<p>+ assert_equal(len(two_sph.particle_unions), 1)</p>
<pre> pfields = ['GridID', 'creation_time', 'dynamical_time',
'identifier', 'level', 'metallicity', 'particle_mass']
pfields += ['particle_position_%s' % d for d in 'xyz']</pre>
<p><a href="https://bitbucket.org/yt_analysis/yt/commits/e50272bb2eb1/">https://bitbucket.org/yt_analysis/yt/commits/e50272bb2eb1/</a> Changeset: e50272bb2eb1 Branch: yt User: ngoldbaum Date: 2016-05-17 20:55:12+00:00 Summary: Only remove the io ptype if it is in the ptypes list Affected #: 1 file</p>
<p>diff -r 4e887197254e7d1a7ef1383e2b042fe6b74fbff5 -r e50272bb2eb18e3ea5a6db4dcf6d24c58afddce1 yt/frontends/enzo/data_structures.py --- a/yt/frontends/enzo/data_structures.py +++ b/yt/frontends/enzo/data_structures.py @@ -445,13 +445,15 @@</p>
<pre>ap_fields = self._detect_active_particle_fields()
field_list = list(set(field_list).union(ap_fields))
if not any(f[0] == 'io' for f in field_list):</pre>
<ul><li><p>ptypes_raw = list(self.dataset.particle_types_raw)</p></li>
<li><p>ptypes_raw.remove('io')</p></li>
<li><p>self.dataset.particle_types_raw = tuple(ptypes_raw)</p></li></ul>
<p>+ if ‘io’ in self.dataset.particle_types_raw: + ptypes_raw = list(self.dataset.particle_types_raw) + ptypes_raw.remove('io') + self.dataset.particle_types_raw = tuple(ptypes_raw)</p>
<ul><li><p>ptypes = list(self.dataset.particle_types)</p></li>
<li><p>ptypes.remove('io')</p></li>
<li><p>self.dataset.particle_types = tuple(ptypes)</p></li></ul>
<p>+ if ‘io’ in self.dataset.particle_types: + ptypes = list(self.dataset.particle_types) + ptypes.remove('io') + self.dataset.particle_types = tuple(ptypes)</p>
<pre>ptypes = self.dataset.particle_types
ptypes_raw = self.dataset.particle_types_raw
else:</pre>
<p><a href="https://bitbucket.org/yt_analysis/yt/commits/5e29cd4d7853/">https://bitbucket.org/yt_analysis/yt/commits/5e29cd4d7853/</a> Changeset: 5e29cd4d7853 Branch: yt User: jzuhone Date: 2016-05-18 18:06:56+00:00 Summary: Merged in ngoldbaum/yt (pull request #2180)</p>
<p>[bugfix] remove ‘io’ from enzo particle types for active particle datasets Affected #: 2 files</p>
<p>diff -r 513de336ea4bb226c8b8e32c893449b68d2af45b -r 5e29cd4d785390ca22dca3124da7f7b7f9fc5f2a yt/frontends/enzo/data_structures.py --- a/yt/frontends/enzo/data_structures.py +++ b/yt/frontends/enzo/data_structures.py @@ -444,6 +444,16 @@</p>
<pre>if "AppendActiveParticleType" in self.dataset.parameters:
ap_fields = self._detect_active_particle_fields()
field_list = list(set(field_list).union(ap_fields))</pre>
<p>+ if not any(f[0] == ‘io’ for f in field_list): + if ‘io’ in self.dataset.particle_types_raw: + ptypes_raw = list(self.dataset.particle_types_raw) + ptypes_raw.remove('io') + self.dataset.particle_types_raw = tuple(ptypes_raw) + + if ‘io’ in self.dataset.particle_types: + ptypes = list(self.dataset.particle_types) + ptypes.remove('io') + self.dataset.particle_types = tuple(ptypes)</p>
<pre>ptypes = self.dataset.particle_types
ptypes_raw = self.dataset.particle_types_raw
else:</pre>
<p>diff -r 513de336ea4bb226c8b8e32c893449b68d2af45b -r 5e29cd4d785390ca22dca3124da7f7b7f9fc5f2a yt/frontends/enzo/tests/test_outputs.py --- a/yt/frontends/enzo/tests/test_outputs.py +++ b/yt/frontends/enzo/tests/test_outputs.py @@ -126,7 +126,9 @@</p>
<pre>def test_active_particle_datasets():
two_sph = data_dir_load(two_sphere_test)
assert 'AccretingParticle' in two_sph.particle_types_raw</pre>
<ul><li><p>assert_equal(len(two_sph.particle_unions), 0)</p></li></ul>
<p>+ assert ‘io’ not in two_sph.particle_types_raw + assert ‘all’ in two_sph.particle_types + assert_equal(len(two_sph.particle_unions), 1)</p>
<pre> pfields = ['GridID', 'creation_time', 'dynamical_time',
'identifier', 'level', 'metallicity', 'particle_mass']
pfields += ['particle_position_%s' % d for d in 'xyz']</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-2ByeRZFC1LslHcg6aJmnQ70VruLbmeLQr27BtrA510aL-2BpNZA-2BEdFze-2Bqz8QV1gKyF425OELYnDLE9v7IozcOvZwLUgUrsRr5EYpMVousM-2FGvHrgxVH4r5ry-2BJQL7U8c5qicBABoLcvFJWff3uT3S0AMQxg76j8tsvmby8qTyhnpqfO1EvkXrz0-2FPMKWzPXMS8KNTekdAJXq2lRRqa-2FA71-2Fa6aE6JJbK1fSQ-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>