diff options
| author | rhaas <rhaas@578cdeb0-5ea1-4b81-8215-5a3b8777ee0b> | 2014-03-12 05:14:16 +0000 |
|---|---|---|
| committer | rhaas <rhaas@578cdeb0-5ea1-4b81-8215-5a3b8777ee0b> | 2014-03-12 05:14:16 +0000 |
| commit | 9ed15d3d92d604fa6b4e3916656b94681b9f8812 (patch) | |
| tree | dd040a581f4c212bebe79a714e0b534e1c7af1d7 | |
| parent | 9558b41ae2b68ba801fdf7f1cdd9b9b542de9f0f (diff) | |
correct tests and error messages for paramcheck of multi-rate methods
git-svn-id: http://svn.cactuscode.org/arrangements/CactusNumerical/MoL/trunk@216 578cdeb0-5ea1-4b81-8215-5a3b8777ee0b
| -rw-r--r-- | src/ParamCheck.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/ParamCheck.c b/src/ParamCheck.c index 96494bf..c46343a 100644 --- a/src/ParamCheck.c +++ b/src/ParamCheck.c @@ -143,7 +143,7 @@ void MoL_ParamCheck(CCTK_ARGUMENTS) } if ( (CCTK_Equals(ODE_Method, "RK45") || CCTK_Equals(ODE_Method, "RK45CK")) && - ( !((MoL_Intermediate_Steps == 6)||(MoL_Num_Scratch_Levels > 5)) ) ) + ( !((MoL_Intermediate_Steps == 6)&&(MoL_Num_Scratch_Levels > 5)) ) ) { CCTK_PARAMWARN("When using the RK45 or RK45CK evolver, the " "number of intermediate steps must be 6 " @@ -151,7 +151,7 @@ void MoL_ParamCheck(CCTK_ARGUMENTS) } if ( (CCTK_Equals(ODE_Method, "RK65")) && - ( !((MoL_Intermediate_Steps == 8)||(MoL_Num_Scratch_Levels > 7)) ) ) + ( !((MoL_Intermediate_Steps == 8)&&(MoL_Num_Scratch_Levels > 7)) ) ) { CCTK_PARAMWARN("When using the RK65 evolver the " "number of intermediate steps must be 8 " @@ -159,7 +159,7 @@ void MoL_ParamCheck(CCTK_ARGUMENTS) } if ( (CCTK_Equals(ODE_Method, "RK87")) && - ( !((MoL_Intermediate_Steps == 13)||(MoL_Num_Scratch_Levels > 12)) ) ) + ( !((MoL_Intermediate_Steps == 13)&&(MoL_Num_Scratch_Levels > 12)) ) ) { CCTK_PARAMWARN("When using the RK87 evolver the " "number of intermediate steps must be 13 " @@ -172,19 +172,22 @@ void MoL_ParamCheck(CCTK_ARGUMENTS) "number of intermediate steps must be 1"); } - if ( (CCTK_Equals(ODE_Method, "RK2-MR-2:1"))&&( !((MoL_Intermediate_Steps == 5) || (MoL_Num_Scratch_Levels > 4))) ) + if ( (CCTK_Equals(ODE_Method, "RK2-MR-2:1"))&& + ( !((MoL_Intermediate_Steps == 5) && (MoL_Num_Scratch_Levels > 4))) ) { CCTK_PARAMWARN("When using the multirate 2-1 RK2 evolver the " "number of intermediate steps must be 5 and the number of scratch levels at least 5"); } - if ( (CCTK_Equals(ODE_Method, "RK4-MR-2:1"))&&( !((MoL_Intermediate_Steps == 10) || (MoL_Num_Scratch_Levels > 9))) ) + if ( (CCTK_Equals(ODE_Method, "RK4-MR-2:1"))&& + ( !((MoL_Intermediate_Steps == 10) && (MoL_Num_Scratch_Levels > 9))) ) { CCTK_PARAMWARN("When using the multirate 2-1 RK4 evolver the " "number of intermediate steps must be 10 and the number of scratch levels at least 10"); } - if ( (CCTK_Equals(ODE_Method, "RK4-RK2"))&&( !((MoL_Intermediate_Steps == 4) || (MoL_Num_Scratch_Levels > 0))) ) + if ( (CCTK_Equals(ODE_Method, "RK4-RK2"))&& + ( !((MoL_Intermediate_Steps == 4) && (MoL_Num_Scratch_Levels > 0))) ) { CCTK_PARAMWARN("When using the multirate RK4-RK2 evolver the " "number of intermediate steps must be 4 and the number of scratch levels at least 1"); |