[yt-svn] commit/yt: xarthisius: Merged in ngoldbaum/yt (pull request #1975)
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Wed Feb 3 09:25:23 PST 2016
1 new commit in yt:
https://bitbucket.org/yt_analysis/yt/commits/9c15ab1e9d73/
Changeset: 9c15ab1e9d73
Branch: yt
User: xarthisius
Date: 2016-02-03 17:25:15+00:00
Summary: Merged in ngoldbaum/yt (pull request #1975)
angular_momentum_vector: Only include space for particle fields if they exist. Fixes #1165
Affected #: 1 file
diff -r e3c516d9437bb401d36afd899ebb695da9090efe -r 9c15ab1e9d7366d52aba8054e9bfb4f2f156d28b yt/data_objects/derived_quantities.py
--- a/yt/data_objects/derived_quantities.py
+++ b/yt/data_objects/derived_quantities.py
@@ -436,22 +436,26 @@
"""
def count_values(self, use_gas=True, use_particles=True):
num_vals = 0
- if use_gas: num_vals += 4
- if use_particles: num_vals += 4
+ # create the index if it doesn't exist yet
+ self.data_source.ds.index
+ self.use_gas = use_gas & \
+ (("gas", "cell_mass") in self.data_source.ds.field_info)
+ self.use_particles = use_particles & \
+ (("all", "particle_mass") in self.data_source.ds.field_info)
+ if self.use_gas:
+ num_vals += 4
+ if self.use_particles:
+ num_vals += 4
self.num_vals = num_vals
- def process_chunk(self, data, use_gas=True, use_particles=True):
- use_gas &= \
- (("gas", "cell_mass") in self.data_source.ds.field_info)
- use_particles &= \
- (("all", "particle_mass") in self.data_source.ds.field_info)
+ def process_chunk(self, data, **kwargs):
rvals = []
- if use_gas:
+ if self.use_gas:
rvals.extend([(data["gas", "specific_angular_momentum_%s" % axis] *
data["gas", "cell_mass"]).sum(dtype=np.float64) \
for axis in "xyz"])
rvals.append(data["gas", "cell_mass"].sum(dtype=np.float64))
- if use_particles:
+ if self.use_particles:
rvals.extend([(data["all", "particle_specific_angular_momentum_%s" % axis] *
data["all", "particle_mass"]).sum(dtype=np.float64) \
for axis in "xyz"])
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.
More information about the yt-svn
mailing list