call GetLastError in ProcessError

LLNL · Dec 12, 2023 · 7ddc5a7 · 7ddc5a7
1 parent 71744b7
commit 7ddc5a7
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/cvodes/cvodes.c b/src/cvodes/cvodes.c
@@ -194,6 +194,7 @@
 
 #include "cvodes_impl.h"
 #include "sundials/priv/sundials_errors_impl.h"
+#include "sundials/sundials_context.h"
 
 /*=================================================================*/
 /* CVODE Private Constants                                         */
@@ -9907,6 +9908,8 @@ static int cvQuadSensRhs1InternalDQ(CVodeMem cv_mem, int is, sunrealtype t,
 void cvProcessError(CVodeMem cv_mem, int error_code, int line, const char* func,
                     const char* file, const char* msgfmt, ...)
 {
+  SUNFunctionBegin(cv_mem->cv_sunctx);
+
   /* Initialize the argument pointer variable
      (msgfmt is the last required argument to cvProcessError) */
   va_list ap;
@@ -9936,7 +9939,10 @@ void cvProcessError(CVodeMem cv_mem, int error_code, int line, const char* func,
     }
 
     /* Call the SUNDIALS main error handler */
-    SUNHandleErrWithMsg(line, func, file, msg, error_code, cv_mem->cv_sunctx);
+    SUNHandleErrWithMsg(line, func, file, msg, error_code, SUNCTX_);
+
+    /* Clear the last error value */
+    (void)SUNContext_GetLastError(SUNCTX_);
   }
   while (0);