aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorrhaas <rhaas@4f5cb9a8-4dd8-4c2d-9bbd-173fa4467843>2011-06-07 15:24:48 +0000
committerrhaas <rhaas@4f5cb9a8-4dd8-4c2d-9bbd-173fa4467843>2011-06-07 15:24:48 +0000
commit3737957ac015890b84fba74786c9730e26d68eb1 (patch)
tree083f88e624c10db2ae6cc662d4913ec437848333 /test
parent1ccf5c1d5e7dffa54411e731494fa48e93a9ff05 (diff)
WeylScal4: replace CarpetRegrid by CarpetRegrid2
* This still passes the two testsuites with the release version of Carpet. * It fails (in points close to/at the edge of refinement levels) with the development version of Carpet (all non-Carpet thorns were development versions in both cases). git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/WeylScal4/trunk@74 4f5cb9a8-4dd8-4c2d-9bbd-173fa4467843
Diffstat (limited to 'test')
-rw-r--r--test/teukolsky.par17
-rw-r--r--test/teukolskyID.par17
2 files changed, 22 insertions, 12 deletions
diff --git a/test/teukolsky.par b/test/teukolsky.par
index af713d9..3143815 100644
--- a/test/teukolsky.par
+++ b/test/teukolsky.par
@@ -4,7 +4,7 @@
# $Header$
# Required thorns
-ActiveThorns = "CartGrid3D CoordBase SymBase Boundary Time Carpet CarpetLib CarpetSlab CarpetRegrid CarpetReduce InitBase CarpetIOAscii IOUtil IOBasic ADMBase ADMMacros ADMConstraints GenericFD TmunuBase ADMCoupling StaticConformal CoordGauge SpaceMask IDLinearWaves LoopControl GSL WeylScal4 ML_BSSN_O2 ML_BSSN_O2_Helper NewRad GenericFD MoL ReflectionSymmetry"
+ActiveThorns = "CartGrid3D CoordBase SymBase Boundary Time Carpet CarpetLib CarpetSlab CarpetRegrid2 CarpetReduce InitBase CarpetIOAscii IOUtil IOBasic ADMBase ADMMacros ADMConstraints GenericFD TmunuBase ADMCoupling StaticConformal CoordGauge SpaceMask IDLinearWaves LoopControl GSL WeylScal4 ML_BSSN_O2 ML_BSSN_O2_Helper NewRad GenericFD MoL ReflectionSymmetry"
# Grid
driver::ghost_size = 2
@@ -24,11 +24,16 @@ CarpetLib::poison_value = 114
InitBase::initial_data_setup_method = init_some_levels
Carpet::init_fill_timelevels = yes
-CarpetRegrid::refinement_levels = 3
-CarpetRegrid::regrid_every = 0
-CarpetRegrid::refined_regions = "manual-coordinate-list"
-CarpetRegrid::coordinates = "[[([-1.0625,-1.0625,0.0]:[0.9375,0.9375,1.0]:[0.25,0.25,0.25])],[([-0.5625,-0.5625,0.0]:[0.4375,0.4375,0.5]:[0.125,0.125,0.125])]]"
-CarpetRegrid::smart_outer_boundaries = "yes"
+CarpetRegrid2::min_distance = 0
+CarpetRegrid2::ensure_proper_nesting = "yes"
+CarpetRegrid2::regrid_every = 0
+CarpetRegrid2::num_centres = 1
+CarpetRegrid2::num_levels_1 = 3
+CarpetRegrid2::position_x_1 = -0.0625
+CarpetRegrid2::position_y_1 = -0.0625
+CarpetRegrid2::position_z_1 = 0
+CarpetRegrid2::radius_1[1] = 1.0
+CarpetRegrid2::radius_1[2] = 0.5
Grid::type = "coordbase"
diff --git a/test/teukolskyID.par b/test/teukolskyID.par
index 9ffd405..9d0230a 100644
--- a/test/teukolskyID.par
+++ b/test/teukolskyID.par
@@ -4,7 +4,7 @@
# $Header$
# Required thorns
-ActiveThorns = "CartGrid3D CoordBase SymBase Boundary Time Carpet CarpetLib CarpetSlab CarpetRegrid CarpetReduce InitBase CarpetIOAscii IOUtil IOBasic ADMBase ADMMacros ADMConstraints GenericFD TmunuBase ADMCoupling StaticConformal CoordGauge SpaceMask IDLinearWaves LoopControl GSL WeylScal4 ReflectionSymmetry MoL"
+ActiveThorns = "CartGrid3D CoordBase SymBase Boundary Time Carpet CarpetLib CarpetSlab CarpetRegrid2 CarpetReduce InitBase CarpetIOAscii IOUtil IOBasic ADMBase ADMMacros ADMConstraints GenericFD TmunuBase ADMCoupling StaticConformal CoordGauge SpaceMask IDLinearWaves LoopControl GSL WeylScal4 ReflectionSymmetry MoL"
# Grid
driver::ghost_size = 1
@@ -24,11 +24,16 @@ CarpetLib::poison_value = 114
InitBase::initial_data_setup_method = init_some_levels
Carpet::init_fill_timelevels = yes
-CarpetRegrid::refinement_levels = 3
-CarpetRegrid::regrid_every = 0
-CarpetRegrid::refined_regions = "manual-coordinate-list"
-CarpetRegrid::coordinates = "[[([-1.0625,-1.0625,0.0]:[0.9375,0.9375,1.0]:[0.25,0.25,0.25])],[([-0.5625,-0.5625,0.0]:[0.4375,0.4375,0.5]:[0.125,0.125,0.125])]]"
-CarpetRegrid::smart_outer_boundaries = "yes"
+CarpetRegrid2::min_distance = 0
+CarpetRegrid2::ensure_proper_nesting = "yes"
+CarpetRegrid2::regrid_every = 0
+CarpetRegrid2::num_centres = 1
+CarpetRegrid2::num_levels_1 = 3
+CarpetRegrid2::position_x_1 = -0.0625
+CarpetRegrid2::position_y_1 = -0.0625
+CarpetRegrid2::position_z_1 = 0
+CarpetRegrid2::radius_1[1] = 1.0
+CarpetRegrid2::radius_1[2] = 0.5
Grid::type = "coordbase"