[yt-svn] commit/yt: 2 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Tue Mar 18 10:21:11 PDT 2014
2 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/7d69ba84e622/
Changeset: 7d69ba84e622
Branch: yt-3.0
User: MatthewTurk
Date: 2014-03-18 01:00:47
Summary: Fixing a bunch of ART particle fields.
Affected #: 2 files
diff -r 4bc951ee2db7e00d453de6a3bdf95fdd03732836 -r 7d69ba84e622830f5f4ca3fe2b775197da1868ff yt/frontends/art/data_structures.py
--- a/yt/frontends/art/data_structures.py
+++ b/yt/frontends/art/data_structures.py
@@ -102,7 +102,7 @@
self.oct_handler.finalize()
def _detect_output_fields(self):
- self.particle_field_list = [("io", f) for f in particle_fields]
+ self.particle_field_list = [f for f in particle_fields]
self.field_list = [("gas", f) for f in fluid_fields]
# now generate all of the possible particle fields
if "wspecies" in self.parameter_file.parameters.keys():
@@ -418,7 +418,7 @@
the order they are in in the octhandler.
"""
oct_handler = self.oct_handler
- all_fields = self.domain.pf.h.fluid_field_list
+ all_fields = self.domain.pf.index.fluid_field_list
fields = [f for ft, f in ftfields]
field_idxs = [all_fields.index(f) for f in fields]
source, tr = {}, {}
@@ -600,5 +600,5 @@
return True
if getattr(selector, "domain_id", None) is not None:
return selector.domain_id == self.domain_id
- domain_ids = self.pf.h.oct_handler.domain_identify(selector)
+ domain_ids = self.pf.index.oct_handler.domain_identify(selector)
return self.domain_id in domain_ids
diff -r 4bc951ee2db7e00d453de6a3bdf95fdd03732836 -r 7d69ba84e622830f5f4ca3fe2b775197da1868ff yt/frontends/art/fields.py
--- a/yt/frontends/art/fields.py
+++ b/yt/frontends/art/fields.py
@@ -46,17 +46,17 @@
)
known_particle_fields = (
- ("POSITION_X", ("code_length", ["particle_position_x"], None)),
- ("POSITION_Y", ("code_length", ["particle_position_y"], None)),
- ("POSITION_Z", ("code_length", ["particle_position_z"], None)),
- ("VELOCITY_X", (vel_units, ["particle_velocity_x"], None)),
- ("VELOCITY_Y", (vel_units, ["particle_velocity_y"], None)),
- ("VELOCITY_Z", (vel_units, ["particle_velocity_z"], None)),
- ("MASS", ("code_mass", ["particle_mass"], None)),
- ("PID", ("", ["particle_index"], None)),
- ("SPECIES", ("", ["particle_type"], None)),
- ("BIRTH_TIME", ("code_time", ["creation_time"], None)),
- ("INITIAL_MASS", ("code_mass", ["initial_mass"], None)),
- ("METALLICITY_SNIa", ("", ["metallicity_snia"], None)),
- ("METALLICITY_SNII", ("", ["metallicity_snii"], None)),
+ ("particle_position_x", ("code_length", [], None)),
+ ("particle_position_y", ("code_length", [], None)),
+ ("particle_position_z", ("code_length", [], None)),
+ ("particle_velocity_x", (vel_units, [], None)),
+ ("particle_velocity_y", (vel_units, [], None)),
+ ("particle_velocity_z", (vel_units, [], None)),
+ ("particle_mass", ("code_mass", [], None)),
+ ("particle_index", ("", [], None)),
+ ("particle_species", ("", ["particle_type"], None)),
+ ("particle_creation_time", ("code_time", [], None)),
+ ("particle_mass_initial", ("code_mass", [], None)),
+ ("particle_metallicity1", ("", [], None)),
+ ("particle_metallicity2", ("", [], None)),
)
https://bitbucket.org/yt_analysis/yt/commits/9a10e88b06c1/
Changeset: 9a10e88b06c1
Branch: yt-3.0
User: MatthewTurk
Date: 2014-03-18 18:21:02
Summary: Merged in MatthewTurk/yt/yt-3.0 (pull request #727)
Fixing a bunch of ART particle fields.
Affected #: 2 files
diff -r 4f7dfffeb4146833a1c4b6a1fcb2fb9719fadac2 -r 9a10e88b06c14acc7d2b569c085dbec5865ec830 yt/frontends/art/data_structures.py
--- a/yt/frontends/art/data_structures.py
+++ b/yt/frontends/art/data_structures.py
@@ -102,7 +102,7 @@
self.oct_handler.finalize()
def _detect_output_fields(self):
- self.particle_field_list = [("io", f) for f in particle_fields]
+ self.particle_field_list = [f for f in particle_fields]
self.field_list = [("gas", f) for f in fluid_fields]
# now generate all of the possible particle fields
if "wspecies" in self.parameter_file.parameters.keys():
@@ -418,7 +418,7 @@
the order they are in in the octhandler.
"""
oct_handler = self.oct_handler
- all_fields = self.domain.pf.h.fluid_field_list
+ all_fields = self.domain.pf.index.fluid_field_list
fields = [f for ft, f in ftfields]
field_idxs = [all_fields.index(f) for f in fields]
source, tr = {}, {}
@@ -600,5 +600,5 @@
return True
if getattr(selector, "domain_id", None) is not None:
return selector.domain_id == self.domain_id
- domain_ids = self.pf.h.oct_handler.domain_identify(selector)
+ domain_ids = self.pf.index.oct_handler.domain_identify(selector)
return self.domain_id in domain_ids
diff -r 4f7dfffeb4146833a1c4b6a1fcb2fb9719fadac2 -r 9a10e88b06c14acc7d2b569c085dbec5865ec830 yt/frontends/art/fields.py
--- a/yt/frontends/art/fields.py
+++ b/yt/frontends/art/fields.py
@@ -46,17 +46,17 @@
)
known_particle_fields = (
- ("POSITION_X", ("code_length", ["particle_position_x"], None)),
- ("POSITION_Y", ("code_length", ["particle_position_y"], None)),
- ("POSITION_Z", ("code_length", ["particle_position_z"], None)),
- ("VELOCITY_X", (vel_units, ["particle_velocity_x"], None)),
- ("VELOCITY_Y", (vel_units, ["particle_velocity_y"], None)),
- ("VELOCITY_Z", (vel_units, ["particle_velocity_z"], None)),
- ("MASS", ("code_mass", ["particle_mass"], None)),
- ("PID", ("", ["particle_index"], None)),
- ("SPECIES", ("", ["particle_type"], None)),
- ("BIRTH_TIME", ("code_time", ["creation_time"], None)),
- ("INITIAL_MASS", ("code_mass", ["initial_mass"], None)),
- ("METALLICITY_SNIa", ("", ["metallicity_snia"], None)),
- ("METALLICITY_SNII", ("", ["metallicity_snii"], None)),
+ ("particle_position_x", ("code_length", [], None)),
+ ("particle_position_y", ("code_length", [], None)),
+ ("particle_position_z", ("code_length", [], None)),
+ ("particle_velocity_x", (vel_units, [], None)),
+ ("particle_velocity_y", (vel_units, [], None)),
+ ("particle_velocity_z", (vel_units, [], None)),
+ ("particle_mass", ("code_mass", [], None)),
+ ("particle_index", ("", [], None)),
+ ("particle_species", ("", ["particle_type"], None)),
+ ("particle_creation_time", ("code_time", [], None)),
+ ("particle_mass_initial", ("code_mass", [], None)),
+ ("particle_metallicity1", ("", [], None)),
+ ("particle_metallicity2", ("", [], None)),
)
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