Merge 9ed36ce into 98682ce

opencor · Dec 17, 2018 · 6c5e559 · 6c5e559
2 parents 98682ce + 9ed36ce
commit 6c5e559
Show file tree

Hide file tree

Showing 3 changed files with 172 additions and 130 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -39,7 +39,7 @@ var jsonData = { "versions": [
                      "changes": [
                        { "change": "<strong>General:</strong> upgraded to Qt 5.12.0 LTS (see issue <a href=\"https://github.com/opencor/opencor/issues/1910\">#1910</a>)." },
                        { "change": "<strong>COMBINE support:</strong> now recognise files that have a master attribute of \"1\" rather than \"true\" (see issue <a href=\"https://github.com/opencor/opencor/issues/1912\">#1912</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 <a href=\"https://www.mesa3d.org/\">Mesa</a> to version 18.2.7 (see issue <a href=\"https://github.com/opencor/opencor/issues/1918\">#1918</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 <a href=\"https://www.mesa3d.org/\">Mesa</a> to version 18.2.7 (see issue <a href=\"https://github.com/opencor/opencor/issues/1918\">#1918</a>). Upgraded the <a href=\"http://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 4.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/1919\">#1919</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
@@ -349,35 +349,24 @@ void CvodeSolver::initialize(double pVoi, int pRatesStatesCount,
             // We are dealing with a GMRES/Bi-CGStab/TFQMR linear solver
 
             if (!preconditioner.compare(BandedPreconditioner)) {
-                if (!linearSolver.compare(GmresLinearSolver)) {
+                if (!linearSolver.compare(GmresLinearSolver))
                     mLinearSolver = SUNSPGMR(mStatesVector, PREC_LEFT, 0);
-
-                    CVSpilsSetLinearSolver(mSolver, mLinearSolver);
-                } else if (!linearSolver.compare(BiCgStabLinearSolver)) {
+                else if (!linearSolver.compare(BiCgStabLinearSolver))
                     mLinearSolver = SUNSPBCGS(mStatesVector, PREC_LEFT, 0);
-
-                    CVSpilsSetLinearSolver(mSolver, mLinearSolver);
-                } else {
+                else
                     mLinearSolver = SUNSPTFQMR(mStatesVector, PREC_LEFT, 0);
 
-                    CVSpilsSetLinearSolver(mSolver, mLinearSolver);
-                }
-
+                CVSpilsSetLinearSolver(mSolver, mLinearSolver);
                 CVBandPrecInit(mSolver, pRatesStatesCount, upperHalfBandwidth, lowerHalfBandwidth);
             } else {
-                if (!linearSolver.compare(GmresLinearSolver)) {
+                if (!linearSolver.compare(GmresLinearSolver))
                     mLinearSolver = SUNSPGMR(mStatesVector, PREC_NONE, 0);
-
-                    CVSpilsSetLinearSolver(mSolver, mLinearSolver);
-                } else if (!linearSolver.compare(BiCgStabLinearSolver)) {
+                else if (!linearSolver.compare(BiCgStabLinearSolver))
                     mLinearSolver = SUNSPBCGS(mStatesVector, PREC_NONE, 0);
-
-                    CVSpilsSetLinearSolver(mSolver, mLinearSolver);
-                } else {
+                else
                     mLinearSolver = SUNSPTFQMR(mStatesVector, PREC_NONE, 0);
 
-                    CVSpilsSetLinearSolver(mSolver, mLinearSolver);
-                }
+                CVSpilsSetLinearSolver(mSolver, mLinearSolver);
             }
         }
     }