Implement RK45 Cash-Karp integrator in MoL.

This integrator is similar to the existing RK45 integrator.  It also
supports adaptive time stepping, but uses slightly different
coefficients.  The Numerical Recipes say that it has "slightly better
error properties".


git-svn-id: http://svn.cactuscode.org/arrangements/CactusNumerical/MoL/trunk@110 578cdeb0-5ea1-4b81-8215-5a3b8777ee0b

1 files changed, 4 insertions, 4 deletions

diff --git a/src/ParamCheck.c b/src/ParamCheck.c
index 272117b..c2346b0 100644
--- a/src/ParamCheck.c
+++ b/src/ParamCheck.c
@@ -128,10 +128,10 @@ int MoL_ParamCheck(CCTK_ARGUMENTS)
                    "number of intermediate steps must be 3");
   }
 
-  if ( (CCTK_Equals(ODE_Method, "RK45")) &&
+  if ( (CCTK_Equals(ODE_Method, "RK45") || CCTK_Equals(ODE_Method, "RK45CK")) &&
        ( !((MoL_Intermediate_Steps == 6)||(MoL_Num_Scratch_Levels > 5)) ) )
   {
-    CCTK_PARAMWARN("When using the RK45 evolver the "
+    CCTK_PARAMWARN("When using the RK45 or RK45CK evolver, the "
                    "number of intermediate steps must be 6 " 
                    "and the number of scratch levels at least 6.");
   }
@@ -154,13 +154,13 @@ int MoL_ParamCheck(CCTK_ARGUMENTS)
 
   if (adaptive_stepsize)
   {
-    if (CCTK_Equals(ODE_Method, "RK45")||CCTK_Equals(ODE_Method, "RK65")||CCTK_Equals(ODE_Method, "RK87"))
+    if (CCTK_Equals(ODE_Method, "RK45")||CCTK_Equals(ODE_Method, "RK45CK")||CCTK_Equals(ODE_Method, "RK65")||CCTK_Equals(ODE_Method, "RK87"))
     {
       /* everything is fine, do nothing */
     }
     else
     {
-      CCTK_PARAMWARN("Adaptive time step sizes are only possible with the RK45, RK65 and RK87 solvers");
+      CCTK_PARAMWARN("Adaptive time step sizes are only possible with the RK45, RK45CK, RK65, and RK87 solvers");
     }
   }