EinsteinToolkit · stevenrbrandt · Jul 29, 2024 · Jul 30, 2024 · Aug 2, 2024
diff --git a/BenchX/par/benchmark-carpetx.par b/BenchX/par/benchmark-carpetx.par
@@ -63,7 +63,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 0
-CarpetX::regrid_error_threshold = 2.0
+Driver::regrid_error_threshold = 2.0
 
 ErrorEstimator::region_shape = "cube"
 ErrorEstimator::scale_by_resolution = yes

diff --git a/BenchX/par/benchmark-z4c+grhydrox.par b/BenchX/par/benchmark-z4c+grhydrox.par
@@ -66,7 +66,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 0
-CarpetX::regrid_error_threshold = 2.0
+Driver::regrid_error_threshold = 2.0
 
 ErrorEstimator::region_shape = "cube"
 ErrorEstimator::scale_by_resolution = yes

diff --git a/BenchX/par/benchmark-z4c.par b/BenchX/par/benchmark-z4c.par
@@ -63,7 +63,7 @@ CarpetX::boundary_upper_z = "dirichlet"
 
 CarpetX::max_num_levels = $nlevels
 CarpetX::regrid_every = 0
-CarpetX::regrid_error_threshold = 2.0
+Driver::regrid_error_threshold = 2.0
 
 ErrorEstimator::region_shape = "cube"
 ErrorEstimator::scale_by_resolution = yes

diff --git a/BoxInBox/interface.ccl b/BoxInBox/interface.ccl
@@ -2,7 +2,7 @@
 
 IMPLEMENTS: BoxInBox
 
-INHERITS: CarpetX
+INHERITS: Driver, CarpetXRegrid
 
 USES INCLUDE HEADER: defs.hxx
 USES INCLUDE HEADER: loop_device.hxx

diff --git a/BoxInBox/schedule.ccl b/BoxInBox/schedule.ccl
@@ -19,7 +19,7 @@ SCHEDULE BoxInBox_Setup AS EstimateError AT postinitial
   READS: positions
   READS: radii
   READS: radiixyz
-  WRITES: CarpetX::regrid_error(interior)
+  WRITES: CarpetXRegrid::regrid_error(interior)
 } "Estimate error"
 
 SCHEDULE BoxInBox_Setup AS EstimateError AT poststep
@@ -30,5 +30,5 @@ SCHEDULE BoxInBox_Setup AS EstimateError AT poststep
   READS: positions
   READS: radii
   READS: radiixyz
-  WRITES: CarpetX::regrid_error(interior)
+  WRITES: CarpetXRegrid::regrid_error(interior)
 } "Estimate error"
diff --git a/BoxInBox/test/levels1.par b/BoxInBox/test/levels1.par
@@ -3,6 +3,7 @@ ActiveThorns = "
     CarpetX
     CoordinatesX
     IOUtil
+    Regrid
 "
 
 Cactus::cctk_show_schedule = no
@@ -38,7 +39,11 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
+
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/...vels1/carpetx-regrid_error.it000000.x.tsv → ...carpetxregrid-regrid_error.it000000.x.tsv b/...vels1/carpetx-regrid_error.it000000.x.tsv → ...carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/...vels1/carpetx-regrid_error.it000000.y.tsv → ...carpetxregrid-regrid_error.it000000.y.tsv b/...vels1/carpetx-regrid_error.it000000.y.tsv → ...carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/...vels1/carpetx-regrid_error.it000000.z.tsv → ...carpetxregrid-regrid_error.it000000.z.tsv b/...vels1/carpetx-regrid_error.it000000.z.tsv → ...carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/...vels1/carpetx-regrid_error.it000010.x.tsv → ...carpetxregrid-regrid_error.it000010.x.tsv b/...vels1/carpetx-regrid_error.it000010.x.tsv → ...carpetxregrid-regrid_error.it000010.x.tsv
diff --git a/...vels1/carpetx-regrid_error.it000010.y.tsv → ...carpetxregrid-regrid_error.it000010.y.tsv b/...vels1/carpetx-regrid_error.it000010.y.tsv → ...carpetxregrid-regrid_error.it000010.y.tsv
diff --git a/...vels1/carpetx-regrid_error.it000010.z.tsv → ...carpetxregrid-regrid_error.it000010.z.tsv b/...vels1/carpetx-regrid_error.it000010.z.tsv → ...carpetxregrid-regrid_error.it000010.z.tsv
diff --git a/...st/levels1/norms/carpetx-regrid_error.tsv → ...els1/norms/carpetxregrid-regrid_error.tsv b/...st/levels1/norms/carpetx-regrid_error.tsv → ...els1/norms/carpetxregrid-regrid_error.tsv
diff --git a/BoxInBox/test/levels2.par b/BoxInBox/test/levels2.par
@@ -1,6 +1,7 @@
 ActiveThorns = "
     BoxInBox
     CarpetX
