Revert "Merge branch 'develop' into feature/rk_defaults"

This reverts commit a097c51, reversing changes made to 2600884.
LLNL · Jan 31, 2025 · aebf685 · aebf685
1 parent e8a0375
commit aebf685
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,15 +27,6 @@ Improved the efficiency of default ARKODE methods with the following changes:
 
 ### Bug Fixes
 
-Fixed bug in `ARKodeSetFixedStep` where it could return `ARK_SUCCESS` despite
-an error occurring.
-
-Removed error floors from the `SUNAdaptController` implementations which could
-unnecessarily limit the time size growth, particularly after the first step.
-
-On the first two time steps, the Soderlind controller uses an I controller
-instead of omitting unavailable terms.
-
 Fixed the behavior of `SUNDIALS_ENABLE_ERROR_CHECKS` so additional runtime error
 checks are disabled by default with all release build types. Previously,
 `MinSizeRel` builds enabled additional error checking by default.

diff --git a/doc/shared/RecentChanges.rst b/doc/shared/RecentChanges.rst
@@ -37,17 +37,6 @@ Improved the efficiency of default ARKODE methods with the following changes:
 
 **Bug Fixes**
 
-Fixed bug in :c:func:`ARKodeSetFixedStep` where it could return ``ARK_SUCCESS``
-despite an error occurring.
-
-Removed error floors from the :c:type:`SUNAdaptController`` implementations
-which could unnecessarily limit the time size growth, particularly after the
-first step.
-
-On the first two time steps, the
-:ref:`Soderlind controller <SUNAdaptController.Soderlind>` uses an I controller
-instead of omitting unavailable terms.
-
 Fixed the behavior of :cmakeop:`SUNDIALS_ENABLE_ERROR_CHECKS` so additional
 runtime error checks are disabled by default with all release build types.
 Previously, ``MinSizeRel`` builds enabled additional error checking by default.

diff --git a/examples/arkode/C_serial/ark_analytic_partitioned.c b/examples/arkode/C_serial/ark_analytic_partitioned.c
@@ -145,7 +145,7 @@ int main(int argc, char* argv[])
       }
 
       flag = SplittingStepSetCoefficients(arkode_mem, coefficients);
-      if (check_flag(&flag, "SplittingStepSetCoefficients", 1)) { return 1; }
+      if (check_flag(&flag, "ARKodeSetFixedStep", 1)) { return 1; }
 
       SplittingStepCoefficients_Destroy(&coefficients);
     }

diff --git a/src/arkode/arkode_io.c b/src/arkode/arkode_io.c
@@ -1240,7 +1240,9 @@ int ARKodeSetFixedStep(void* arkode_mem, sunrealtype hfixed)
   else { ark_mem->fixedstep = SUNFALSE; }
 
   /* Notify ARKODE to use hfixed as the initial step size, and return */
-  return ARKodeSetInitStep(arkode_mem, hfixed);
+  retval = ARKodeSetInitStep(arkode_mem, hfixed);
+
+  return (ARK_SUCCESS);
 }
 
 /*---------------------------------------------------------------