[Commits] [svn:einsteintoolkit] WeylScal4/trunk/test/ (Rev. 74)

[roland.haas at physics.gatech.edu]

User: rhaas
Date: 2011/06/07 10:24 AM

Modified:
 /trunk/test/
  teukolsky.par, teukolskyID.par

Log:
 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).

File Changes:

Directory: /trunk/test/
=======================

File [modified]: teukolsky.par
Delta lines: +11 -6
===================================================================
--- trunk/test/teukolsky.par	2011-04-21 04:46:23 UTC (rev 73)
+++ trunk/test/teukolsky.par	2011-06-07 15:24:48 UTC (rev 74)
@@ -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 @@
 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"
 

File [modified]: teukolskyID.par
Delta lines: +11 -6
===================================================================
--- trunk/test/teukolskyID.par	2011-04-21 04:46:23 UTC (rev 73)
+++ trunk/test/teukolskyID.par	2011-06-07 15:24:48 UTC (rev 74)
@@ -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 @@
 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"