[yt-svn] commit/yt: 3 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Thu Apr 24 14:04:46 PDT 2014
3 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/9f6e4a1e5a16/
Changeset: 9f6e4a1e5a16
Branch: yt-3.0
User: MatthewTurk
Date: 2014-04-23 20:16:15
Summary: Adding fused types for particle selection.
Note that because we can't allow default arguments when calling a fused
function, we remove optional radius.
Affected #: 14 files
diff -r 2dd2d810e60cebaaab21688cf06e69580a3ad76d -r 9f6e4a1e5a167b44ff14baa306ba426f435283c2 yt/data_objects/grid_patch.py
--- a/yt/data_objects/grid_patch.py
+++ b/yt/data_objects/grid_patch.py
@@ -379,9 +379,9 @@
def count_particles(self, selector, x, y, z):
# We don't cache the selector results
- count = selector.count_points(x,y,z)
+ count = selector.count_points(x,y,z, 0.0)
return count
def select_particles(self, selector, x, y, z):
- mask = selector.select_points(x,y,z)
+ mask = selector.select_points(x,y,z, 0.0)
return mask
diff -r 2dd2d810e60cebaaab21688cf06e69580a3ad76d -r 9f6e4a1e5a167b44ff14baa306ba426f435283c2 yt/data_objects/octree_subset.py
--- a/yt/data_objects/octree_subset.py
+++ b/yt/data_objects/octree_subset.py
@@ -249,11 +249,11 @@
def count_particles(self, selector, x, y, z):
# We don't cache the selector results
- count = selector.count_points(x,y,z)
+ count = selector.count_points(x,y,z, 0.0)
return count
def select_particles(self, selector, x, y, z):
- mask = selector.select_points(x,y,z)
+ mask = selector.select_points(x,y,z, 0.0)
return mask
class ParticleOctreeSubset(OctreeSubset):
diff -r 2dd2d810e60cebaaab21688cf06e69580a3ad76d -r 9f6e4a1e5a167b44ff14baa306ba426f435283c2 yt/data_objects/unstructured_mesh.py
--- a/yt/data_objects/unstructured_mesh.py
+++ b/yt/data_objects/unstructured_mesh.py
@@ -171,9 +171,9 @@
def count_particles(self, selector, x, y, z):
# We don't cache the selector results
- count = selector.count_points(x,y,z)
+ count = selector.count_points(x,y,z, 0.0)
return count
def select_particles(self, selector, x, y, z):
- mask = selector.select_points(x,y,z)
+ mask = selector.select_points(x,y,z, 0.0)
return mask
diff -r 2dd2d810e60cebaaab21688cf06e69580a3ad76d -r 9f6e4a1e5a167b44ff14baa306ba426f435283c2 yt/frontends/art/io.py
--- a/yt/frontends/art/io.py
+++ b/yt/frontends/art/io.py
@@ -74,7 +74,7 @@
pbool, idxa, idxb = _determine_field_size(pf, ftype, self.ls, ptmax)
pstr = 'particle_position_%s'
x,y,z = [self._get_field((ftype, pstr % ax)) for ax in 'xyz']
- mask = selector.select_points(x, y, z)
+ mask = selector.select_points(x, y, z, 0.0)
if self.caching:
self.masks[key] = mask
return self.masks[key]
diff -r 2dd2d810e60cebaaab21688cf06e69580a3ad76d -r 9f6e4a1e5a167b44ff14baa306ba426f435283c2 yt/frontends/artio/io.py
--- a/yt/frontends/artio/io.py
+++ b/yt/frontends/artio/io.py
@@ -64,7 +64,7 @@
for ptype, field_list in sorted(ptf.items()):
x, y, z = (np.asarray(rv[ptype][pn % ax], dtype="=f8")
for ax in 'XYZ')
- mask = selector.select_points(x, y, z)
+ mask = selector.select_points(x, y, z, 0.0)
if mask is None: continue
for field in field_list:
data = np.asarray(rv[ptype][field], "=f8")
diff -r 2dd2d810e60cebaaab21688cf06e69580a3ad76d -r 9f6e4a1e5a167b44ff14baa306ba426f435283c2 yt/frontends/enzo/io.py
--- a/yt/frontends/enzo/io.py
+++ b/yt/frontends/enzo/io.py
@@ -104,7 +104,7 @@
r"particle_position_%s")
x, y, z = (np.asarray(pds.get(pn % ax).value, dtype="=f8")
for ax in 'xyz')
- mask = selector.select_points(x, y, z)
+ mask = selector.select_points(x, y, z, 0.0)
if mask is None: continue
for field in field_list:
data = np.asarray(pds.get(field).value, "=f8")
diff -r 2dd2d810e60cebaaab21688cf06e69580a3ad76d -r 9f6e4a1e5a167b44ff14baa306ba426f435283c2 yt/frontends/flash/io.py
--- a/yt/frontends/flash/io.py
+++ b/yt/frontends/flash/io.py
@@ -93,7 +93,7 @@
x = p_fields[start:end, px]
y = p_fields[start:end, py]
z = p_fields[start:end, pz]
- mask = selector.select_points(x, y, z)
+ mask = selector.select_points(x, y, z, 0.0)
if mask is None: continue
for field in field_list:
fi = self._particle_fields[field]
diff -r 2dd2d810e60cebaaab21688cf06e69580a3ad76d -r 9f6e4a1e5a167b44ff14baa306ba426f435283c2 yt/frontends/halo_catalogs/halo_catalog/io.py
--- a/yt/frontends/halo_catalogs/halo_catalog/io.py
+++ b/yt/frontends/halo_catalogs/halo_catalog/io.py
@@ -68,7 +68,7 @@
x = f['particle_position_x'].value.astype("float64")
y = f['particle_position_y'].value.astype("float64")
z = f['particle_position_z'].value.astype("float64")
- mask = selector.select_points(x, y, z)
+ mask = selector.select_points(x, y, z, 0.0)
del x, y, z
if mask is None: continue
for field in field_list:
diff -r 2dd2d810e60cebaaab21688cf06e69580a3ad76d -r 9f6e4a1e5a167b44ff14baa306ba426f435283c2 yt/frontends/halo_catalogs/rockstar/io.py
--- a/yt/frontends/halo_catalogs/rockstar/io.py
+++ b/yt/frontends/halo_catalogs/rockstar/io.py
@@ -74,7 +74,7 @@
x = halos['particle_position_x'].astype("float64")
y = halos['particle_position_y'].astype("float64")
z = halos['particle_position_z'].astype("float64")
- mask = selector.select_points(x, y, z)
+ mask = selector.select_points(x, y, z, 0.0)
del x, y, z
if mask is None: continue
for field in field_list:
diff -r 2dd2d810e60cebaaab21688cf06e69580a3ad76d -r 9f6e4a1e5a167b44ff14baa306ba426f435283c2 yt/frontends/ramses/io.py
--- a/yt/frontends/ramses/io.py
+++ b/yt/frontends/ramses/io.py
@@ -77,7 +77,7 @@
for ptype, field_list in sorted(ptf.items()):
x, y, z = (np.asarray(rv[ptype, pn % ax], "=f8")
for ax in 'xyz')
- mask = selector.select_points(x, y, z)
+ mask = selector.select_points(x, y, z, 0.0)
for field in field_list:
data = np.asarray(rv.pop((ptype, field))[mask], "=f8")
yield (ptype, field), data
diff -r 2dd2d810e60cebaaab21688cf06e69580a3ad76d -r 9f6e4a1e5a167b44ff14baa306ba426f435283c2 yt/frontends/sph/io.py
--- a/yt/frontends/sph/io.py
+++ b/yt/frontends/sph/io.py
@@ -99,7 +99,7 @@
g = f["/%s" % ptype]
coords = g["Coordinates"][:].astype("float64")
mask = selector.select_points(
- coords[:,0], coords[:,1], coords[:,2])
+ coords[:,0], coords[:,1], coords[:,2], 0.0)
del coords
if mask is None: continue
for field in field_list:
@@ -281,7 +281,7 @@
pos = self._read_field_from_file(f,
tp[ptype], "Coordinates")
mask = selector.select_points(
- pos[:,0], pos[:,1], pos[:,2])
+ pos[:,0], pos[:,1], pos[:,2], 0.0)
del pos
if mask is None: continue
for field in field_list:
@@ -534,7 +534,7 @@
mask = selector.select_points(
p["Coordinates"]['x'].astype("float64"),
p["Coordinates"]['y'].astype("float64"),
- p["Coordinates"]['z'].astype("float64"))
+ p["Coordinates"]['z'].astype("float64"), 0.0)
if mask is None: continue
tf = self._fill_fields(field_list, p, mask, data_file)
for field in field_list:
@@ -745,7 +745,7 @@
c = np.frombuffer(s, dtype="float64")
c.shape = (c.shape[0]/3.0, 3)
mask = selector.select_points(
- c[:,0], c[:,1], c[:,2])
+ c[:,0], c[:,1], c[:,2], 0.0)
del c
if mask is None: continue
for field in field_list:
diff -r 2dd2d810e60cebaaab21688cf06e69580a3ad76d -r 9f6e4a1e5a167b44ff14baa306ba426f435283c2 yt/frontends/stream/io.py
--- a/yt/frontends/stream/io.py
+++ b/yt/frontends/stream/io.py
@@ -85,7 +85,7 @@
for ptype, field_list in sorted(ptf.items()):
x, y, z = (gf[ptype, "particle_position_%s" % ax]
for ax in 'xyz')
- mask = selector.select_points(x, y, z)
+ mask = selector.select_points(x, y, z, 0.0)
if mask is None: continue
for field in field_list:
data = np.asarray(gf[ptype, field])
@@ -127,7 +127,7 @@
for ptype, field_list in sorted(ptf.items()):
x, y, z = (f[ptype, "particle_position_%s" % ax]
for ax in 'xyz')
- mask = selector.select_points(x, y, z)
+ mask = selector.select_points(x, y, z, 0.0)
if mask is None: continue
for field in field_list:
data = f[ptype, field][mask]
diff -r 2dd2d810e60cebaaab21688cf06e69580a3ad76d -r 9f6e4a1e5a167b44ff14baa306ba426f435283c2 yt/geometry/selection_routines.pyx
--- a/yt/geometry/selection_routines.pyx
+++ b/yt/geometry/selection_routines.pyx
@@ -455,10 +455,10 @@
@cython.boundscheck(False)
@cython.wraparound(False)
@cython.cdivision(True)
- def count_points(self, np.ndarray[np.float64_t, ndim=1] x,
- np.ndarray[np.float64_t, ndim=1] y,
- np.ndarray[np.float64_t, ndim=1] z,
- np.float64_t radius = 0.0):
+ def count_points(self, np.ndarray[anyfloat, ndim=1] x,
+ np.ndarray[anyfloat, ndim=1] y,
+ np.ndarray[anyfloat, ndim=1] z,
+ np.float64_t radius):
cdef int count = 0
cdef int i
cdef np.float64_t pos[3]
@@ -483,10 +483,10 @@
@cython.boundscheck(False)
@cython.wraparound(False)
@cython.cdivision(True)
- def select_points(self, np.ndarray[np.float64_t, ndim=1] x,
- np.ndarray[np.float64_t, ndim=1] y,
- np.ndarray[np.float64_t, ndim=1] z,
- np.float64_t radius = 0.0):
+ def select_points(self, np.ndarray[anyfloat, ndim=1] x,
+ np.ndarray[anyfloat, ndim=1] y,
+ np.ndarray[anyfloat, ndim=1] z,
+ np.float64_t radius):
cdef int count = 0
cdef int i
cdef np.float64_t pos[3]
diff -r 2dd2d810e60cebaaab21688cf06e69580a3ad76d -r 9f6e4a1e5a167b44ff14baa306ba426f435283c2 yt/utilities/io_handler.py
--- a/yt/utilities/io_handler.py
+++ b/yt/utilities/io_handler.py
@@ -146,7 +146,7 @@
# Here, ptype_map means which particles contribute to a given type.
# And ptf is the actual fields from disk to read.
for ptype, (x, y, z) in self._read_particle_coords(chunks, ptf):
- psize[ptype] += selector.count_points(x, y, z)
+ psize[ptype] += selector.count_points(x, y, z, 0.0)
self._last_selector_counts = dict(**psize)
self._last_selector_id = hash(selector)
# Now we allocate
https://bitbucket.org/yt_analysis/yt/commits/1a1a499cd862/
Changeset: 1a1a499cd862
Branch: yt-3.0
User: MatthewTurk
Date: 2014-04-23 20:30:11
Summary: Do not always upcast to 64 bits in YTArray.
Affected #: 1 file
diff -r 9f6e4a1e5a167b44ff14baa306ba426f435283c2 -r 1a1a499cd862630ea3329dd2bb9ae37939e87a2b yt/units/yt_array.py
--- a/yt/units/yt_array.py
+++ b/yt/units/yt_array.py
@@ -237,7 +237,9 @@
__array_priority__ = 2.0
- def __new__(cls, input_array, input_units=None, registry=None, dtype=np.float64):
+ def __new__(cls, input_array, input_units=None, registry=None, dtype=None):
+ if dtype is None:
+ dtype = getattr(input_array, 'dtype', np.float64)
if input_array is NotImplemented:
return input_array
if registry is None and isinstance(input_units, basestring):
https://bitbucket.org/yt_analysis/yt/commits/a52509219135/
Changeset: a52509219135
Branch: yt-3.0
User: MatthewTurk
Date: 2014-04-24 23:04:38
Summary: Merged in MatthewTurk/yt/yt-3.0 (pull request #853)
Enable 32 bit particle types
Affected #: 15 files
diff -r 7bd133d91d3934b8f4617f73b01cd102fb23af8b -r a52509219135faa377fcbefdff695c70a0d3de7f yt/data_objects/grid_patch.py
--- a/yt/data_objects/grid_patch.py
+++ b/yt/data_objects/grid_patch.py
@@ -379,9 +379,9 @@
def count_particles(self, selector, x, y, z):
# We don't cache the selector results
- count = selector.count_points(x,y,z)
+ count = selector.count_points(x,y,z, 0.0)
return count
def select_particles(self, selector, x, y, z):
- mask = selector.select_points(x,y,z)
+ mask = selector.select_points(x,y,z, 0.0)
return mask
diff -r 7bd133d91d3934b8f4617f73b01cd102fb23af8b -r a52509219135faa377fcbefdff695c70a0d3de7f yt/data_objects/octree_subset.py
--- a/yt/data_objects/octree_subset.py
+++ b/yt/data_objects/octree_subset.py
@@ -249,11 +249,11 @@
def count_particles(self, selector, x, y, z):
# We don't cache the selector results
- count = selector.count_points(x,y,z)
+ count = selector.count_points(x,y,z, 0.0)
return count
def select_particles(self, selector, x, y, z):
- mask = selector.select_points(x,y,z)
+ mask = selector.select_points(x,y,z, 0.0)
return mask
class ParticleOctreeSubset(OctreeSubset):
diff -r 7bd133d91d3934b8f4617f73b01cd102fb23af8b -r a52509219135faa377fcbefdff695c70a0d3de7f yt/data_objects/unstructured_mesh.py
--- a/yt/data_objects/unstructured_mesh.py
+++ b/yt/data_objects/unstructured_mesh.py
@@ -171,9 +171,9 @@
def count_particles(self, selector, x, y, z):
# We don't cache the selector results
- count = selector.count_points(x,y,z)
+ count = selector.count_points(x,y,z, 0.0)
return count
def select_particles(self, selector, x, y, z):
- mask = selector.select_points(x,y,z)
+ mask = selector.select_points(x,y,z, 0.0)
return mask
diff -r 7bd133d91d3934b8f4617f73b01cd102fb23af8b -r a52509219135faa377fcbefdff695c70a0d3de7f yt/frontends/art/io.py
--- a/yt/frontends/art/io.py
+++ b/yt/frontends/art/io.py
@@ -74,7 +74,7 @@
pbool, idxa, idxb = _determine_field_size(pf, ftype, self.ls, ptmax)
pstr = 'particle_position_%s'
x,y,z = [self._get_field((ftype, pstr % ax)) for ax in 'xyz']
- mask = selector.select_points(x, y, z)
+ mask = selector.select_points(x, y, z, 0.0)
if self.caching:
self.masks[key] = mask
return self.masks[key]
diff -r 7bd133d91d3934b8f4617f73b01cd102fb23af8b -r a52509219135faa377fcbefdff695c70a0d3de7f yt/frontends/artio/io.py
--- a/yt/frontends/artio/io.py
+++ b/yt/frontends/artio/io.py
@@ -64,7 +64,7 @@
for ptype, field_list in sorted(ptf.items()):
x, y, z = (np.asarray(rv[ptype][pn % ax], dtype="=f8")
for ax in 'XYZ')
- mask = selector.select_points(x, y, z)
+ mask = selector.select_points(x, y, z, 0.0)
if mask is None: continue
for field in field_list:
data = np.asarray(rv[ptype][field], "=f8")
diff -r 7bd133d91d3934b8f4617f73b01cd102fb23af8b -r a52509219135faa377fcbefdff695c70a0d3de7f yt/frontends/enzo/io.py
--- a/yt/frontends/enzo/io.py
+++ b/yt/frontends/enzo/io.py
@@ -104,7 +104,7 @@
r"particle_position_%s")
x, y, z = (np.asarray(pds.get(pn % ax).value, dtype="=f8")
for ax in 'xyz')
- mask = selector.select_points(x, y, z)
+ mask = selector.select_points(x, y, z, 0.0)
if mask is None: continue
for field in field_list:
data = np.asarray(pds.get(field).value, "=f8")
diff -r 7bd133d91d3934b8f4617f73b01cd102fb23af8b -r a52509219135faa377fcbefdff695c70a0d3de7f yt/frontends/flash/io.py
--- a/yt/frontends/flash/io.py
+++ b/yt/frontends/flash/io.py
@@ -93,7 +93,7 @@
x = p_fields[start:end, px]
y = p_fields[start:end, py]
z = p_fields[start:end, pz]
- mask = selector.select_points(x, y, z)
+ mask = selector.select_points(x, y, z, 0.0)
if mask is None: continue
for field in field_list:
fi = self._particle_fields[field]
diff -r 7bd133d91d3934b8f4617f73b01cd102fb23af8b -r a52509219135faa377fcbefdff695c70a0d3de7f yt/frontends/halo_catalogs/halo_catalog/io.py
--- a/yt/frontends/halo_catalogs/halo_catalog/io.py
+++ b/yt/frontends/halo_catalogs/halo_catalog/io.py
@@ -68,7 +68,7 @@
x = f['particle_position_x'].value.astype("float64")
y = f['particle_position_y'].value.astype("float64")
z = f['particle_position_z'].value.astype("float64")
- mask = selector.select_points(x, y, z)
+ mask = selector.select_points(x, y, z, 0.0)
del x, y, z
if mask is None: continue
for field in field_list:
diff -r 7bd133d91d3934b8f4617f73b01cd102fb23af8b -r a52509219135faa377fcbefdff695c70a0d3de7f yt/frontends/halo_catalogs/rockstar/io.py
--- a/yt/frontends/halo_catalogs/rockstar/io.py
+++ b/yt/frontends/halo_catalogs/rockstar/io.py
@@ -74,7 +74,7 @@
x = halos['particle_position_x'].astype("float64")
y = halos['particle_position_y'].astype("float64")
z = halos['particle_position_z'].astype("float64")
- mask = selector.select_points(x, y, z)
+ mask = selector.select_points(x, y, z, 0.0)
del x, y, z
if mask is None: continue
for field in field_list:
diff -r 7bd133d91d3934b8f4617f73b01cd102fb23af8b -r a52509219135faa377fcbefdff695c70a0d3de7f yt/frontends/ramses/io.py
--- a/yt/frontends/ramses/io.py
+++ b/yt/frontends/ramses/io.py
@@ -77,7 +77,7 @@
for ptype, field_list in sorted(ptf.items()):
x, y, z = (np.asarray(rv[ptype, pn % ax], "=f8")
for ax in 'xyz')
- mask = selector.select_points(x, y, z)
+ mask = selector.select_points(x, y, z, 0.0)
for field in field_list:
data = np.asarray(rv.pop((ptype, field))[mask], "=f8")
yield (ptype, field), data
diff -r 7bd133d91d3934b8f4617f73b01cd102fb23af8b -r a52509219135faa377fcbefdff695c70a0d3de7f yt/frontends/sph/io.py
--- a/yt/frontends/sph/io.py
+++ b/yt/frontends/sph/io.py
@@ -99,7 +99,7 @@
g = f["/%s" % ptype]
coords = g["Coordinates"][:].astype("float64")
mask = selector.select_points(
- coords[:,0], coords[:,1], coords[:,2])
+ coords[:,0], coords[:,1], coords[:,2], 0.0)
del coords
if mask is None: continue
for field in field_list:
@@ -281,7 +281,7 @@
pos = self._read_field_from_file(f,
tp[ptype], "Coordinates")
mask = selector.select_points(
- pos[:,0], pos[:,1], pos[:,2])
+ pos[:,0], pos[:,1], pos[:,2], 0.0)
del pos
if mask is None: continue
for field in field_list:
@@ -534,7 +534,7 @@
mask = selector.select_points(
p["Coordinates"]['x'].astype("float64"),
p["Coordinates"]['y'].astype("float64"),
- p["Coordinates"]['z'].astype("float64"))
+ p["Coordinates"]['z'].astype("float64"), 0.0)
if mask is None: continue
tf = self._fill_fields(field_list, p, mask, data_file)
for field in field_list:
@@ -751,7 +751,7 @@
c = np.frombuffer(s, dtype="float64")
c.shape = (c.shape[0]/3.0, 3)
mask = selector.select_points(
- c[:,0], c[:,1], c[:,2])
+ c[:,0], c[:,1], c[:,2], 0.0)
del c
if mask is None: continue
for field in field_list:
diff -r 7bd133d91d3934b8f4617f73b01cd102fb23af8b -r a52509219135faa377fcbefdff695c70a0d3de7f yt/frontends/stream/io.py
--- a/yt/frontends/stream/io.py
+++ b/yt/frontends/stream/io.py
@@ -85,7 +85,7 @@
for ptype, field_list in sorted(ptf.items()):
x, y, z = (gf[ptype, "particle_position_%s" % ax]
for ax in 'xyz')
- mask = selector.select_points(x, y, z)
+ mask = selector.select_points(x, y, z, 0.0)
if mask is None: continue
for field in field_list:
data = np.asarray(gf[ptype, field])
@@ -127,7 +127,7 @@
for ptype, field_list in sorted(ptf.items()):
x, y, z = (f[ptype, "particle_position_%s" % ax]
for ax in 'xyz')
- mask = selector.select_points(x, y, z)
+ mask = selector.select_points(x, y, z, 0.0)
if mask is None: continue
for field in field_list:
data = f[ptype, field][mask]
diff -r 7bd133d91d3934b8f4617f73b01cd102fb23af8b -r a52509219135faa377fcbefdff695c70a0d3de7f yt/geometry/selection_routines.pyx
--- a/yt/geometry/selection_routines.pyx
+++ b/yt/geometry/selection_routines.pyx
@@ -455,10 +455,10 @@
@cython.boundscheck(False)
@cython.wraparound(False)
@cython.cdivision(True)
- def count_points(self, np.ndarray[np.float64_t, ndim=1] x,
- np.ndarray[np.float64_t, ndim=1] y,
- np.ndarray[np.float64_t, ndim=1] z,
- np.float64_t radius = 0.0):
+ def count_points(self, np.ndarray[anyfloat, ndim=1] x,
+ np.ndarray[anyfloat, ndim=1] y,
+ np.ndarray[anyfloat, ndim=1] z,
+ np.float64_t radius):
cdef int count = 0
cdef int i
cdef np.float64_t pos[3]
@@ -483,10 +483,10 @@
@cython.boundscheck(False)
@cython.wraparound(False)
@cython.cdivision(True)
- def select_points(self, np.ndarray[np.float64_t, ndim=1] x,
- np.ndarray[np.float64_t, ndim=1] y,
- np.ndarray[np.float64_t, ndim=1] z,
- np.float64_t radius = 0.0):
+ def select_points(self, np.ndarray[anyfloat, ndim=1] x,
+ np.ndarray[anyfloat, ndim=1] y,
+ np.ndarray[anyfloat, ndim=1] z,
+ np.float64_t radius):
cdef int count = 0
cdef int i
cdef np.float64_t pos[3]
diff -r 7bd133d91d3934b8f4617f73b01cd102fb23af8b -r a52509219135faa377fcbefdff695c70a0d3de7f yt/units/yt_array.py
--- a/yt/units/yt_array.py
+++ b/yt/units/yt_array.py
@@ -237,7 +237,9 @@
__array_priority__ = 2.0
- def __new__(cls, input_array, input_units=None, registry=None, dtype=np.float64):
+ def __new__(cls, input_array, input_units=None, registry=None, dtype=None):
+ if dtype is None:
+ dtype = getattr(input_array, 'dtype', np.float64)
if input_array is NotImplemented:
return input_array
if registry is None and isinstance(input_units, basestring):
diff -r 7bd133d91d3934b8f4617f73b01cd102fb23af8b -r a52509219135faa377fcbefdff695c70a0d3de7f yt/utilities/io_handler.py
--- a/yt/utilities/io_handler.py
+++ b/yt/utilities/io_handler.py
@@ -146,7 +146,7 @@
# Here, ptype_map means which particles contribute to a given type.
# And ptf is the actual fields from disk to read.
for ptype, (x, y, z) in self._read_particle_coords(chunks, ptf):
- psize[ptype] += selector.count_points(x, y, z)
+ psize[ptype] += selector.count_points(x, y, z, 0.0)
self._last_selector_counts = dict(**psize)
self._last_selector_id = hash(selector)
# Now we allocate
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