git subrepo clone (merge) --branch=c11c51ee1b2f8ed07677fcb47e81ac014e…

…12855b --force git@github.com:dweindl/AMICI.git deps/AMICI subrepo: subdir: "deps/AMICI" merged: "c11c51ee" upstream: origin: "git@github.com:dweindl/AMICI.git" branch: "c11c51ee1b2f8ed07677fcb47e81ac014e12855b" commit: "c11c51ee" git-subrepo: version: "0.4.6" origin: "https://github.com/ingydotnet/git-subrepo" commit: "110b9eb"
ICB-DCM · Oct 14, 2024 · 3090c57 · 3090c57
1 parent d2b37e1
commit 3090c57
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/deps/AMICI/.gitrepo b/deps/AMICI/.gitrepo
@@ -5,8 +5,8 @@
 ;
 [subrepo]
 	remote = git@github.com:ICB-DCM/AMICI.git
-	branch = bd05be94fb5557426542b0a6e4af76ee00a8ebad
-	commit = bd05be94fb5557426542b0a6e4af76ee00a8ebad
-	parent = 6c6955f4f4c68636c1435fca3e660510c6163fd8
+	branch = c11c51ee1b2f8ed07677fcb47e81ac014e12855b
+	commit = c11c51ee1b2f8ed07677fcb47e81ac014e12855b
+	parent = d2b37e189980fa085cddcecf76fe93932f3f566a
 	cmdver = 0.4.6
 	method = merge
diff --git a/deps/AMICI/include/amici/defines.h b/deps/AMICI/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/deps/AMICI/src/amici.cpp b/deps/AMICI/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/deps/AMICI/src/solver.cpp b/deps/AMICI/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/deps/AMICI/src/solver_cvodes.cpp b/deps/AMICI/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.