[yt-svn] commit/yt: 3 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Tue Oct 22 06:35:33 PDT 2013
3 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/d1007b2f5d90/
Changeset: d1007b2f5d90
Branch: yt
User: MatthewTurk
Date: 2013-10-21 23:45:54
Summary: Compute dy for projections.
Affected #: 1 file
diff -r 0d2bc17ad518127ae36708577486be87a104bb73 -r d1007b2f5d90c007c32598c0ee4be13823d22722 yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -1864,7 +1864,7 @@
new_buf.append(self.comm.mpi_allreduce(buf.pop(0), op=op))
tree = self._get_tree(len(fields))
tree.frombuffer(new_buf[0], new_buf[1], new_buf[2], merge_style)
- coord_data, field_data, weight_data, dxs = [], [], [], []
+ coord_data, field_data, weight_data, dxs, dys = [], [], [], [], []
for level in range(0, self._max_level + 1):
npos, nvals, nwvals = tree.get_all_from_level(level, False)
coord_data.append(npos)
@@ -1873,10 +1873,12 @@
weight_data.append(nwvals)
gs = self.source.select_grids(level)
if len(gs) > 0:
- ds = gs[0].dds[0]
+ dx = gs[0].dds[x_dict[self.axis]]
+ dy = gs[0].dds[y_dict[self.axis]]
else:
ds = 0.0
- dxs.append(np.ones(nvals.shape[0], dtype='float64') * ds)
+ dxs.append(np.ones(nvals.shape[0], dtype='float64') * dx)
+ dys.append(np.ones(nvals.shape[0], dtype='float64') * dy)
coord_data = np.concatenate(coord_data, axis=0).transpose()
field_data = np.concatenate(field_data, axis=0).transpose()
if self._weight is None:
@@ -1884,17 +1886,19 @@
field_data *= convs[:,None]
weight_data = np.concatenate(weight_data, axis=0).transpose()
dxs = np.concatenate(dxs, axis=0).transpose()
+ dys = np.concatenate(dys, axis=0).transpose()
# We now convert to half-widths and center-points
data = {}
data['pdx'] = dxs
+ data['pdy'] = dys
ox = self.pf.domain_left_edge[x_dict[self.axis]]
oy = self.pf.domain_left_edge[y_dict[self.axis]]
data['px'] = (coord_data[0,:]+0.5) * data['pdx'] + ox
- data['py'] = (coord_data[1,:]+0.5) * data['pdx'] + oy
+ data['py'] = (coord_data[1,:]+0.5) * data['pdy'] + oy
data['weight_field'] = weight_data
del coord_data
data['pdx'] *= 0.5
- data['pdy'] = data['pdx'] # generalization is out the window!
+ data['pdy'] *= 0.5
data['fields'] = field_data
# Now we run the finalizer, which is ignored if we don't need it
field_data = np.vsplit(data.pop('fields'), len(fields))
https://bitbucket.org/yt_analysis/yt/commits/5f17d281913e/
Changeset: 5f17d281913e
Branch: yt
User: MatthewTurk
Date: 2013-10-22 14:33:40
Summary: Need to set dx, dy here.
Affected #: 1 file
diff -r d1007b2f5d90c007c32598c0ee4be13823d22722 -r 5f17d281913e19fb38253279ee948806037b16f9 yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -1876,7 +1876,7 @@
dx = gs[0].dds[x_dict[self.axis]]
dy = gs[0].dds[y_dict[self.axis]]
else:
- ds = 0.0
+ dx = dy = 0.0
dxs.append(np.ones(nvals.shape[0], dtype='float64') * dx)
dys.append(np.ones(nvals.shape[0], dtype='float64') * dy)
coord_data = np.concatenate(coord_data, axis=0).transpose()
https://bitbucket.org/yt_analysis/yt/commits/6c2659ee47dc/
Changeset: 6c2659ee47dc
Branch: yt
User: MatthewTurk
Date: 2013-10-22 15:35:26
Summary: Merged in MatthewTurk/yt (pull request #620)
Compute dy for projections.
Affected #: 1 file
diff -r 7b1622244f87f663d42f3f6e8e70d8c5eacc15b2 -r 6c2659ee47dc8efa222e5256e6d7a3ec658c39cf yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -1864,7 +1864,7 @@
new_buf.append(self.comm.mpi_allreduce(buf.pop(0), op=op))
tree = self._get_tree(len(fields))
tree.frombuffer(new_buf[0], new_buf[1], new_buf[2], merge_style)
- coord_data, field_data, weight_data, dxs = [], [], [], []
+ coord_data, field_data, weight_data, dxs, dys = [], [], [], [], []
for level in range(0, self._max_level + 1):
npos, nvals, nwvals = tree.get_all_from_level(level, False)
coord_data.append(npos)
@@ -1873,10 +1873,12 @@
weight_data.append(nwvals)
gs = self.source.select_grids(level)
if len(gs) > 0:
- ds = gs[0].dds[0]
+ dx = gs[0].dds[x_dict[self.axis]]
+ dy = gs[0].dds[y_dict[self.axis]]
else:
- ds = 0.0
- dxs.append(np.ones(nvals.shape[0], dtype='float64') * ds)
+ dx = dy = 0.0
+ dxs.append(np.ones(nvals.shape[0], dtype='float64') * dx)
+ dys.append(np.ones(nvals.shape[0], dtype='float64') * dy)
coord_data = np.concatenate(coord_data, axis=0).transpose()
field_data = np.concatenate(field_data, axis=0).transpose()
if self._weight is None:
@@ -1884,17 +1886,19 @@
field_data *= convs[:,None]
weight_data = np.concatenate(weight_data, axis=0).transpose()
dxs = np.concatenate(dxs, axis=0).transpose()
+ dys = np.concatenate(dys, axis=0).transpose()
# We now convert to half-widths and center-points
data = {}
data['pdx'] = dxs
+ data['pdy'] = dys
ox = self.pf.domain_left_edge[x_dict[self.axis]]
oy = self.pf.domain_left_edge[y_dict[self.axis]]
data['px'] = (coord_data[0,:]+0.5) * data['pdx'] + ox
- data['py'] = (coord_data[1,:]+0.5) * data['pdx'] + oy
+ data['py'] = (coord_data[1,:]+0.5) * data['pdy'] + oy
data['weight_field'] = weight_data
del coord_data
data['pdx'] *= 0.5
- data['pdy'] = data['pdx'] # generalization is out the window!
+ data['pdy'] *= 0.5
data['fields'] = field_data
# Now we run the finalizer, which is ignored if we don't need it
field_data = np.vsplit(data.pop('fields'), len(fields))
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