From feaffd81a05c26f88ff2cabbc614240c06fb5291 Mon Sep 17 00:00:00 2001 From: Roland Haas Date: Thu, 29 Aug 2024 16:10:37 -0500 Subject: [PATCH] StaggeredWaveToyX: adapt to CarpetX implementation change required due to CarpetX implemting "Driver" --- StaggeredWaveToyX/par/standing.par | 7 +-- StaggeredWaveToyX/test/standing.par | 9 ++-- ...ror.tsv => carpetxregrid-regrid_error.tsv} | 0 StaggeredWaveToyX/test/standing/standing.par | 53 ------------------- 4 files changed, 10 insertions(+), 59 deletions(-) rename StaggeredWaveToyX/test/standing/norms/{carpetx-regrid_error.tsv => carpetxregrid-regrid_error.tsv} (100%) delete mode 100644 StaggeredWaveToyX/test/standing/standing.par diff --git a/StaggeredWaveToyX/par/standing.par b/StaggeredWaveToyX/par/standing.par index b1a2ca2ae..8f38ca903 100644 --- a/StaggeredWaveToyX/par/standing.par +++ b/StaggeredWaveToyX/par/standing.par @@ -14,9 +14,10 @@ Cactus::presync_mode = "mixed-error" CarpetX::verbose = no 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/StaggeredWaveToyX/test/standing.par b/StaggeredWaveToyX/test/standing.par index 59086a9a2..202ab61f9 100644 --- a/StaggeredWaveToyX/test/standing.par +++ b/StaggeredWaveToyX/test/standing.par @@ -17,9 +17,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 @@ -29,6 +30,8 @@ ODESolvers::method = "RK3" IO::out_dir = $parfile IO::out_every = $out_every +IO::out_fileinfo = "axis labels" +IO::parfile_write = no CarpetX::out_metadata = no CarpetX::out_norm_vars = "all" diff --git a/StaggeredWaveToyX/test/standing/norms/carpetx-regrid_error.tsv b/StaggeredWaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv similarity index 100% rename from StaggeredWaveToyX/test/standing/norms/carpetx-regrid_error.tsv rename to StaggeredWaveToyX/test/standing/norms/carpetxregrid-regrid_error.tsv diff --git a/StaggeredWaveToyX/test/standing/standing.par b/StaggeredWaveToyX/test/standing/standing.par deleted file mode 100644 index c7b9a407d..000000000 --- a/StaggeredWaveToyX/test/standing/standing.par +++ /dev/null @@ -1,53 +0,0 @@ -ActiveThorns = " - CarpetX - IOUtil - ODESolvers - StaggeredWaveToyX -" - -$out_every = 16 - -Cactus::cctk_show_schedule = no -Cactus::presync_mode = "mixed-error" - -CarpetX::poison_undefined_values = yes - -CarpetX::ncells_x = 8 -CarpetX::ncells_y = 8 -CarpetX::ncells_z = 8 - -CarpetX::periodic_x = yes -CarpetX::periodic_y = yes -CarpetX::periodic_z = yes - -Cactus::cctk_itlast = 10 - -StaggeredWaveToyX::initial_condition = "standing wave" - -ODESolvers::method = "RK3" - -IO::out_dir = $parfile -IO::out_every = $out_every - -CarpetX::out_metadata = no -CarpetX::out_norm_vars = "all" -CarpetX::out_norm_omit_unstable = yes - -CarpetX::out_tsv_vars = " - StaggeredWaveToyX::ustate - StaggeredWaveToyX::fxstate - StaggeredWaveToyX::fystate - StaggeredWaveToyX::fzstate - StaggeredWaveToyX::urhs - StaggeredWaveToyX::fxrhs - StaggeredWaveToyX::fyrhs - StaggeredWaveToyX::fzrhs - StaggeredWaveToyX::curlfx - StaggeredWaveToyX::curlfy - StaggeredWaveToyX::curlfz - StaggeredWaveToyX::energy - StaggeredWaveToyX::uerror - StaggeredWaveToyX::fxerror - StaggeredWaveToyX::fyerror - StaggeredWaveToyX::fzerror -"