+    Regrid
     CoordinatesX
     IOUtil
 "
@@ -39,7 +40,10 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/...vels2/carpetx-regrid_error.it000000.x.tsv → ...carpetxregrid-regrid_error.it000000.x.tsv b/...vels2/carpetx-regrid_error.it000000.x.tsv → ...carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/...vels2/carpetx-regrid_error.it000000.y.tsv → ...carpetxregrid-regrid_error.it000000.y.tsv b/...vels2/carpetx-regrid_error.it000000.y.tsv → ...carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/...vels2/carpetx-regrid_error.it000000.z.tsv → ...carpetxregrid-regrid_error.it000000.z.tsv b/...vels2/carpetx-regrid_error.it000000.z.tsv → ...carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/...vels2/carpetx-regrid_error.it000010.x.tsv → ...carpetxregrid-regrid_error.it000010.x.tsv b/...vels2/carpetx-regrid_error.it000010.x.tsv → ...carpetxregrid-regrid_error.it000010.x.tsv
diff --git a/...vels2/carpetx-regrid_error.it000010.y.tsv → ...carpetxregrid-regrid_error.it000010.y.tsv b/...vels2/carpetx-regrid_error.it000010.y.tsv → ...carpetxregrid-regrid_error.it000010.y.tsv
diff --git a/...vels2/carpetx-regrid_error.it000010.z.tsv → ...carpetxregrid-regrid_error.it000010.z.tsv b/...vels2/carpetx-regrid_error.it000010.z.tsv → ...carpetxregrid-regrid_error.it000010.z.tsv
diff --git a/...st/levels2/norms/carpetx-regrid_error.tsv → ...els2/norms/carpetxregrid-regrid_error.tsv b/...st/levels2/norms/carpetx-regrid_error.tsv → ...els2/norms/carpetxregrid-regrid_error.tsv
diff --git a/BoxInBox/test/levels20.par b/BoxInBox/test/levels20.par
@@ -1,6 +1,7 @@
 ActiveThorns = "
     BoxInBox
     CarpetX
+    Regrid
     CoordinatesX
     IOUtil
 "
@@ -57,7 +58,10 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/...els20/carpetx-regrid_error.it000000.x.tsv → ...carpetxregrid-regrid_error.it000000.x.tsv b/...els20/carpetx-regrid_error.it000000.x.tsv → ...carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/...els20/carpetx-regrid_error.it000000.y.tsv → ...carpetxregrid-regrid_error.it000000.y.tsv b/...els20/carpetx-regrid_error.it000000.y.tsv → ...carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/...els20/carpetx-regrid_error.it000000.z.tsv → ...carpetxregrid-regrid_error.it000000.z.tsv b/...els20/carpetx-regrid_error.it000000.z.tsv → ...carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/...els20/carpetx-regrid_error.it000010.x.tsv → ...carpetxregrid-regrid_error.it000010.x.tsv b/...els20/carpetx-regrid_error.it000010.x.tsv → ...carpetxregrid-regrid_error.it000010.x.tsv
diff --git a/...els20/carpetx-regrid_error.it000010.y.tsv → ...carpetxregrid-regrid_error.it000010.y.tsv b/...els20/carpetx-regrid_error.it000010.y.tsv → ...carpetxregrid-regrid_error.it000010.y.tsv
diff --git a/...els20/carpetx-regrid_error.it000010.z.tsv → ...carpetxregrid-regrid_error.it000010.z.tsv b/...els20/carpetx-regrid_error.it000010.z.tsv → ...carpetxregrid-regrid_error.it000010.z.tsv
diff --git a/...t/levels20/norms/carpetx-regrid_error.tsv → ...ls20/norms/carpetxregrid-regrid_error.tsv b/...t/levels20/norms/carpetx-regrid_error.tsv → ...ls20/norms/carpetxregrid-regrid_error.tsv
diff --git a/BoxInBox/test/levels3.par b/BoxInBox/test/levels3.par
@@ -1,6 +1,7 @@
 ActiveThorns = "
     BoxInBox
     CarpetX
