Carpet: Forbid adaptive time step sizes when there is mesh refinement

darcs-hash:20050127104026-891bb-a27d7fdb9c56755e5b3d3be44606ee66e3973614.gz

1 files changed, 7 insertions, 3 deletions

diff --git a/Carpet/Carpet/src/CarpetParamCheck.cc b/Carpet/Carpet/src/CarpetParamCheck.cc
index 5e8939166..085f91e1f 100644
--- a/Carpet/Carpet/src/CarpetParamCheck.cc
+++ b/Carpet/Carpet/src/CarpetParamCheck.cc
@@ -24,11 +24,15 @@ namespace Carpet {
     DECLARE_CCTK_PARAMETERS;
     
     if (CCTK_ParameterQueryTimesSet ("periodic", "Carpet")
-	|| CCTK_ParameterQueryTimesSet ("periodic_x", "Carpet")
-	|| CCTK_ParameterQueryTimesSet ("periodic_y", "Carpet")
-	|| CCTK_ParameterQueryTimesSet ("periodic_z", "Carpet")) {
+	or CCTK_ParameterQueryTimesSet ("periodic_x", "Carpet")
+	or CCTK_ParameterQueryTimesSet ("periodic_y", "Carpet")
+	or CCTK_ParameterQueryTimesSet ("periodic_z", "Carpet")) {
       CCTK_PARAMWARN ("Some of the parameters \"Carpet::periodic*\" have been set.  These parameters are there for compatibility reasons only and must not be used.");
     }
+    
+    if (adaptive_stepsize and max_refinement_levels > 1) {
+      CCTK_PARAMWARN ("Adaptive time step sizes do not work with mesh refinement yet.  Please use only a single level, and set max_refinement_levels=1.");
+    }
   }
   
 } // namespace Carpet