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

[commits-noreply at bitbucket.org]

2 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/b53656b292b7/
Changeset:   b53656b292b7
Branch:      yt
User:        ngoldbaum
Date:        2016-02-17 19:44:42+00:00
Summary:     Set nap to None for non-active particle datasets
Affected #:  1 file

diff -r 28196e94219e1203f78a3ba94272d49e79deaee4 -r b53656b292b75ad8d5da9ba00b2c1c0f24a2594d yt/frontends/enzo/data_structures.py
--- a/yt/frontends/enzo/data_structures.py
+++ b/yt/frontends/enzo/data_structures.py
@@ -278,12 +278,13 @@
             nap = dict((ap_type, []) for ap_type in 
                 params["Physics"]["ActiveParticles"]["ActiveParticlesEnabled"])
         else:
-            nap = {}
             if "AppendActiveParticleType" in self.parameters:
+                nap = {}
                 active_particles = True
                 for type in self.parameters.get("AppendActiveParticleType", []):
                     nap[type] = []
             else:
+                nap = None
                 active_particles = False
         for grid_id in range(self.num_grids):
             pbar.update(grid_id)


https://bitbucket.org/yt_analysis/yt/commits/658172e68381/
Changeset:   658172e68381
Branch:      yt
User:        MatthewTurk
Date:        2016-02-22 21:23:25+00:00
Summary:     Merged in ngoldbaum/yt (pull request #1996)

Set nap to None for non-active particle datasets
Affected #:  1 file

diff -r 47e8e095d51d9f5ce215dd9a0f5ec4a0d8d6c723 -r 658172e6838146e6eb47c1abd069dc82819f3992 yt/frontends/enzo/data_structures.py
--- a/yt/frontends/enzo/data_structures.py
+++ b/yt/frontends/enzo/data_structures.py
@@ -278,12 +278,13 @@
             nap = dict((ap_type, []) for ap_type in 
                 params["Physics"]["ActiveParticles"]["ActiveParticlesEnabled"])
         else:
-            nap = {}
             if "AppendActiveParticleType" in self.parameters:
+                nap = {}
                 active_particles = True
                 for type in self.parameters.get("AppendActiveParticleType", []):
                     nap[type] = []
             else:
+                nap = None
                 active_particles = False
         for grid_id in range(self.num_grids):
             pbar.update(grid_id)

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.