+    Regrid
     CoordinatesX
     IOUtil
 "
@@ -40,7 +41,10 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/...vels3/carpetx-regrid_error.it000000.x.tsv → ...carpetxregrid-regrid_error.it000000.x.tsv b/...vels3/carpetx-regrid_error.it000000.x.tsv → ...carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/...vels3/carpetx-regrid_error.it000000.y.tsv → ...carpetxregrid-regrid_error.it000000.y.tsv b/...vels3/carpetx-regrid_error.it000000.y.tsv → ...carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/...vels3/carpetx-regrid_error.it000000.z.tsv → ...carpetxregrid-regrid_error.it000000.z.tsv b/...vels3/carpetx-regrid_error.it000000.z.tsv → ...carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/...vels3/carpetx-regrid_error.it000010.x.tsv → ...carpetxregrid-regrid_error.it000010.x.tsv b/...vels3/carpetx-regrid_error.it000010.x.tsv → ...carpetxregrid-regrid_error.it000010.x.tsv
diff --git a/...vels3/carpetx-regrid_error.it000010.y.tsv → ...carpetxregrid-regrid_error.it000010.y.tsv b/...vels3/carpetx-regrid_error.it000010.y.tsv → ...carpetxregrid-regrid_error.it000010.y.tsv
diff --git a/...vels3/carpetx-regrid_error.it000010.z.tsv → ...carpetxregrid-regrid_error.it000010.z.tsv b/...vels3/carpetx-regrid_error.it000010.z.tsv → ...carpetxregrid-regrid_error.it000010.z.tsv
diff --git a/...st/levels3/norms/carpetx-regrid_error.tsv → ...els3/norms/carpetxregrid-regrid_error.tsv b/...st/levels3/norms/carpetx-regrid_error.tsv → ...els3/norms/carpetxregrid-regrid_error.tsv
diff --git a/BoxInBox/test/regions2.par b/BoxInBox/test/regions2.par
@@ -1,6 +1,7 @@
 ActiveThorns = "
     BoxInBox
     CarpetX
+    Regrid
     CoordinatesX
     IOUtil
 "
@@ -49,7 +50,10 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/...ions2/carpetx-regrid_error.it000000.x.tsv → ...carpetxregrid-regrid_error.it000000.x.tsv b/...ions2/carpetx-regrid_error.it000000.x.tsv → ...carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/...ions2/carpetx-regrid_error.it000000.y.tsv → ...carpetxregrid-regrid_error.it000000.y.tsv b/...ions2/carpetx-regrid_error.it000000.y.tsv → ...carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/...ions2/carpetx-regrid_error.it000000.z.tsv → ...carpetxregrid-regrid_error.it000000.z.tsv b/...ions2/carpetx-regrid_error.it000000.z.tsv → ...carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/...ions2/carpetx-regrid_error.it000010.x.tsv → ...carpetxregrid-regrid_error.it000010.x.tsv b/...ions2/carpetx-regrid_error.it000010.x.tsv → ...carpetxregrid-regrid_error.it000010.x.tsv
diff --git a/...ions2/carpetx-regrid_error.it000010.y.tsv → ...carpetxregrid-regrid_error.it000010.y.tsv b/...ions2/carpetx-regrid_error.it000010.y.tsv → ...carpetxregrid-regrid_error.it000010.y.tsv
diff --git a/...ions2/carpetx-regrid_error.it000010.z.tsv → ...carpetxregrid-regrid_error.it000010.z.tsv b/...ions2/carpetx-regrid_error.it000010.z.tsv → ...carpetxregrid-regrid_error.it000010.z.tsv
diff --git a/...t/regions2/norms/carpetx-regrid_error.tsv → ...ons2/norms/carpetxregrid-regrid_error.tsv b/...t/regions2/norms/carpetx-regrid_error.tsv → ...ons2/norms/carpetxregrid-regrid_error.tsv
diff --git a/BoxInBox/test/regions3.par b/BoxInBox/test/regions3.par
@@ -1,6 +1,7 @@
 ActiveThorns = "
     BoxInBox
     CarpetX
