Merge branch 'develop' into cmake_config

dweindl · Oct 13, 2024 · c11c51e · c11c51e
2 parents bd05be9 + d5123a5
commit c11c51e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/include/amici/defines.h b/include/amici/defines.h
@@ -73,6 +73,7 @@ constexpr int AMICI_CONSTR_FAIL=             -15;
 constexpr int AMICI_CVODES_CONSTR_FAIL=      -15;
 constexpr int AMICI_IDAS_CONSTR_FAIL=        -11;
 constexpr int AMICI_ILL_INPUT=               -22;
+constexpr int AMICI_FIRST_QRHSFUNC_ERR=      -32;
 constexpr int AMICI_ERROR=                   -99;
 constexpr int AMICI_NO_STEADY_STATE=         -81;
 constexpr int AMICI_DAMPING_FACTOR_ERROR=    -86;

diff --git a/src/amici.cpp b/src/amici.cpp
@@ -49,6 +49,7 @@ std::map<int, std::string> simulation_status_to_str_map = {
     {AMICI_SUCCESS, "AMICI_SUCCESS"},
     {AMICI_NOT_RUN, "AMICI_NOT_RUN"},
     {AMICI_LSETUP_FAIL, "AMICI_LSETUP_FAIL"},
+    {AMICI_FIRST_QRHSFUNC_ERR, "AMICI_FIRST_QRHSFUNC_ERR"},
 };
 
 std::unique_ptr<ReturnData> runAmiciSimulation(

diff --git a/src/solver.cpp b/src/solver.cpp
@@ -1205,6 +1205,7 @@ void Solver::initializeNonLinearSolverSens(Model const* model) const {
 }
 
 void Solver::setErrHandlerFn() const {
+    SUNContext_ClearErrHandlers(sunctx_);
     auto sunerr = SUNContext_PushErrHandler(
         sunctx_, wrapErrHandlerFn,
         reinterpret_cast<void*>(const_cast<Solver*>(this))

diff --git a/src/solver_cvodes.cpp b/src/solver_cvodes.cpp
@@ -86,6 +86,10 @@ static_assert(
     amici::AMICI_FIRST_RHSFUNC_ERR == CV_FIRST_RHSFUNC_ERR,
     "AMICI_FIRST_RHSFUNC_ERR != CV_FIRST_RHSFUNC_ERR"
 );
+static_assert(
+    amici::AMICI_FIRST_QRHSFUNC_ERR == CV_FIRST_QRHSFUNC_ERR,
+    "AMICI_FIRST_QRHSFUNC_ERR != CV_FIRST_QRHSFUNC_ERR"
+    );
 
 /*
  * The following static members are callback function to CVODES.