[yt-svn] commit/yt: 5 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Thu Feb 16 12:54:57 PST 2017
5 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/5bc07024ae50/
Changeset: 5bc07024ae50
Branch: yt
User: xarthisius
Date: 2017-02-13 17:16:08+00:00
Summary: Add missing function declarations (-Wimplicit-function-declaration)
Affected #: 3 files
diff -r fb62830c163dff615a41314214a81e4e784155b1 -r 5bc07024ae5080d5270d79ccbd13d156569c272f yt/analysis_modules/halo_finding/hop/EnzoHop.c
--- a/yt/analysis_modules/halo_finding/hop/EnzoHop.c
+++ b/yt/analysis_modules/halo_finding/hop/EnzoHop.c
@@ -27,6 +27,9 @@
#define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
#endif
+void PrepareKD(KD kd);
+int kdMedianJst(KD kd, int d, int l, int u);
+void kdUpPass(KD kd, int iCell);
void initgrouplist(Grouplist *g);
void hop_main(KD kd, HC *my_comm, float densthres);
void regroup_main(float dens_outer, HC *my_comm);
diff -r fb62830c163dff615a41314214a81e4e784155b1 -r 5bc07024ae5080d5270d79ccbd13d156569c272f yt/utilities/lib/fixed_interpolator.h
--- a/yt/utilities/lib/fixed_interpolator.h
+++ b/yt/utilities/lib/fixed_interpolator.h
@@ -29,6 +29,8 @@
void eval_gradient(int ds[3], npy_float64 dp[3], npy_float64 *data, npy_float64 *grad);
+void offset_fill(int *ds, npy_float64 *data, npy_float64 *gridval);
+
void vertex_interp(npy_float64 v1, npy_float64 v2, npy_float64 isovalue,
npy_float64 vl[3], npy_float64 dds[3],
npy_float64 x, npy_float64 y, npy_float64 z,
diff -r fb62830c163dff615a41314214a81e4e784155b1 -r 5bc07024ae5080d5270d79ccbd13d156569c272f yt/utilities/lib/marching_cubes.pyx
--- a/yt/utilities/lib/marching_cubes.pyx
+++ b/yt/utilities/lib/marching_cubes.pyx
@@ -19,7 +19,11 @@
from yt.utilities.lib.fp_utils cimport imax, fmax, imin, fmin, iclip, fclip
from libc.stdlib cimport malloc, free, abs
from libc.math cimport sqrt
-from fixed_interpolator cimport *
+from fixed_interpolator cimport \
+ eval_gradient, \
+ offset_fill, \
+ offset_interpolate, \
+ vertex_interp
from yt.units.yt_array import YTArray
https://bitbucket.org/yt_analysis/yt/commits/d49f39485f7c/
Changeset: d49f39485f7c
Branch: yt
User: xarthisius
Date: 2017-02-13 17:29:30+00:00
Summary: Fix incompatible pointer type (-Wincompatible-pointer-types)
Affected #: 1 file
diff -r 5bc07024ae5080d5270d79ccbd13d156569c272f -r d49f39485f7c1f850dcfa925ca9c4614bfd470e8 yt/geometry/oct_container.pyx
--- a/yt/geometry/oct_container.pyx
+++ b/yt/geometry/oct_container.pyx
@@ -744,7 +744,7 @@
self.visit_all_octs(selector, visitor)
assert ((visitor.global_index+1)*visitor.nz == visitor.index)
-cdef int root_node_compare(void *a, void *b) nogil:
+cdef int root_node_compare(const void *a, const void *b) nogil:
cdef OctKey *ao
cdef OctKey *bo
ao = <OctKey *>a
https://bitbucket.org/yt_analysis/yt/commits/e573c08f64a7/
Changeset: e573c08f64a7
Branch: yt
User: xarthisius
Date: 2017-02-13 17:30:12+00:00
Summary: Use proper type for casting (-Wdiscarded-qualifiers)
Affected #: 1 file
diff -r d49f39485f7c1f850dcfa925ca9c4614bfd470e8 -r e573c08f64a77ce849ab4b659fba2c6707b37b89 yt/utilities/spatial/src/distance_wrap.c
--- a/yt/utilities/spatial/src/distance_wrap.c
+++ b/yt/utilities/spatial/src/distance_wrap.c
@@ -863,7 +863,7 @@
else {
X = (double*)X_->data;
dm = (double*)dm_->data;
- w = (const double*)w_->data;
+ w = (double*)w_->data;
m = X_->dimensions[0];
n = X_->dimensions[1];
https://bitbucket.org/yt_analysis/yt/commits/1a08d526dc2c/
Changeset: 1a08d526dc2c
Branch: yt
User: xarthisius
Date: 2017-02-13 17:34:56+00:00
Summary: Remove spurious casting of self.tree (-Wpointer-to-int-cast)
Affected #: 1 file
diff -r e573c08f64a77ce849ab4b659fba2c6707b37b89 -r 1a08d526dc2c5a656ce1fbd063061f65575d9692 yt/utilities/spatial/ckdtree.pyx
--- a/yt/utilities/spatial/ckdtree.pyx
+++ b/yt/utilities/spatial/ckdtree.pyx
@@ -370,7 +370,7 @@
stdlib.free(node)
def __dealloc__(cKDTree self):
- if <int>(self.tree) == 0:
+ if self.tree == NULL:
# should happen only if __init__ was never called
return
self.__free_tree(self.tree)
https://bitbucket.org/yt_analysis/yt/commits/bd8fa3c828d7/
Changeset: bd8fa3c828d7
Branch: yt
User: ngoldbaum
Date: 2017-02-16 20:54:48+00:00
Summary: Merged in xarthisius/yt (pull request #2519)
Fix C warnings
Approved-by: Matt Turk
Approved-by: Nathan Goldbaum
Affected #: 6 files
diff -r 0e90715fb16b38b466fafbcf5d8d726ada22263a -r bd8fa3c828d7ef0e439ca5527982a65f7817507b yt/analysis_modules/halo_finding/hop/EnzoHop.c
--- a/yt/analysis_modules/halo_finding/hop/EnzoHop.c
+++ b/yt/analysis_modules/halo_finding/hop/EnzoHop.c
@@ -27,6 +27,9 @@
#define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
#endif
+void PrepareKD(KD kd);
+int kdMedianJst(KD kd, int d, int l, int u);
+void kdUpPass(KD kd, int iCell);
void initgrouplist(Grouplist *g);
void hop_main(KD kd, HC *my_comm, float densthres);
void regroup_main(float dens_outer, HC *my_comm);
diff -r 0e90715fb16b38b466fafbcf5d8d726ada22263a -r bd8fa3c828d7ef0e439ca5527982a65f7817507b yt/geometry/oct_container.pyx
--- a/yt/geometry/oct_container.pyx
+++ b/yt/geometry/oct_container.pyx
@@ -744,7 +744,7 @@
self.visit_all_octs(selector, visitor)
assert ((visitor.global_index+1)*visitor.nz == visitor.index)
-cdef int root_node_compare(void *a, void *b) nogil:
+cdef int root_node_compare(const void *a, const void *b) nogil:
cdef OctKey *ao
cdef OctKey *bo
ao = <OctKey *>a
diff -r 0e90715fb16b38b466fafbcf5d8d726ada22263a -r bd8fa3c828d7ef0e439ca5527982a65f7817507b yt/utilities/lib/fixed_interpolator.h
--- a/yt/utilities/lib/fixed_interpolator.h
+++ b/yt/utilities/lib/fixed_interpolator.h
@@ -29,6 +29,8 @@
void eval_gradient(int ds[3], npy_float64 dp[3], npy_float64 *data, npy_float64 *grad);
+void offset_fill(int *ds, npy_float64 *data, npy_float64 *gridval);
+
void vertex_interp(npy_float64 v1, npy_float64 v2, npy_float64 isovalue,
npy_float64 vl[3], npy_float64 dds[3],
npy_float64 x, npy_float64 y, npy_float64 z,
diff -r 0e90715fb16b38b466fafbcf5d8d726ada22263a -r bd8fa3c828d7ef0e439ca5527982a65f7817507b yt/utilities/lib/marching_cubes.pyx
--- a/yt/utilities/lib/marching_cubes.pyx
+++ b/yt/utilities/lib/marching_cubes.pyx
@@ -19,7 +19,11 @@
from yt.utilities.lib.fp_utils cimport imax, fmax, imin, fmin, iclip, fclip
from libc.stdlib cimport malloc, free, abs
from libc.math cimport sqrt
-from fixed_interpolator cimport *
+from fixed_interpolator cimport \
+ eval_gradient, \
+ offset_fill, \
+ offset_interpolate, \
+ vertex_interp
from yt.units.yt_array import YTArray
diff -r 0e90715fb16b38b466fafbcf5d8d726ada22263a -r bd8fa3c828d7ef0e439ca5527982a65f7817507b yt/utilities/spatial/ckdtree.pyx
--- a/yt/utilities/spatial/ckdtree.pyx
+++ b/yt/utilities/spatial/ckdtree.pyx
@@ -370,7 +370,7 @@
stdlib.free(node)
def __dealloc__(cKDTree self):
- if <int>(self.tree) == 0:
+ if self.tree == NULL:
# should happen only if __init__ was never called
return
self.__free_tree(self.tree)
diff -r 0e90715fb16b38b466fafbcf5d8d726ada22263a -r bd8fa3c828d7ef0e439ca5527982a65f7817507b yt/utilities/spatial/src/distance_wrap.c
--- a/yt/utilities/spatial/src/distance_wrap.c
+++ b/yt/utilities/spatial/src/distance_wrap.c
@@ -863,7 +863,7 @@
else {
X = (double*)X_->data;
dm = (double*)dm_->data;
- w = (const double*)w_->data;
+ w = (double*)w_->data;
m = X_->dimensions[0];
n = X_->dimensions[1];
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