Merge branch 'feature/mri-adaptivity' of github.com:LLNL/sundials int…

…o feature/mri-adaptivity
LLNL · Oct 25, 2024 · d450704 · d450704
2 parents b01b640 + 2fa3ee2
commit d450704
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/src/arkode/arkode_mri_tables.c b/src/arkode/arkode_mri_tables.c
@@ -895,8 +895,7 @@ int mriStepCoupling_GetStageMap(MRIStepCoupling MRIC, int* stage_map,
     /* Number of stage RHS vectors active */
     *nstages_active = MRIC->stages;
 
-    /* Check if a stage corresponds to a column of zeros for all coupling
-     * matrices by computing the column sums */
+    /* Create an identity map (all columns are non-zero) */
     for (j = 0; j < MRIC->stages; j++) { stage_map[j] = j; }
     return (ARK_SUCCESS);
   }

diff --git a/src/arkode/arkode_mristep_impl.h b/src/arkode/arkode_mristep_impl.h
@@ -109,7 +109,7 @@ typedef struct ARKodeMRIStepMemRec
   sunrealtype nlscoef;    /* coefficient in nonlin. convergence test  */
 
   int msbp;       /* positive => max # steps between lsetup
-                             negative => call at each Newton iter     */
+                     negative => call at each Newton iter     */
   long int nstlp; /* step number of last setup call           */
 
   int maxcor;          /* max num iterations for solving the

diff --git a/src/sunadaptcontroller/mrihtol/sunadaptcontroller_mrihtol.c b/src/sunadaptcontroller/mrihtol/sunadaptcontroller_mrihtol.c
@@ -102,7 +102,7 @@ SUNAdaptController SUNAdaptController_MRIHTol(SUNAdaptController HControl,
   /* Attach content */
   C->content = content;
 
-  return (C);
+  return C;
 }
 
 /* -----------------------------------------------------------------

diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_accumerror_kpr.cpp b/test/unit_tests/arkode/CXX_serial/ark_test_accumerror_kpr.cpp
@@ -280,11 +280,7 @@ int main(int argc, char* argv[])
   }
 
   // Clean up and return
-  if (rk_type == 0)
-  { // Free integrator memory
-    ARKodeFree(&arkode_mem);
-  }
-  else { ARKodeFree(&arkode_mem); }
+  ARKodeFree(&arkode_mem);
   if (LS != NULL) SUNLinSolFree(LS); // free system linear solver
   if (A != NULL) SUNMatDestroy(A);   // free system matrix
   N_VDestroy(y);                     // Free y vector