Merge 110f6b5 into 0b62185

opencor · Jan 24, 2019 · 5775bc3 · 5775bc3
2 parents 0b62185 + 110f6b5
commit 5775bc3
Show file tree

Hide file tree

Showing 4 changed files with 124 additions and 124 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -42,7 +42,7 @@ var jsonData = { "versions": [
                        { "change": "<strong>Graph Panel widget:</strong> fixed a small problem with the scale range of an axis in some cases (see issue <a href=\"https://github.com/opencor/opencor/issues/1941\">#1941</a>)." },
                        { "change": "<strong>CellML Text view:</strong> improved Unicode support (see issue <a href=\"https://github.com/opencor/opencor/issues/1926\">#1926</a>)." },
                        { "change": "<strong>Simulation Experiment view:</strong> ensure that graph panels are always properly aligned (see issue <a href=\"https://github.com/opencor/opencor/issues/1956\">#1956</a>)." },
-                       { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"http://www.llvm.org/\">LLVM</a>+<a href=\"http://clang.llvm.org/\">Clang</a> to version 7.0.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/1917\">#1917</a>). Upgraded the <a href=\"http://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 4.0.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/1929\">#1929</a>). Upgraded the <a href=\"http://qwt.sourceforge.net/\">Qwt</a> library to version 6.1.4 (see issue <a href=\"https://github.com/opencor/opencor/issues/1933\">#1933</a>). Upgraded <a href=\"https://www.mesa3d.org/\">Mesa</a> to version 18.2.8 (see issue <a href=\"https://github.com/opencor/opencor/issues/1945\">#1945</a>)." }
+                       { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"http://www.llvm.org/\">LLVM</a>+<a href=\"http://clang.llvm.org/\">Clang</a> to version 7.0.1 (see issue <a href=\"https://github.com/opencor/opencor/issues/1917\">#1917</a>). Upgraded the <a href=\"http://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 4.0.2 (see issue <a href=\"https://github.com/opencor/opencor/issues/1960\">#1960</a>). Upgraded the <a href=\"http://qwt.sourceforge.net/\">Qwt</a> library to version 6.1.4 (see issue <a href=\"https://github.com/opencor/opencor/issues/1933\">#1933</a>). Upgraded <a href=\"https://www.mesa3d.org/\">Mesa</a> to version 18.2.8 (see issue <a href=\"https://github.com/opencor/opencor/issues/1945\">#1945</a>)." }
                      ]
                    },
                    { "major": 0, "minor": 5, "patch": 0, "day": 15, "month": 10, "year": 2016, "type": 0, "license": 1,

diff --git a/src/plugins/solver/CVODESolver/src/cvodesolver.cpp b/src/plugins/solver/CVODESolver/src/cvodesolver.cpp
@@ -357,7 +357,7 @@ void CvodeSolver::initialize(double pVoi, int pRatesStatesCount,
                 else
                     mLinearSolver = SUNLinSol_SPTFQMR(mStatesVector, PREC_LEFT, 0);
 
-                CVodeSetLinearSolver(mSolver, mLinearSolver, nullptr);
+                CVodeSetLinearSolver(mSolver, mLinearSolver, mMatrix);
                 CVBandPrecInit(mSolver, pRatesStatesCount, upperHalfBandwidth,
                                                            lowerHalfBandwidth);
             } else {
@@ -368,7 +368,7 @@ void CvodeSolver::initialize(double pVoi, int pRatesStatesCount,
                 else
                     mLinearSolver = SUNLinSol_SPTFQMR(mStatesVector, PREC_NONE, 0);
 
-                CVodeSetLinearSolver(mSolver, mLinearSolver, nullptr);
+                CVodeSetLinearSolver(mSolver, mLinearSolver, mMatrix);
             }
         }
     } else {

diff --git a/src/plugins/solver/KINSOLSolver/src/kinsolsolver.cpp b/src/plugins/solver/KINSOLSolver/src/kinsolsolver.cpp
@@ -300,25 +300,25 @@ void KinsolSolver::solve(ComputeSystemFunction pComputeSystem,
             matrix = SUNDenseMatrix(pSize, pSize);
             linearSolver = SUNDenseLinearSolver(parametersVector, matrix);
 
-            KINDlsSetLinearSolver(solver, linearSolver, matrix);
+            KINSetLinearSolver(solver, linearSolver, matrix);
         } else if (!linearSolverValue.compare(BandedLinearSolver)) {
             matrix = SUNBandMatrix(pSize, upperHalfBandwidthValue,
                                           lowerHalfBandwidthValue);
             linearSolver = SUNBandLinearSolver(parametersVector, matrix);
 
-            KINDlsSetLinearSolver(solver, linearSolver, matrix);
+            KINSetLinearSolver(solver, linearSolver, matrix);
         } else if (!linearSolverValue.compare(GmresLinearSolver)) {
             linearSolver = SUNSPGMR(parametersVector, PREC_NONE, 0);
 
-            KINSpilsSetLinearSolver(solver, linearSolver);
+            KINSetLinearSolver(solver, linearSolver, matrix);
         } else if (!linearSolverValue.compare(BiCgStabLinearSolver)) {
             linearSolver = SUNSPBCGS(parametersVector, PREC_NONE, 0);
 
-            KINSpilsSetLinearSolver(solver, linearSolver);
+            KINSetLinearSolver(solver, linearSolver, matrix);
         } else {
             linearSolver = SUNSPTFQMR(parametersVector, PREC_NONE, 0);
 
-            KINSpilsSetLinearSolver(solver, linearSolver);
+            KINSetLinearSolver(solver, linearSolver, matrix);
         }
 
         // Keep track of our data