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

[commits-noreply at bitbucket.org]

2 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/118835e4cb40/
Changeset:   118835e4cb40
Branch:      yt
User:        ngoldbaum
Date:        2016-02-02 01:48:08+00:00
Summary:     Do a better job of detecting active particle datasets
Affected #:  1 file

diff -r 34ed15d98fe48c75d824fbf6246d8ab89c4e2398 -r 118835e4cb405da7e189151a5d4222b6f7971a00 yt/frontends/enzo/data_structures.py
--- a/yt/frontends/enzo/data_structures.py
+++ b/yt/frontends/enzo/data_structures.py
@@ -277,14 +277,14 @@
             active_particles = True
             nap = dict((ap_type, []) for ap_type in 
                 params["Physics"]["ActiveParticles"]["ActiveParticlesEnabled"])
-        elif version == 2.2:
-            active_particles = True
+        else:
             nap = {}
-            for type in self.parameters.get("AppendActiveParticleType", []):
-                nap[type] = []
-        else:
-            active_particles = False
-            nap = None
+            if "AppendActiveParticleType" in self.parameters:
+                active_particles = True
+                for type in self.parameters.get("AppendActiveParticleType", []):
+                    nap[type] = []
+            else:
+                active_particles = False
         for grid_id in range(self.num_grids):
             pbar.update(grid_id)
             # We will unroll this list


https://bitbucket.org/yt_analysis/yt/commits/e3c516d9437b/
Changeset:   e3c516d9437b
Branch:      yt
User:        atmyers
Date:        2016-02-03 17:23:53+00:00
Summary:     Merged in ngoldbaum/yt (pull request #1978)

Do a better job of detecting active particle datasets
Affected #:  1 file

diff -r a75f6977daac5046fbecaca8fc19b2414bea85f8 -r e3c516d9437bb401d36afd899ebb695da9090efe yt/frontends/enzo/data_structures.py
--- a/yt/frontends/enzo/data_structures.py
+++ b/yt/frontends/enzo/data_structures.py
@@ -277,14 +277,14 @@
             active_particles = True
             nap = dict((ap_type, []) for ap_type in 
                 params["Physics"]["ActiveParticles"]["ActiveParticlesEnabled"])
-        elif version == 2.2:
-            active_particles = True
+        else:
             nap = {}
-            for type in self.parameters.get("AppendActiveParticleType", []):
-                nap[type] = []
-        else:
-            active_particles = False
-            nap = None
+            if "AppendActiveParticleType" in self.parameters:
+                active_particles = True
+                for type in self.parameters.get("AppendActiveParticleType", []):
+                    nap[type] = []
+            else:
+                active_particles = False
         for grid_id in range(self.num_grids):
             pbar.update(grid_id)
             # We will unroll this list

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.