WaveToyX: adapt to CarpetX implementation change

required due to CarpetX implemting "Driver"
EinsteinToolkit · Sep 12, 2024 · 7046df3 · 7046df3
1 parent 7301e44
commit 7046df3
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 14 deletions.
diff --git a/WaveToyX/interface.ccl b/WaveToyX/interface.ccl
@@ -2,8 +2,6 @@
 
 IMPLEMENTS: WaveToyX
 
-INHERITS: CarpetX
-
 USES INCLUDE HEADER: loop_device.hxx
 USES INCLUDE HEADER: vect.hxx
 

diff --git a/WaveToyX/par/standing.par b/WaveToyX/par/standing.par
@@ -13,9 +13,10 @@ Cactus::presync_mode = "mixed-error"
 
 CarpetX::poison_undefined_values = no
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::terminate = "time"
 Cactus::cctk_final_time = 1.0

diff --git a/WaveToyX/schedule.ccl b/WaveToyX/schedule.ccl
@@ -12,14 +12,14 @@ SCHEDULE WaveToyX_Initial AT initial
 # {
 #   LANG: C
 #   READS: state(everywhere)
-#   WRITES: CarpetX::regrid_error(interior)
+#   WRITES: CarpetXRegrid::regrid_error(interior)
 # } "Estimate error for regridding"
 # 
 # SCHEDULE WaveToyX_EstimateError AT poststep
 # {
 #   LANG: C
 #   READS: state(everywhere)
-#   WRITES: CarpetX::regrid_error(interior)
+#   WRITES: CarpetXRegrid::regrid_error(interior)
 # } "Estimate error for regridding"
 
 SCHEDULE WaveToyX_RHS IN ODESolvers_RHS

diff --git a/WaveToyX/test/presync.par b/WaveToyX/test/presync.par
@@ -14,9 +14,10 @@ CarpetX::ncells_x = 8
 CarpetX::ncells_y = 8
 CarpetX::ncells_z = 8
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::cctk_itlast = 10
 
@@ -26,6 +27,7 @@ ODESolvers::method = "RK3"
 
 IO::out_dir = $parfile
 IO::out_every = 10
+IO::out_fileinfo = "axis labels"
 IO::parfile_write = no
 
 CarpetX::out_metadata = no
@@ -35,7 +37,6 @@ CarpetX::out_norm_omit_sumloc_for_backward_compatibility = yes
 
 CarpetX::out_tsv_vars = "
     WaveToyX::state
-    WaveToyX::rhs
     WaveToyX::energy
     WaveToyX::error
 "
diff --git a/...st/presync/norms/carpetx-regrid_error.tsv → ...sync/norms/carpetxregrid-regrid_error.tsv b/...st/presync/norms/carpetx-regrid_error.tsv → ...sync/norms/carpetxregrid-regrid_error.tsv
diff --git a/.../radiative/norms/carpetx-regrid_error.tsv → ...tive/norms/carpetxregrid-regrid_error.tsv b/.../radiative/norms/carpetx-regrid_error.tsv → ...tive/norms/carpetxregrid-regrid_error.tsv
diff --git a/...reflecting/norms/carpetx-regrid_error.tsv → ...ting/norms/carpetxregrid-regrid_error.tsv b/...reflecting/norms/carpetx-regrid_error.tsv → ...ting/norms/carpetxregrid-regrid_error.tsv
diff --git a/WaveToyX/test/standing.par b/WaveToyX/test/standing.par
@@ -14,9 +14,10 @@ CarpetX::ncells_x = 8
 CarpetX::ncells_y = 8
 CarpetX::ncells_z = 8
 
-CarpetX::periodic_x = yes
-CarpetX::periodic_y = yes
-CarpetX::periodic_z = yes
+Driver::periodic = "yes"
+Driver::periodic_x = yes
+Driver::periodic_y = yes
+Driver::periodic_z = yes
 
 Cactus::cctk_itlast = 10
 

diff --git a/...t/standing/norms/carpetx-regrid_error.tsv → ...ding/norms/carpetxregrid-regrid_error.tsv b/...t/standing/norms/carpetx-regrid_error.tsv → ...ding/norms/carpetxregrid-regrid_error.tsv