[Yt-svn] commit/yt: 2 new changesets
Bitbucket
commits-noreply at bitbucket.org
Sun Mar 13 19:16:49 PDT 2011
2 new changesets in yt:
http://bitbucket.org/yt_analysis/yt/changeset/e6764b72d42b/
changeset: r3817:e6764b72d42b
branch: yt
user: sskory
date: 2011-03-12 00:47:25
summary: Delcaring some undeclared variables. Doesn't appear to help anything however.
affected #: 1 file (33 bytes)
--- a/yt/utilities/_amr_utils/Octree.pyx Fri Mar 11 11:29:48 2011 -0800
+++ b/yt/utilities/_amr_utils/Octree.pyx Fri Mar 11 16:47:25 2011 -0700
@@ -52,7 +52,7 @@
self.weight_val += weight_val
cdef void OTN_refine(OctreeNode *self):
- cdef int i, j, i1, j1
+ cdef int i, j, k, i1, j1
cdef np.int64_t npos[3]
cdef OctreeNode *node
for i in range(2):
@@ -73,7 +73,7 @@
np.float64_t *val, np.float64_t weight_val,
int level):
cdef OctreeNode *node
- cdef int i, j
+ cdef int i, j, k
node = <OctreeNode *> malloc(sizeof(OctreeNode))
node.pos[0] = pos[0]
node.pos[1] = pos[1]
@@ -92,7 +92,7 @@
return node
cdef void OTN_free(OctreeNode *node):
- cdef int i, j
+ cdef int i, j, k
for i in range(2):
for j in range(2):
for k in range(2):
@@ -110,7 +110,7 @@
def __cinit__(self, np.ndarray[np.int64_t, ndim=1] top_grid_dims,
int nvals, int incremental = False):
- cdef int i, j
+ cdef int i, j, k
self.incremental = incremental
cdef OctreeNode *node
cdef np.int64_t pos[3]
@@ -149,7 +149,7 @@
int level, np.int64_t pos[3],
np.float64_t *val,
np.float64_t weight_val):
- cdef int i, j
+ cdef int i, j, k, L
cdef OctreeNode *node
node = self.find_on_root_level(pos, level)
cdef np.int64_t fac
@@ -169,7 +169,7 @@
cdef OctreeNode *find_on_root_level(self, np.int64_t pos[3], int level):
# We need this because the root level won't just have four children
# So we find on the root level, then we traverse the tree.
- cdef np.int64_t i, j
+ cdef np.int64_t i, j, k
i = <np.int64_t> (pos[0] / self.po2[level])
j = <np.int64_t> (pos[1] / self.po2[level])
k = <np.int64_t> (pos[2] / self.po2[level])
@@ -206,7 +206,7 @@
@cython.boundscheck(False)
@cython.wraparound(False)
def get_all_from_level(self, int level, int count_only = 0):
- cdef int i, j
+ cdef int i, j, k
cdef int total = 0
vals = []
for i in range(self.top_grid_dims[0]):
@@ -233,7 +233,7 @@
return npos, nvals, nwvals
cdef int count_at_level(self, OctreeNode *node, int level):
- cdef int i, j
+ cdef int i, j, k
# We only really return a non-zero, calculated value if we are at the
# level in question.
if node.level == level:
@@ -254,7 +254,7 @@
np.int64_t *pdata,
np.float64_t *vdata,
np.float64_t *wdata):
- cdef int i, j
+ cdef int i, j, k
if node.level == level:
if node.children[0][0][0] != NULL and not self.incremental:
return 0
@@ -275,7 +275,7 @@
return added
def __dealloc__(self):
- cdef int i, j
+ cdef int i, j, k
for i in range(self.top_grid_dims[0]):
for j in range(self.top_grid_dims[1]):
for k in range(self.top_grid_dims[2]):
http://bitbucket.org/yt_analysis/yt/changeset/474c5063a744/
changeset: r3818:474c5063a744
branch: yt
user: sskory
date: 2011-03-14 03:11:53
summary: Merging.
affected #: 1 file (66 bytes)
--- a/yt/utilities/_amr_utils/Octree.pyx Fri Mar 11 16:47:25 2011 -0700
+++ b/yt/utilities/_amr_utils/Octree.pyx Sun Mar 13 20:11:53 2011 -0600
@@ -51,7 +51,7 @@
self.val[i] += val[i]
self.weight_val += weight_val
-cdef void OTN_refine(OctreeNode *self):
+cdef void OTN_refine(OctreeNode *self, int incremental = 0):
cdef int i, j, k, i1, j1
cdef np.int64_t npos[3]
cdef OctreeNode *node
@@ -66,6 +66,7 @@
npos,
self.nvals, self.val, self.weight_val,
self.level + 1)
+ if incremental: return
for i in range(self.nvals): self.val[i] = 0.0
self.weight_val = 0.0
@@ -157,7 +158,7 @@
if self.incremental:
OTN_add_value(node, val, weight_val)
if node.children[0][0][0] == NULL:
- OTN_refine(node)
+ OTN_refine(node, self.incremental)
# Maybe we should use bitwise operators?
fac = self.po2[level - L - 1]
i = (pos[0] >= fac*(2*node.pos[0]+1))
--- a/yt/utilities/parallel_tools/parallel_analysis_interface.py Fri Mar 11 16:47:25 2011 -0700
+++ b/yt/utilities/parallel_tools/parallel_analysis_interface.py Sun Mar 13 20:11:53 2011 -0600
@@ -152,7 +152,7 @@
retval = func(self, *args, **kwargs)
self._processing = False
retval = MPI.COMM_WORLD.bcast(retval, root=self._owner)
- MPI.COMM_WORLD.Barrier()
+ #MPI.COMM_WORLD.Barrier()
return retval
return single_proc_results
@@ -235,7 +235,7 @@
all_clear = 0
else:
all_clear = None
- MPI.COMM_WORLD.Barrier()
+ #MPI.COMM_WORLD.Barrier()
all_clear = MPI.COMM_WORLD.bcast(all_clear, root=0)
if not all_clear: raise RuntimeError
if parallel_capable: return root_only
@@ -632,14 +632,14 @@
@parallel_passthrough
def _mpi_joindict(self, data):
- self._barrier()
+ #self._barrier()
if MPI.COMM_WORLD.rank == 0:
for i in range(1,MPI.COMM_WORLD.size):
data.update(MPI.COMM_WORLD.recv(source=i, tag=0))
else:
MPI.COMM_WORLD.send(data, dest=0, tag=0)
data = MPI.COMM_WORLD.bcast(data, root=0)
- self._barrier()
+ #self._barrier()
return data
@parallel_passthrough
@@ -1081,7 +1081,7 @@
@parallel_passthrough
def _mpi_bcast_pickled(self, data):
- self._barrier()
+ #self._barrier()
data = MPI.COMM_WORLD.bcast(data, root=0)
return data
@@ -1115,7 +1115,7 @@
@parallel_passthrough
def _mpi_allsum(self, data):
- self._barrier()
+ #self._barrier()
# We use old-school pickling here on the assumption the arrays are
# relatively small ( < 1e7 elements )
if isinstance(data, na.ndarray) and data.dtype != na.bool:
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