diff options
author | schnetter <> | 2002-05-16 21:25:00 +0000 |
---|---|---|
committer | schnetter <> | 2002-05-16 21:25:00 +0000 |
commit | 3d02341e5cb7a924c6f61a93d41f2c6a1601915c (patch) | |
tree | 461aa9ddddffd8cda2ea2f78cf09c3ee8aca561f /Carpet/CarpetRegrid | |
parent | 932f53d39a4b71185c76b5d8aa3ec6b07870b396 (diff) |
Make sure that refinement_levels is not larger than max_refinement_levels.
darcs-hash:20020516212554-07bb3-0a6f49841a9091908132bf5a0d8268e2b5335f5c.gz
Diffstat (limited to 'Carpet/CarpetRegrid')
-rw-r--r-- | Carpet/CarpetRegrid/src/make.code.defn | 4 | ||||
-rw-r--r-- | Carpet/CarpetRegrid/src/paramcheck.cc | 20 | ||||
-rw-r--r-- | Carpet/CarpetRegrid/src/regrid.hh | 3 |
3 files changed, 5 insertions, 22 deletions
diff --git a/Carpet/CarpetRegrid/src/make.code.defn b/Carpet/CarpetRegrid/src/make.code.defn index 5904f9ec0..ec45ed348 100644 --- a/Carpet/CarpetRegrid/src/make.code.defn +++ b/Carpet/CarpetRegrid/src/make.code.defn @@ -1,8 +1,8 @@ # Main make.code.defn file for thorn CarpetRegrid -# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/make.code.defn,v 1.1 2001/12/14 16:34:38 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/make.code.defn,v 1.2 2002/05/16 23:25:54 schnetter Exp $ # Source files in this directory -SRCS = regrid.cc +SRCS = regrid.cc paramcheck.cc # Subdirectories containing source files SUBDIRS = diff --git a/Carpet/CarpetRegrid/src/paramcheck.cc b/Carpet/CarpetRegrid/src/paramcheck.cc index 7d85bee1e..ad2c4819e 100644 --- a/Carpet/CarpetRegrid/src/paramcheck.cc +++ b/Carpet/CarpetRegrid/src/paramcheck.cc @@ -1,5 +1,3 @@ -#include <assert.h> - #include "cctk.h" #include "cctk_Arguments.h" #include "cctk_Parameters.h" @@ -7,7 +5,7 @@ #include "carpet.hh" #include "regrid.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/paramcheck.cc,v 1.3 2004/08/02 11:42:36 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/paramcheck.cc,v 1.1 2002/05/16 23:25:54 schnetter Exp $"; CCTK_FILEVERSION(CarpetRegrid_paramcheck_cc) @@ -24,22 +22,6 @@ namespace CarpetRegrid { if (refinement_levels > maxreflevels) { CCTK_PARAMWARN ("The parameter CarpetRegrid::refinement_levels is larger than Carpet::max_refinement_levels"); } - - if (smart_outer_boundaries) { - int type; - const CCTK_INT * const domain_from_coordbase - = (const CCTK_INT *) CCTK_ParameterGet ("domain_from_coordbase", "Carpet", &type); - assert (domain_from_coordbase); - assert (type == PARAMETER_BOOLEAN); - if (! *domain_from_coordbase) { - CCTK_PARAMWARN ("The parameter CarpetRegrid::smart_outer_boundaries can only be used when Carpet::domain_from_coordbase=yes"); - } - if (CCTK_Equals(refined_regions, "manual-coordinate-list")) { - // do nothing - } else { - CCTK_PARAMWARN ("The parameter CarpetRegrid::smart_outer_boundaries can currently only be used when CarpetRegrid::refined_regions is set to \"manual-coordinate-list\""); - } - } return 0; } diff --git a/Carpet/CarpetRegrid/src/regrid.hh b/Carpet/CarpetRegrid/src/regrid.hh index a1ca9d4f5..661e1a2e9 100644 --- a/Carpet/CarpetRegrid/src/regrid.hh +++ b/Carpet/CarpetRegrid/src/regrid.hh @@ -1,4 +1,4 @@ -// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.hh,v 1.5 2002/03/23 20:20:57 schnetter Exp $ +// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.hh,v 1.6 2002/05/16 23:25:54 schnetter Exp $ #ifndef REGRID_HH #define REGRID_HH @@ -22,6 +22,7 @@ namespace CarpetRegrid { // scheduled functions extern "C" { int CarpetRegridStartup (); + int CarpetRegridParamcheck (CCTK_ARGUMENTS); } |