[yt-svn] commit/yt: 2 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Thu Jun 19 12:33:58 PDT 2014
2 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/f438a613ca14/
Changeset: f438a613ca14
Branch: yt-3.0
User: xarthisius
Date: 2014-06-19 20:14:50
Summary: Break infinite loop if mask is None
Affected #: 1 file
diff -r 2758c4fd1bcdb624c863a7f3d7ec3283d8a3688b -r f438a613ca14520158fafcc25fe925bb5ad3eab9 yt/frontends/sph/io.py
--- a/yt/frontends/sph/io.py
+++ b/yt/frontends/sph/io.py
@@ -529,6 +529,7 @@
while total < tp[ptype]:
p = np.fromfile(f, self._pdtypes[ptype],
count=min(self._chunksize, tp[ptype] - total))
+ total += p.size
mask = selector.select_points(
p["Coordinates"]['x'].astype("float64"),
p["Coordinates"]['y'].astype("float64"),
@@ -537,7 +538,6 @@
tf = self._fill_fields(field_list, p, mask, data_file)
for field in field_list:
yield (ptype, field), tf.pop(field)
- total += p.size
f.close()
def _update_domain(self, data_file):
https://bitbucket.org/yt_analysis/yt/commits/3c1a3d3de75a/
Changeset: 3c1a3d3de75a
Branch: yt-3.0
User: MatthewTurk
Date: 2014-06-19 21:33:50
Summary: Merged in xarthisius/yt/yt-3.0 (pull request #965)
[sph] Break infinite loop if particle selection mask is None
Affected #: 1 file
diff -r f40368e1ff4c02bc3ab5f0db08158af121ea3523 -r 3c1a3d3de75acd092950c66c4915be4b6dce4bef yt/frontends/sph/io.py
--- a/yt/frontends/sph/io.py
+++ b/yt/frontends/sph/io.py
@@ -529,6 +529,7 @@
while total < tp[ptype]:
p = np.fromfile(f, self._pdtypes[ptype],
count=min(self._chunksize, tp[ptype] - total))
+ total += p.size
mask = selector.select_points(
p["Coordinates"]['x'].astype("float64"),
p["Coordinates"]['y'].astype("float64"),
@@ -537,7 +538,6 @@
tf = self._fill_fields(field_list, p, mask, data_file)
for field in field_list:
yield (ptype, field), tf.pop(field)
- total += p.size
f.close()
def _update_domain(self, data_file):
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