Changeset 25795 in project

Timestamp:

01/09/12 03:55:52 (9 years ago)

Author:

Ivan Raikov

Message:

sundials: yet more renamed routines

Location:

release/4/sundials/trunk

Files:

• sundials.scm (modified) (5 diffs)
• sundials.setup (modified) (1 diff)

release/4/sundials/trunk/sundials.scm

@@ -334 +334 @@
 #endif
 
+#if SUNDIALS_VERSION_MAJOR==2 && SUNDIALS_VERSION_MINOR>=4
     flag = IDAInit (solver_handle->ida_mem, 
                     (IDAResFn)ida_residual_main_cb, 
@@ -345 +346 @@
     if (flag != IDA_SUCCESS) 
         chicken_error("could not set tolerances with IDASStolerances", C_fix(flag)) ;   
+#else
+#if SUNDIALS_VERSION_MAJOR==2 && SUNDIALS_VERSION_MINOR>=3
+    flag = IDAMalloc (solver_handle->ida_mem, 
+                      (IDAResFn)ida_residual_main_cb, 
+                      time_start, 
+                      solver_handle->yy, 
+                      solver_handle->yp,
+                      IDA_SS,
+                      solver_handle->reltol, 
+                      (void *)&solver_handle->abstol);
+#else
+    flag = IDAMalloc (solver_handle->ida_mem, 
+                      (IDAResFn)ida_residual_main_cb, 
+                      time_start, 
+                      solver_handle->yy, 
+                      solver_handle->yp,
+                      IDA_SS,
+                      &(solver_handle->reltol), 
+                      (void *)&solver_handle->abstol);
+#endif
+    if (flag != IDA_SUCCESS) 
+        chicken_error("could not initialize solver with IDAMalloc", C_fix(flag)) ;      
+#endif
 
     flag = IDASetId(solver_handle->ida_mem, solver_handle->id);
@@ -557 +581 @@
 #endif
 
+#if SUNDIALS_VERSION_MAJOR==2 && SUNDIALS_VERSION_MINOR>=4
     flag = CVodeInit (solver_handle->cvode_mem, 
                     (CVRhsFn)cvode_rhs_cb, 
@@ -564 +589 @@
         chicken_error("could not initialize solver with CVodeInit", C_fix(flag)) ;      
 
+    if (ewt > 0)
+    {
+       flag = CVodeWFtolerances(solver_handle->cvode_mem, (CVEwtFn)cvode_ewt_cb);
+       if (flag != CV_SUCCESS) 
+          chicken_error("could not set error weight function with CVodeWFtolerances", C_fix(flag)) ;    
+    } else
+    {
+       flag = CVodeSStolerances(solver_handle->cvode_mem, solver_handle->reltol, solver_handle->abstol);
+       if (flag != CV_SUCCESS) 
+          chicken_error("could not set tolerances with CVodeSStolerances", C_fix(flag)) ;       
+    }
+#else
+#if SUNDIALS_VERSION_MAJOR==2 && SUNDIALS_VERSION_MINOR>=3
+    flag = CVodeMalloc (solver_handle->cvode_mem, 
+                        (CVRhsFn)cvode_rhs_cb, 
+                        time_start, 
+                        solver_handle->yy,
+                        CV_SS,
+                        solver_handle->reltol, 
+                        (void *)&(solver_handle->abstol));
+#else
+    flag = CVodeMalloc (solver_handle->cvode_mem, 
+                        (CVRhsFn)cvode_rhs_cb, 
+                        time_start, 
+                        solver_handle->yy,
+                        CV_SS,
+                        &(solver_handle->reltol), 
+                        (void *)&(solver_handle->abstol));
+#endif
+    if (flag != CV_SUCCESS) 
+        chicken_error("could not initialize solver with CVodeMalloc", C_fix(flag)) ;    
+#endif
 
     if (events > 0)
@@ -577 +634 @@
     }
 
-    if (ewt > 0)
-    {
-       flag = CVodeWFtolerances(solver_handle->cvode_mem, (CVEwtFn)cvode_ewt_cb);
-       if (flag != CV_SUCCESS) 
-          chicken_error("could not set error weight function with CVodeWFtolerances", C_fix(flag)) ;    
-    } else
-    {
-       flag = CVodeSStolerances(solver_handle->cvode_mem, solver_handle->reltol, solver_handle->abstol);
-       if (flag != CV_SUCCESS) 
-          chicken_error("could not set tolerances with CVodeSStolerances", C_fix(flag)) ;       
-    }
 
     if (time_stop > 0.0)

release/4/sundials/trunk/sundials.setup

@@ -68 +68 @@
 
   ; Assoc list with properties for your extension:
-  `((version 1.8)
+  `((version 1.9)
     ))