diff options
| -rw-r--r-- | param.ccl | 2 | ||||
| -rw-r--r-- | schedule.ccl | 10 | ||||
| -rw-r--r-- | src/IndexArrays.c | 8 | ||||
| -rw-r--r-- | src/ParamCheck.c | 4 | ||||
| -rw-r--r-- | src/SetTime.c | 10 |
5 files changed, 17 insertions, 17 deletions
@@ -80,7 +80,7 @@ CCTK_INT MoL_Num_Scratch_Levels "Number of scratch levels required by the ODE me private: -KEYWORD MoL_ODE_Method "The ODE method use by MoL to do time integration" +KEYWORD ODE_Method "The ODE method use by MoL to do time integration" { "Generic" :: "Generic Shu-Osher Runga-Kutta type" "ICN" :: "Iterative Crank Nicholson" diff --git a/schedule.ccl b/schedule.ccl index c787cc2..e6430f2 100644 --- a/schedule.ccl +++ b/schedule.ccl @@ -32,7 +32,7 @@ if (MoL_Memory_Always_On) ### storage for the coefficient arrays ### ############################################################ -if (CCTK_Equals(MoL_ODE_Method,"Generic")) +if (CCTK_Equals(ODE_Method,"Generic")) { STORAGE: RKAlphaCoefficients STORAGE: RKBetaCoefficients @@ -74,7 +74,7 @@ schedule MoL_SetupIndexArrays AT Initial ### arrays if required ### ################################################ -if (CCTK_Equals(MoL_ODE_Method,"Generic")) +if (CCTK_Equals(ODE_Method,"Generic")) { schedule MoL_SetupRKCoefficients AT Initial { @@ -208,21 +208,21 @@ schedule GROUP MoL_CalcRHS IN MoL_Step ### The time integrator performs the update here ### ###################################################### -if (CCTK_Equals(MoL_ODE_Method,"Generic")) +if (CCTK_Equals(ODE_Method,"Generic")) { schedule MoL_GenericRKAdd AS MoL_Add IN MoL_Step AFTER MoL_CalcRHS BEFORE MoL_PostStep { LANG: C } "Updates calculated with a generic method" } -else if (CCTK_Equals(MoL_ODE_Method,"RK2")) +else if (CCTK_Equals(ODE_Method,"RK2")) { schedule MoL_RK2Add AS MoL_Add IN MoL_Step AFTER MoL_CalcRHS BEFORE MoL_PostStep { LANG: C } "Updates calculated with the efficient Runge-Kutta 2 method" } -else if (CCTK_Equals(MoL_ODE_Method,"ICN")) +else if (CCTK_Equals(ODE_Method,"ICN")) { schedule MoL_ICNAdd AS MoL_Add IN MoL_Step AFTER MoL_CalcRHS BEFORE MoL_PostStep { diff --git a/src/IndexArrays.c b/src/IndexArrays.c index 01820eb..2f843be 100644 --- a/src/IndexArrays.c +++ b/src/IndexArrays.c @@ -221,7 +221,7 @@ void MoL_SetupIndexArrays(CCTK_ARGUMENTS) { CCTK_WARN(0, "Failed to malloc 100 characters!"); } - if (CCTK_EQUALS(MoL_ODE_Method,"Generic")) + if (CCTK_EQUALS(ODE_Method,"Generic")) { if (CCTK_EQUALS(Generic_Type,"ICN")) { @@ -237,18 +237,18 @@ void MoL_SetupIndexArrays(CCTK_ARGUMENTS) CCTK_WARN(0, "Generic_Type not recognized!"); } } - else if (CCTK_EQUALS(MoL_ODE_Method,"RK2")) + else if (CCTK_EQUALS(ODE_Method,"RK2")) { sprintf(infoline, "Runge-Kutta 2"); } - else if (CCTK_EQUALS(MoL_ODE_Method,"ICN")) + else if (CCTK_EQUALS(ODE_Method,"ICN")) { sprintf(infoline, "Iterative Crank Nicholson with %i iterations", MoL_Intermediate_Steps); } else { - CCTK_WARN(0, "MoL_ODE_Method not recognized!"); + CCTK_WARN(0, "ODE_Method not recognized!"); } CCTK_VInfo(CCTK_THORNSTRING, "Using %s as the time integrator.", infoline); diff --git a/src/ParamCheck.c b/src/ParamCheck.c index d9cf1ae..2ade916 100644 --- a/src/ParamCheck.c +++ b/src/ParamCheck.c @@ -62,7 +62,7 @@ int MoL_ParamCheck(CCTK_ARGUMENTS) DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - if (CCTK_Equals(MoL_ODE_Method, "Generic")) + if (CCTK_Equals(ODE_Method, "Generic")) { if (MoL_Num_Scratch_Levels < MoL_Intermediate_Steps - 1) { @@ -70,7 +70,7 @@ int MoL_ParamCheck(CCTK_ARGUMENTS) } } - if ( (CCTK_Equals(MoL_ODE_Method, "RK2"))&&(!(MoL_Intermediate_Steps == 2)) ) + if ( (CCTK_Equals(ODE_Method, "RK2"))&&(!(MoL_Intermediate_Steps == 2)) ) { CCTK_PARAMWARN("When using the efficient RK2 evolver the number of intermediate steps must be 2"); } diff --git a/src/SetTime.c b/src/SetTime.c index aeeee77..0516e27 100644 --- a/src/SetTime.c +++ b/src/SetTime.c @@ -74,11 +74,11 @@ int MoL_SetTime(CCTK_ARGUMENTS) *Original_Delta_Time = cctkGH->CCTK_DELTA_TIME; cctkGH->cctk_time -= cctkGH->CCTK_DELTA_TIME; - if (CCTK_EQUALS(MoL_ODE_Method,"ICN")) + if (CCTK_EQUALS(ODE_Method,"ICN")) { cctkGH->CCTK_DELTA_TIME = 0.5*(*Original_Delta_Time); } - else if (CCTK_EQUALS(MoL_ODE_Method,"Generic")) + else if (CCTK_EQUALS(ODE_Method,"Generic")) { beta = RKBetaCoefficients[0]; @@ -125,7 +125,7 @@ int MoL_ResetTime(CCTK_ARGUMENTS) cctkGH->cctk_time = (*Original_Time); cctkGH->CCTK_DELTA_TIME = (*Original_Delta_Time); } - else if (CCTK_EQUALS(MoL_ODE_Method,"ICN")) + else if (CCTK_EQUALS(ODE_Method,"ICN")) { if (*MoL_Intermediate_Step == 1) { @@ -137,7 +137,7 @@ int MoL_ResetTime(CCTK_ARGUMENTS) } cctkGH->cctk_time = (*Original_Time)-0.5*(*Original_Delta_Time); } - else if (CCTK_EQUALS(MoL_ODE_Method,"Generic")) + else if (CCTK_EQUALS(ODE_Method,"Generic")) { cctkGH->CCTK_DELTA_TIME = RKBetaCoefficients[MoL_Intermediate_Steps - (*MoL_Intermediate_Step)] * @@ -158,7 +158,7 @@ int MoL_ResetTime(CCTK_ARGUMENTS) cctkGH->cctk_time = previous_times[MoL_Intermediate_Steps - *MoL_Intermediate_Step]; } - else if (CCTK_EQUALS(MoL_ODE_Method,"RK2")) + else if (CCTK_EQUALS(ODE_Method,"RK2")) { if (*MoL_Intermediate_Step == 1) { |