Merge branch 'develop' into fix_2380_expdata_new

dweindl · Apr 19, 2024 · 69d62d2 · 69d62d2
2 parents a87c23a + 09e0581
commit 69d62d2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/model.cpp b/src/model.cpp
@@ -1671,7 +1671,6 @@ int Model::checkFinite(
         && model_quantity != ModelQuantity::ts) {
         checkFinite(state_.fixedParameters, ModelQuantity::k, t);
         checkFinite(state_.unscaledParameters, ModelQuantity::p, t);
-        checkFinite(simulation_parameters_.ts_, ModelQuantity::ts, t);
         if (!always_check_finite_ && model_quantity != ModelQuantity::w) {
             // don't check twice if always_check_finite_ is true
             checkFinite(derived_state_.w_, ModelQuantity::w, t);
@@ -1789,7 +1788,6 @@ int Model::checkFinite(
     // check upstream
     checkFinite(state_.fixedParameters, ModelQuantity::k, t);
     checkFinite(state_.unscaledParameters, ModelQuantity::p, t);
-    checkFinite(simulation_parameters_.ts_, ModelQuantity::ts, t);
     checkFinite(derived_state_.w_, ModelQuantity::w, t);
 
     return AMICI_RECOVERABLE_ERROR;
@@ -1880,7 +1878,6 @@ int Model::checkFinite(SUNMatrix m, ModelQuantity model_quantity, realtype t)
     // check upstream
     checkFinite(state_.fixedParameters, ModelQuantity::k, t);
     checkFinite(state_.unscaledParameters, ModelQuantity::p, t);
-    checkFinite(simulation_parameters_.ts_, ModelQuantity::ts, t);
     checkFinite(derived_state_.w_, ModelQuantity::w, t);
 
     return AMICI_RECOVERABLE_ERROR;

diff --git a/src/solver_idas.cpp b/src/solver_idas.cpp
@@ -17,7 +17,7 @@
 namespace amici {
 
 /*
- * The following static members are callback function to CVODES.
+ * The following static members are callback function to IDAS.
  * Their signatures must not be changes.
  */
 
@@ -437,7 +437,7 @@ void IDASolver::reInitPostProcess(
 
     auto status = IDASetStopTime(ida_mem, tout);
     if (status != IDA_SUCCESS)
-        throw IDAException(status, "CVodeSetStopTime");
+        throw IDAException(status, "IDASetStopTime");
 
     status = IDASolve(
         ami_mem, tout, t, yout->getNVector(), ypout->getNVector(), IDA_ONE_STEP
@@ -853,7 +853,7 @@ void IDASolver::setNonLinearSolver() const {
         solver_memory_.get(), non_linear_solver_->get()
     );
     if (status != IDA_SUCCESS)
-        throw CvodeException(status, "CVodeSetNonlinearSolver");
+        throw IDAException(status, "IDASetNonlinearSolver");
 }
 
 void IDASolver::setNonLinearSolverSens() const {
@@ -883,15 +883,15 @@ void IDASolver::setNonLinearSolverSens() const {
     }
 
     if (status != IDA_SUCCESS)
-        throw CvodeException(status, "CVodeSolver::setNonLinearSolverSens");
+        throw IDAException(status, "IDASolver::setNonLinearSolverSens");
 }
 
 void IDASolver::setNonLinearSolverB(int which) const {
     int status = IDASetNonlinearSolverB(
         solver_memory_.get(), which, non_linear_solver_B_->get()
     );
     if (status != IDA_SUCCESS)
-        throw CvodeException(status, "CVodeSetNonlinearSolverB");
+        throw IDAException(status, "IDASetNonlinearSolverB");
 }
 
 /**