+    Regrid
     CoordinatesX
     IOUtil
 "
@@ -60,7 +61,10 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/...ions3/carpetx-regrid_error.it000000.x.tsv → ...carpetxregrid-regrid_error.it000000.x.tsv b/...ions3/carpetx-regrid_error.it000000.x.tsv → ...carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/...ions3/carpetx-regrid_error.it000000.y.tsv → ...carpetxregrid-regrid_error.it000000.y.tsv b/...ions3/carpetx-regrid_error.it000000.y.tsv → ...carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/...ions3/carpetx-regrid_error.it000000.z.tsv → ...carpetxregrid-regrid_error.it000000.z.tsv b/...ions3/carpetx-regrid_error.it000000.z.tsv → ...carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/...ions3/carpetx-regrid_error.it000010.x.tsv → ...carpetxregrid-regrid_error.it000010.x.tsv b/...ions3/carpetx-regrid_error.it000010.x.tsv → ...carpetxregrid-regrid_error.it000010.x.tsv
diff --git a/...ions3/carpetx-regrid_error.it000010.y.tsv → ...carpetxregrid-regrid_error.it000010.y.tsv b/...ions3/carpetx-regrid_error.it000010.y.tsv → ...carpetxregrid-regrid_error.it000010.y.tsv
diff --git a/...ions3/carpetx-regrid_error.it000010.z.tsv → ...carpetxregrid-regrid_error.it000010.z.tsv b/...ions3/carpetx-regrid_error.it000010.z.tsv → ...carpetxregrid-regrid_error.it000010.z.tsv
diff --git a/...t/regions3/norms/carpetx-regrid_error.tsv → ...ons3/norms/carpetxregrid-regrid_error.tsv b/...t/regions3/norms/carpetx-regrid_error.tsv → ...ons3/norms/carpetxregrid-regrid_error.tsv
diff --git a/BoxInBox/test/unigrid.par b/BoxInBox/test/unigrid.par
@@ -1,6 +1,7 @@
 ActiveThorns = "
     BoxInBox
     CarpetX
+    Regrid
     CoordinatesX
     IOUtil
 "
@@ -37,7 +38,10 @@ CarpetX::out_norm_vars = "all"
 CarpetX::out_norm_omit_unstable = yes
 
 CarpetX::out_tsv_vars = "
-    CarpetX::regrid_error
+    CarpetXRegrid::regrid_error
     CoordinatesX::vertex_coords
     CoordinatesX::cell_coords
 "
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
diff --git a/...igrid/carpetx-regrid_error.it000000.x.tsv → ...carpetxregrid-regrid_error.it000000.x.tsv b/...igrid/carpetx-regrid_error.it000000.x.tsv → ...carpetxregrid-regrid_error.it000000.x.tsv
diff --git a/...igrid/carpetx-regrid_error.it000000.y.tsv → ...carpetxregrid-regrid_error.it000000.y.tsv b/...igrid/carpetx-regrid_error.it000000.y.tsv → ...carpetxregrid-regrid_error.it000000.y.tsv
diff --git a/...igrid/carpetx-regrid_error.it000000.z.tsv → ...carpetxregrid-regrid_error.it000000.z.tsv b/...igrid/carpetx-regrid_error.it000000.z.tsv → ...carpetxregrid-regrid_error.it000000.z.tsv
diff --git a/...igrid/carpetx-regrid_error.it000010.x.tsv → ...carpetxregrid-regrid_error.it000010.x.tsv b/...igrid/carpetx-regrid_error.it000010.x.tsv → ...carpetxregrid-regrid_error.it000010.x.tsv
diff --git a/...igrid/carpetx-regrid_error.it000010.y.tsv → ...carpetxregrid-regrid_error.it000010.y.tsv b/...igrid/carpetx-regrid_error.it000010.y.tsv → ...carpetxregrid-regrid_error.it000010.y.tsv
diff --git a/...igrid/carpetx-regrid_error.it000010.z.tsv → ...carpetxregrid-regrid_error.it000010.z.tsv b/...igrid/carpetx-regrid_error.it000010.z.tsv → ...carpetxregrid-regrid_error.it000010.z.tsv
diff --git a/...st/unigrid/norms/carpetx-regrid_error.tsv → ...grid/norms/carpetxregrid-regrid_error.tsv b/...st/unigrid/norms/carpetx-regrid_error.tsv → ...grid/norms/carpetxregrid-regrid_error.tsv
diff --git a/CarpetX/configuration.ccl b/CarpetX/configuration.ccl
@@ -2,7 +2,7 @@
 
 REQUIRES AMReX IOUtil MPI yaml_cpp zlib
 
