[yt-svn] commit/yt: 5 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Wed Nov 6 07:18:25 PST 2013
5 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/89a99b20f668/
Changeset: 89a99b20f668
Branch: yt
User: jwise77
Date: 2013-11-04 22:43:53
Summary: Sometimes in nested Enzo N-body simulations, the last grid doesn't
have any particles, so there isn't any data filename defined.
Affected #: 1 file
diff -r 8d0535ad7b494511d40304940ca6ee1280f35176 -r 89a99b20f668af441756a9712f45cf877b6d3618 yt/frontends/enzo/data_structures.py
--- a/yt/frontends/enzo/data_structures.py
+++ b/yt/frontends/enzo/data_structures.py
@@ -225,6 +225,7 @@
self.object_types.sort()
def _count_grids(self):
+ self.num_grids = None
test_grid = test_grid_id = None
self.num_stars = 0
for line in rlines(open(self.hierarchy_filename, "rb")):
@@ -235,8 +236,11 @@
if line.startswith("NumberOfStarParticles"):
self.num_stars = int(line.split("=")[-1])
if line.startswith("Grid "):
- self.num_grids = test_grid_id = int(line.split("=")[-1])
- break
+ if self.num_grids == None:
+ self.num_grids = int(line.split("=")[-1])
+ test_grid_id = int(line.split("=")[-1])
+ if test_grid != None:
+ break
self._guess_data_style(self.pf.dimensionality, test_grid, test_grid_id)
def _guess_data_style(self, rank, test_grid, test_grid_id):
https://bitbucket.org/yt_analysis/yt/commits/e5d36e213330/
Changeset: e5d36e213330
Branch: yt
User: jwise77
Date: 2013-11-04 22:44:21
Summary: Fixing some breakage when preloading all data in projections.
Affected #: 1 file
diff -r 89a99b20f668af441756a9712f45cf877b6d3618 -r e5d36e213330598d9c0ee1eb360d708a8e053eb6 yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -1831,9 +1831,9 @@
# It is probably faster, as it consolidates IO, but if we did it in
# _project_level, then it would be more memory conservative
if self.preload_style == 'all':
- dependencies = self.get_dependencies(fields, ghost_zones = False)
+ dependencies = self.get_dependencies(fields)
mylog.debug("Preloading %s grids and getting %s",
- len(self.source._get_grid_objs()),
+ len([g for g in self.source._get_grid_objs()]),
dependencies)
self.comm.preload([g for g in self._get_grid_objs()],
dependencies, self.hierarchy.io)
https://bitbucket.org/yt_analysis/yt/commits/d5ccd3ddc08a/
Changeset: d5ccd3ddc08a
Branch: yt
User: jwise77
Date: 2013-11-05 00:05:43
Summary: particle mass should always be float64 for CIC.
Affected #: 1 file
diff -r e5d36e213330598d9c0ee1eb360d708a8e053eb6 -r d5ccd3ddc08ab7cd21f3c1a1ce3828ff64dab451 yt/frontends/enzo/fields.py
--- a/yt/frontends/enzo/fields.py
+++ b/yt/frontends/enzo/fields.py
@@ -404,7 +404,7 @@
amr_utils.CICDeposit_3(data["particle_position_x"][filter].astype(np.float64),
data["particle_position_y"][filter].astype(np.float64),
data["particle_position_z"][filter].astype(np.float64),
- data["particle_mass"][filter],
+ data["particle_mass"][filter].astype(np.float64),
num,
blank, np.array(data.LeftEdge).astype(np.float64),
np.array(data.ActiveDimensions).astype(np.int32),
https://bitbucket.org/yt_analysis/yt/commits/1c3caf3f1769/
Changeset: 1c3caf3f1769
Branch: yt
User: jwise77
Date: 2013-11-05 22:32:24
Summary: Changing None comparisons.
Affected #: 1 file
diff -r d5ccd3ddc08ab7cd21f3c1a1ce3828ff64dab451 -r 1c3caf3f1769ec2a03d85a54b6a3af3500a22e22 yt/frontends/enzo/data_structures.py
--- a/yt/frontends/enzo/data_structures.py
+++ b/yt/frontends/enzo/data_structures.py
@@ -236,10 +236,10 @@
if line.startswith("NumberOfStarParticles"):
self.num_stars = int(line.split("=")[-1])
if line.startswith("Grid "):
- if self.num_grids == None:
+ if self.num_grids is None:
self.num_grids = int(line.split("=")[-1])
test_grid_id = int(line.split("=")[-1])
- if test_grid != None:
+ if test_grid is not None:
break
self._guess_data_style(self.pf.dimensionality, test_grid, test_grid_id)
https://bitbucket.org/yt_analysis/yt/commits/3c63b626c9f2/
Changeset: 3c63b626c9f2
Branch: yt
User: MatthewTurk
Date: 2013-11-06 16:18:19
Summary: Merged in jwise77/yt (pull request #632)
A few bugfixes for the Enzo frontend
Affected #: 3 files
diff -r 34a804fd78c6514644998b0559e04f162b468d4b -r 3c63b626c9f2aca10dcf199f65f1e9c0d7e1a67e yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -1831,9 +1831,9 @@
# It is probably faster, as it consolidates IO, but if we did it in
# _project_level, then it would be more memory conservative
if self.preload_style == 'all':
- dependencies = self.get_dependencies(fields, ghost_zones = False)
+ dependencies = self.get_dependencies(fields)
mylog.debug("Preloading %s grids and getting %s",
- len(self.source._get_grid_objs()),
+ len([g for g in self.source._get_grid_objs()]),
dependencies)
self.comm.preload([g for g in self._get_grid_objs()],
dependencies, self.hierarchy.io)
diff -r 34a804fd78c6514644998b0559e04f162b468d4b -r 3c63b626c9f2aca10dcf199f65f1e9c0d7e1a67e yt/frontends/enzo/data_structures.py
--- a/yt/frontends/enzo/data_structures.py
+++ b/yt/frontends/enzo/data_structures.py
@@ -225,6 +225,7 @@
self.object_types.sort()
def _count_grids(self):
+ self.num_grids = None
test_grid = test_grid_id = None
self.num_stars = 0
for line in rlines(open(self.hierarchy_filename, "rb")):
@@ -235,8 +236,11 @@
if line.startswith("NumberOfStarParticles"):
self.num_stars = int(line.split("=")[-1])
if line.startswith("Grid "):
- self.num_grids = test_grid_id = int(line.split("=")[-1])
- break
+ if self.num_grids is None:
+ self.num_grids = int(line.split("=")[-1])
+ test_grid_id = int(line.split("=")[-1])
+ if test_grid is not None:
+ break
self._guess_data_style(self.pf.dimensionality, test_grid, test_grid_id)
def _guess_data_style(self, rank, test_grid, test_grid_id):
diff -r 34a804fd78c6514644998b0559e04f162b468d4b -r 3c63b626c9f2aca10dcf199f65f1e9c0d7e1a67e yt/frontends/enzo/fields.py
--- a/yt/frontends/enzo/fields.py
+++ b/yt/frontends/enzo/fields.py
@@ -404,7 +404,7 @@
amr_utils.CICDeposit_3(data["particle_position_x"][filter].astype(np.float64),
data["particle_position_y"][filter].astype(np.float64),
data["particle_position_z"][filter].astype(np.float64),
- data["particle_mass"][filter],
+ data["particle_mass"][filter].astype(np.float64),
num,
blank, np.array(data.LeftEdge).astype(np.float64),
np.array(data.ActiveDimensions).astype(np.int32),
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