update examples and add to the Pkg.test()

Author: alyst

examples/cvode_Roberts_dns.jl

@@ -9,7 +9,7 @@ function f(t, y, ydot, user_data)
     ydot[1] = -0.04*y[1] + 1.0e4*y[2]*y[3]
     ydot[3] = 3.0e7*y[2]*y[2]
     ydot[2] = -ydot[1] - ydot[3]
-    return Int32(0)
+    return Cint(0)
 end
 
 
@@ -20,7 +20,7 @@ function g(t, y, gout, user_data)
     gout = Sundials.asarray(gout, (2,))
     gout[1] = y[1] - 0.0001
     gout[2] = y[3] - 0.01
-    return Int32(0)
+    return Cint(0)
 end
 
 ## Jacobian routine. Compute J(t,y) = df/dy.
@@ -89,21 +89,21 @@ abstol = [1e-8, 1e-14, 1e-6]
 cvode_mem = Sundials.CVodeCreate(Sundials.CV_BDF, Sundials.CV_NEWTON)
 flag = Sundials.CVodeInit(cvode_mem, f, t0, y)
 flag = Sundials.CVodeSVtolerances(cvode_mem, reltol, abstol)
-flag = Sundials.CVodeRootInit(cvode_mem, 2, g)
+flag = Sundials.CVodeRootInit(cvode_mem, Cint(2), g)
 flag = Sundials.CVDense(cvode_mem, neq)
 ## flag = Sundials.CVDlsSetDenseJacFn(cvode_mem, Jac)  # works, but clunky, see above
 
 iout = 0
 tout = t1
 
-rootsfound = round(Int32,[0, 0])
+rootsfound = zeros(Cint, 2)
 t = [t0]
 
 while true
     flag = Sundials.CVode(cvode_mem, tout, y, t, Sundials.CV_NORMAL)
     println("T = ", tout, ", Y = ", y)
     if flag == Sundials.CV_ROOT_RETURN
-        flagr = Sundials.CVodeGetRootInfo(cvode_mem, pointer(rootsfound))
+        flagr = Sundials.CVodeGetRootInfo(cvode_mem, rootsfound)
         println("roots = ", rootsfound)
     end
     if flag == Sundials.CV_SUCCESS

examples/ida_Roberts_dns.jl

@@ -43,7 +43,7 @@ function resrob(tres, yy, yp, rr, user_data)
     rval[2]  = -rval[1] - 3.0e7*yval[2]*yval[2] - ypval[2]
     rval[1] -=  ypval[1]
     rval[3]  =  yval[1] + yval[2] + yval[3] - 1.0
-    return Int32(0)   # indicates normal return
+    return Cint(0)   # indicates normal return
 end
 
 ## Root function routine. Compute functions g_i(t,y) for i = 0,1.
@@ -52,7 +52,7 @@ function grob(t, yy, yp, gout, user_data)
     gval = Sundials.asarray(gout, (2,))
     gval[1] = yval[1] - 0.0001
     gval[2] = yval[3] - 0.01
-    return Int32(0)   # indicates normal return
+    return Cint(0)   # indicates normal return
 end
 
 ## Define the Jacobian function. BROKEN - JJ is wrong
@@ -69,7 +69,7 @@ function jacrob(Neq, tt, cj, yy, yp, resvec,
     JJ[1,3] = 1.0e4*yval[2]
     JJ[2,3] = -1.0e4*yval[2]
     JJ[3,3] = 1.0
-    return Int32(0)   # indicates normal return
+    return Cint(0)   # indicates normal return
 end
 
 neq = 3
@@ -86,7 +86,7 @@ retval = Sundials.IDAInit(mem, resrob, t0, yy, yp)
 retval = Sundials.IDASVtolerances(mem, rtol, avtol)
 
 ## Call IDARootInit to specify the root function grob with 2 components
-retval = Sundials.IDARootInit(mem, 2, grob)
+retval = Sundials.IDARootInit(mem, Cint(2), grob)
 
 ## Call IDADense and set up the linear solver.
 retval = Sundials.IDADense(mem, neq)
@@ -95,13 +95,13 @@ retval = Sundials.IDADense(mem, neq)
 iout = 0
 tout = tout1
 tret = [1.0]
-rootsfound = round(Int32,[0, 0])
+rootsfound = zeros(Cint, 2)
 
 while true
     retval = Sundials.IDASolve(mem, tout, tret, yy, yp, Sundials.IDA_NORMAL)
     println("T = ", tout, ", Y = ", yy)
     if retval == Sundials.IDA_ROOT_RETURN
-        retvalr = Sundials.IDAGetRootInfo(mem, pointer(rootsfound))
+        retvalr = Sundials.IDAGetRootInfo(mem, rootsfound)
         println("roots = ", rootsfound)
     end
     if retval == Sundials.IDA_SUCCESS

examples/kinsol_mkinTest.jl

@@ -1,5 +1,5 @@
 ## Adapted from sundialsTB/kinsol/examples_ser/mkinTest_nds.m
- 
+
 ## %mkinTest_dns - KINSOL example problem (serial, dense)
 ## %   Simple test problem for the Dense linear solver in KINSOL
 ## %   This example solves the system
@@ -18,7 +18,7 @@ function sysfn(y_in, fy_in, a_in)
     fy = Sundials.asarray(fy_in)
     fy[1] = y[1]^2 + y[2]^2 - 1.0
     fy[2] = y[2] - y[1]^2
-    return Int32(0)   # indicates normal return
+    return Cint(0)   # indicates normal return
 end
 
 ## Initialize problem
@@ -32,7 +32,7 @@ flag = Sundials.KINInit(kmem, sysfn, y)
 flag = Sundials.KINDense(kmem, neq)
 ## Solve problem
 scale = ones(neq)
-strategy = 1   # KIN_LINESEARCH
+strategy = Sundials.KIN_LINESEARCH
 flag = Sundials.KINSol(kmem,
                        y,
                        strategy,
@@ -43,7 +43,3 @@ println("Solution: ", y)
 residual = ones(2)
 sysfn(y, residual, [1,2])
 println("Residual: ", residual)
-
-Sundials.KINFree([kmem])
-
-

test/runtests.jl

@@ -2,17 +2,22 @@ using Sundials
 using Base.Test
 
 # run cvode example
-println("== start cvode example")
+println("== start cvode Roberts example (simplified)")
 include("../examples/cvode_Roberts_simplified.jl")
 
 println("result at t=$(t[end]):")
 println(res[end,:], "\n")
 
+println("== start cvode Roberts example")
+include("../examples/cvode_Roberts_dns.jl")
 
 # run ida examples
-println("== start ida_Roberts example")
+println("== start ida_Roberts example (simplified)")
 include("../examples/ida_Roberts_simplified.jl")
 
+println("== start ida_Roberts example")
+include("../examples/ida_Roberts_dns.jl")
+
 println("result at t=$(t[end]):")
 println(yout[end,:], "\n")
 
@@ -23,7 +28,7 @@ println("result at t=$(t[end]):")
 println(yout[end,:], "\n")
 
 # run kinsol example
-println("== start kinsol example")
+println("== start kinsol example (simplified)")
 include("../examples/kinsol_mkin_simplified.jl")
 
 println("solution:")
@@ -33,4 +38,7 @@ sysfn(res, residual)
 println("residual:")
 println(residual, "\n")
 
+println("== start kinsol example")
+include("../examples/kinsol_mkinTest.jl")
+
 @test abs(minimum(residual)) < 1e-5