-REQUIRES Arith Loop
+REQUIRES Arith Loop Regrid
 
 OPTIONAL ADIOS2
 {

diff --git a/CarpetX/interface.ccl b/CarpetX/interface.ccl
@@ -1,8 +1,6 @@
 # Interface definition for thorn CarpetX
 
-IMPLEMENTS: CarpetX
-
-INHERITS: IO
+IMPLEMENTS: Driver
 
 USES INCLUDE HEADER: silo.hxx
 
@@ -166,12 +164,3 @@ CCTK_INT FUNCTION DriverInterpolate(
   CCTK_INT ARRAY IN output_array_types,
   CCTK_POINTER ARRAY IN output_arrays)
 PROVIDES FUNCTION DriverInterpolate WITH CarpetX_DriverInterpolate LANGUAGE C
-
-
-
-PUBLIC:
-
-CCTK_REAL regrid_error TYPE=gf CENTERING={ccc} TAGS='checkpoint="no"'
-{
-  regrid_error
-} "Regridding condition"
diff --git a/CarpetX/par/brill-lindquist-checkpoint.par b/CarpetX/par/brill-lindquist-checkpoint.par
@@ -29,9 +29,9 @@ CarpetX::ncells_x = 64
 CarpetX::ncells_y = 64
 CarpetX::ncells_z = 64
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 # CarpetX::reflection_x = yes
 # CarpetX::reflection_y = yes
 # CarpetX::reflection_z = yes

diff --git a/CarpetX/par/brill-lindquist-read.par b/CarpetX/par/brill-lindquist-read.par
@@ -28,9 +28,9 @@ CarpetX::ncells_x = 64
 CarpetX::ncells_y = 64
 CarpetX::ncells_z = 64
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 # CarpetX::reflection_x = yes
 # CarpetX::reflection_y = yes
 # CarpetX::reflection_z = yes

diff --git a/CarpetX/par/brill-lindquist-recover.par b/CarpetX/par/brill-lindquist-recover.par
@@ -29,9 +29,9 @@ CarpetX::ncells_x = 64
 CarpetX::ncells_y = 64
 CarpetX::ncells_z = 64
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 # CarpetX::reflection_x = yes
 # CarpetX::reflection_y = yes
 # CarpetX::reflection_z = yes

diff --git a/CarpetX/par/brill-lindquist-write.par b/CarpetX/par/brill-lindquist-write.par
@@ -29,9 +29,9 @@ CarpetX::ncells_x = 64
 CarpetX::ncells_y = 64
 CarpetX::ncells_z = 64
 
-CarpetX::periodic_x = no
-CarpetX::periodic_y = no
-CarpetX::periodic_z = no
+Driver::periodic_x = no
+Driver::periodic_y = no
+Driver::periodic_z = no
 # CarpetX::reflection_x = yes
 # CarpetX::reflection_y = yes
 # CarpetX::reflection_z = yes

diff --git a/CarpetX/param.ccl b/CarpetX/param.ccl
@@ -71,17 +71,22 @@ CCTK_INT ncells_z "Number of grid cells"
 
 RESTRICTED:
 
-BOOLEAN periodic_x "Periodic"
+# Do not use
+BOOLEAN periodic "Do not use"
 {
 } no
 
-BOOLEAN periodic_y "Periodic"
+BOOLEAN periodic_x "Do not use"
 {
-} no
+} yes
 
-BOOLEAN periodic_z "Periodic"
+BOOLEAN periodic_y "Do not use"
 {
-} no
+} yes
+
+BOOLEAN periodic_z "Do not use"
+{
+} yes
 
 
 

diff --git a/CarpetX/schedule.ccl b/CarpetX/schedule.ccl
@@ -22,11 +22,11 @@ if (!CCTK_Equals(recover, "no") && *recover_file)
 
 # Error estimation
 
-SCHEDULE CarpetX_InitError AT basegrid
-{
-  LANG: C
-  WRITES: regrid_error(everywhere)
-} "Initialize regridding error to zero"
+#SCHEDULE CarpetX_InitError AT basegrid
+#{
+#  LANG: C
+#  WRITES: CarpetXRegrid::regrid_error(everywhere)
+#} "Initialize regridding error to zero"
 
 
 

