Fix parallel header - v0.11.9

bjodah · Oct 11, 2018 · 7e8b326 · 7e8b326
1 parent c7730c5
commit 7e8b326
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,7 @@
+v0.11.9
+=======
+- Fix signature in header
+
 v0.11.8
 =======
 - Fix syntax error in header file

diff --git a/pycvodes/include/cvodes_anyode_parallel.hpp b/pycvodes/include/cvodes_anyode_parallel.hpp
@@ -37,7 +37,7 @@ namespace cvodes_anyode_parallel {
                    const bool return_on_error=false,
                    const bool with_jtimes=false,
                    int tidx=0,
-                   realtype ** ew_ele=nullptr,
+                   realtype *** ew_ele=nullptr,
                    const std::vector<realtype> &constraints={}
                    ){
         const indextype ny = odesys[0]->get_ny();
@@ -57,7 +57,7 @@ namespace cvodes_anyode_parallel {
                     odesys[idx], atol, rtol, lmm, tend[idx],
                     results[idx].second, mxsteps, dx0[idx], dx_min[idx], dx_max[idx],
                     with_jacobian, iter_type, linear_solver, maxl, eps_lin, nderiv,
-                    return_on_root, autorestart, return_on_error, with_jtimes, tidx, ew_ele, constraints);
+                    return_on_root, autorestart, return_on_error, with_jtimes, tidx, (ew_ele) ? ew_ele[idx] : nullptr, constraints);
             });
         }
         te.rethrow();
@@ -88,7 +88,7 @@ namespace cvodes_anyode_parallel {
                      const int autorestart=0, // must be autonomous!
                      const bool return_on_error=false,
                      const bool with_jtimes=false,
-                     realtype * ew_ele=nullptr,
+                     realtype ** ew_ele=nullptr,
                      const std::vector<realtype> &constraints={}
                      ){
         const indextype ny = odesys[0]->get_ny();
@@ -111,7 +111,7 @@ namespace cvodes_anyode_parallel {
                         nreached_roots[idx].second.first, nreached_roots[idx].second.second,
                         mxsteps, dx0[idx], dx_min[idx], dx_max[idx], with_jacobian,
                         iter_type, linear_solver, maxl, eps_lin, nderiv,
-                        autorestart, return_on_error, with_jtimes, ew_ele, constraints);
+                        autorestart, return_on_error, with_jtimes, (ew_ele) ? ew_ele[idx] : nullptr, constraints);
             });
         }
         if (!return_on_error)

diff --git a/pycvodes/include/cvodes_anyode_parallel.pxd b/pycvodes/include/cvodes_anyode_parallel.pxd
@@ -28,9 +28,9 @@ cdef extern from "cvodes_anyode_parallel.hpp" namespace "cvodes_anyode_parallel"
         const bool,
         const int,
         const bool,
-        const bool
+        const bool,
         int,
-        realtype*,
+        realtype***,
         vector[realtype]&
     ) except +
 
@@ -56,6 +56,6 @@ cdef extern from "cvodes_anyode_parallel.hpp" namespace "cvodes_anyode_parallel"
         const int,
         const bool,
         const bool,
-	realtype *,
-	vector[realtype]&
+        realtype **,
+        vector[realtype]&
     ) except +