Merge pull request #21 from owlbarn/port-to-new-sundials

Port to new sundials

Author: mseri

.github/workflows/ci.yml

@@ -28,13 +28,8 @@ jobs:
         uses: avsm/setup-ocaml@v2
         with:
           ocaml-compiler: ${{ matrix.ocaml-compiler }}
-          dune-cache: true
           opam-local-packages: |
             *.opam
-            !owl-ode-sundials.opam
-
-      - run: cp ".github/sandbox_exec.sh" "$HOME/.opam/opam-init/hooks/sandbox.sh"
-        if: ${{ matrix.os == 'macos-latest' }}
 
       - run: opam depext owl-ode-base owl-ode owl-ode-odepack --with-test
 
@@ -48,6 +43,11 @@ jobs:
           opam exec -- dune build -p owl-ode
           opam exec -- dune runtest -p owl-ode
   
+      - run: |
+          opam install owl-ode-sundials --yes --deps-only --with-test
+          opam exec -- dune build -p owl-ode-sundials
+          opam exec -- dune runtest -p owl-ode-sundials
+  
       - run: |
            opam install owl-ode-odepack --yes --deps-only --with-test
            opam exec -- dune build -p owl-ode-odepack 

owl-ode-sundials.opam

@@ -16,7 +16,7 @@ depends: [
   "dune" {>= "2.0.0"}
   "owl-ode" {= version}
   "owl-plplot" {with-test}
-  "sundialsml"
+  "sundialsml" {>= "4.1.0p0"}
 ]
 synopsis: "Owl's ODE solvers, interface with SundialsML"
 description: """OwlDE: ODE Integration library

src/sundials/owl_ode_sundials.ml

@@ -42,8 +42,8 @@ let make_cvode_session
   let y = wrap y0 in
   let yvec = Nvector_serial.wrap y in
   ( (match stiff with
-    | false -> Cvode.(init Adams Functional tolerances f_wrapped t0 yvec)
-    | true -> Cvode.(init BDF Functional tolerances f_wrapped t0 yvec))
+    | false -> Cvode.(init Adams ~nlsolver:(Sundials_NonlinearSolver.FixedPoint.make yvec) tolerances f_wrapped t0 yvec)
+    | true -> Cvode.(init BDF ~nlsolver:(Sundials_NonlinearSolver.FixedPoint.make yvec) tolerances f_wrapped t0 yvec))
   , yvec
   , y )