diff --git a/CarpetX/src/driver.cxx b/CarpetX/src/driver.cxx
@@ -216,12 +216,19 @@ array<array<boundary_t, dim>, 2> get_default_boundaries() {
           bool(CCTK_EQUALS(boundary_upper_z, "robin")),
       }},
   }};
-  for (int f = 0; f < 2; ++f)
-    for (int d = 0; d < dim; ++d)
+  for (int f = 0; f < 2; ++f) {
+    for (int d = 0; d < dim; ++d) {
+      std::cout << "f=" << f << " d=" << d << std::endl;
+      std::cout << "is_symmetry[f][d]=" << is_symmetry[f][d] << std::endl;
+      std::cout << "is_dirichlet[f][d]=" << is_dirichlet[f][d] << std::endl;
+      std::cout << "is_neumann[f][d]=" << is_neumann[f][d] << std::endl;
+      std::cout << "is_robin[f][d]=" << is_robin[f][d] << std::endl;
       assert(is_symmetry[f][d] + is_dirichlet[f][d] +
                  is_linear_extrapolation[f][d] + is_neumann[f][d] +
                  is_robin[f][d] <=
              1);
+    }
+  }
 
   array<array<boundary_t, dim>, 2> boundaries;
   for (int f = 0; f < 2; ++f)
@@ -1527,7 +1534,7 @@ void CactusAmrCore::ErrorEst(const int level, amrex::TagBoxArray &tags,
 #pragma omp critical
     CCTK_VINFO("ErrorEst patch %d level %d", patch, level);
 
-  const int gi = CCTK_GroupIndex("CarpetX::regrid_error");
+  const int gi = CCTK_GroupIndex("CarpetXRegrid::regrid_error");
   assert(gi >= 0);
   const int vi = 0;
   const int tl = 0;

diff --git a/CarpetX/src/make.code.defn b/CarpetX/src/make.code.defn
@@ -51,7 +51,6 @@ SRCS =							\
 	prolongate_3d_rf2_impl_poly.cxx			\
 	prolongate_3d_rf2_impl_poly_cons3lfb.cxx	\
 	reduction.cxx					\
-	regrid_error.cxx				\
 	schedule.cxx					\
 	task_manager.cxx				\
 	timer.cxx					\

diff --git a/CarpetX/src/schedule.cxx b/CarpetX/src/schedule.cxx
@@ -2240,7 +2240,7 @@ int SyncGroupsByDirI(const cGH *restrict cctkGH, int numgroups,
     CCTK_VINFO("SyncGroups %s", buf.str().c_str());
   }
 
-  const int gi_regrid_error = CCTK_GroupIndex("CarpetX::regrid_error");
+  const int gi_regrid_error = CCTK_GroupIndex("CarpetXRegrid::regrid_error");
   assert(gi_regrid_error >= 0);
 
   vector<int> groups;
@@ -2621,7 +2621,7 @@ void Restrict(const cGH *cctkGH, int level, const vector<int> &groups) {
   static Timer timer("Restrict");
   Interval interval(timer);
 
-  const int gi_regrid_error = CCTK_GroupIndex("CarpetX::regrid_error");
+  const int gi_regrid_error = CCTK_GroupIndex("CarpetXRegrid::regrid_error");
   assert(gi_regrid_error >= 0);
 
   for (const auto &patchdata : ghext->patchdata) {

diff --git a/CarpetXRegrid/README b/CarpetXRegrid/README
@@ -0,0 +1,11 @@
+Cactus Code Thorn Regrid
+Author(s)    : Steven R. Brandt <[email protected]>
+Maintainer(s): Steven R. Brandt <[email protected]>
+Licence      : Cactus
+--------------------------------------------------------------------------
+
+1. Purpose
+
+Provide an extra grid function, "regrid_error," to the CarpetX driver.
+This grid function is used by CarpetX and AMReX to determine where to
+refine the grid.
diff --git a/CarpetXRegrid/configuration.ccl b/CarpetXRegrid/configuration.ccl
@@ -0,0 +1,6 @@
+# Configuration definitions for thorn Regrid
+REQUIRES AMReX Arith Loop 
+
+PROVIDES Regrid
+{
+}