TestSubcyclingMC2: fix unit test for gaussian_noSC

lwJi · Apr 28, 2024 · 16678d0 · 16678d0
1 parent 20a76e0
commit 16678d0
Show file tree

Hide file tree

Showing 28 changed files with 761 additions and 1,512 deletions.
diff --git a/ODESolvers/src/odesolvers_solve_subcycling.cxx b/ODESolvers/src/odesolvers_solve_subcycling.cxx
@@ -203,7 +203,6 @@ extern "C" void ODESolvers_Solve_Subcycling(CCTK_ARGUMENTS) {
     // Sync OldState:
 
     // Step 1:
-    // var = Y1 = old
     if (verbose)
       CCTK_VINFO("Calculating RHS #1 at t=%g", double(cctkGH->cctk_time));
     CallScheduleGroup(cctkGH, "ODESolvers_CalcYfFromKcs1");
@@ -213,8 +212,6 @@ extern "C" void ODESolvers_Solve_Subcycling(CCTK_ARGUMENTS) {
                     "ODESolvers after calling ODESolvers_RHS");
     statecomp_t::lincomb(ks[0], 0, make_array(CCTK_REAL(1)), make_array(&rhs),
                          make_valid_int());
-
-    // Step 2:
     // var = Y2 = y0 + h/2 k1
     statecomp_t::lincomb(var, 1, make_array(dt / 2), make_array(&rhs),
                          make_valid_int());
@@ -223,6 +220,8 @@ extern "C" void ODESolvers_Solve_Subcycling(CCTK_ARGUMENTS) {
     mark_invalid(dep_groups);
     *const_cast<CCTK_REAL *>(&cctkGH->cctk_time) = old_time + dt / 2;
     CallScheduleGroup(cctkGH, "ODESolvers_PostStep");
+
+    // Step 2:
     if (verbose)
       CCTK_VINFO("Calculating RHS #2 at t=%g", double(cctkGH->cctk_time));
     CallScheduleGroup(cctkGH, "ODESolvers_CalcYfFromKcs2");
@@ -232,8 +231,6 @@ extern "C" void ODESolvers_Solve_Subcycling(CCTK_ARGUMENTS) {
                     "ODESolvers after calling ODESolvers_RHS");
     statecomp_t::lincomb(ks[1], 0, make_array(CCTK_REAL(1)), make_array(&rhs),
                          make_valid_int());
-
-    // Step 3:
     // var = Y3 = y0 + h/2 k2
     statecomp_t::lincomb(var, 0, make_array(CCTK_REAL(1), dt / 2),
                          make_array(&old, &rhs), make_valid_int());
@@ -242,6 +239,8 @@ extern "C" void ODESolvers_Solve_Subcycling(CCTK_ARGUMENTS) {
     mark_invalid(dep_groups);
     *const_cast<CCTK_REAL *>(&cctkGH->cctk_time) = old_time + dt / 2;
     CallScheduleGroup(cctkGH, "ODESolvers_PostStep");
+
+    // Step 3:
     if (verbose)
       CCTK_VINFO("Calculating RHS #3 at t=%g", double(cctkGH->cctk_time));
     CallScheduleGroup(cctkGH, "ODESolvers_CalcYfFromKcs3");
@@ -251,8 +250,6 @@ extern "C" void ODESolvers_Solve_Subcycling(CCTK_ARGUMENTS) {
                     "ODESolvers after calling ODESolvers_RHS");
     statecomp_t::lincomb(ks[2], 0, make_array(CCTK_REAL(1)), make_array(&rhs),
                          make_valid_int());
-
-    // Step 4:
     // var = Y4 = y0 + h k3
     statecomp_t::lincomb(var, 0, make_array(CCTK_REAL(1), dt),
                          make_array(&old, &rhs), make_valid_int());
@@ -261,6 +258,8 @@ extern "C" void ODESolvers_Solve_Subcycling(CCTK_ARGUMENTS) {
     mark_invalid(dep_groups);
     *const_cast<CCTK_REAL *>(&cctkGH->cctk_time) = old_time + dt;
     CallScheduleGroup(cctkGH, "ODESolvers_PostStep");
+
+    // Step 4:
     if (verbose)
       CCTK_VINFO("Calculating RHS #4 at t=%g", double(cctkGH->cctk_time));
     CallScheduleGroup(cctkGH, "ODESolvers_CalcYfFromKcs4");
@@ -270,8 +269,6 @@ extern "C" void ODESolvers_Solve_Subcycling(CCTK_ARGUMENTS) {
                     "ODESolvers after calling ODESolvers_RHS");
     statecomp_t::lincomb(ks[3], 0, make_array(CCTK_REAL(1)), make_array(&rhs),
                          make_valid_int());
-
-    // Calculate New State Vector:
     // var = y1 = y0 + h/6 k1 + h/3 k2 + h/3 k3 + h/6 k4
     statecomp_t::lincomb(
         var, 0, make_array(CCTK_REAL(1), dt / 6, dt / 3, dt / 3, dt / 6),

diff --git a/TestSubcyclingMC2/schedule.ccl b/TestSubcyclingMC2/schedule.ccl
@@ -21,7 +21,11 @@ SCHEDULE TestSubcyclingMC2_Sync AT postregrid
   SYNC: state
 } "Synchronize"
 
-
+SCHEDULE TestSubcyclingMC2_SyncState IN ODESolvers_PostStep
+{
+  LANG: C
+  SYNC: state
+} "Sync old and ks"
 
 SCHEDULE TestSubcyclingMC2_SyncKs IN ODESolvers_CalcYfFromKcs1 BEFORE ODESolvers_Solve_CalcYfFromKcs1
 {

diff --git a/TestSubcyclingMC2/src/testsubcyclingmc.cxx b/TestSubcyclingMC2/src/testsubcyclingmc.cxx
@@ -123,6 +123,10 @@ extern "C" void TestSubcyclingMC2_Sync(CCTK_ARGUMENTS) {
   // do nothing
 }
 
+extern "C" void TestSubcyclingMC2_SyncState(CCTK_ARGUMENTS) {
+  // do nothing
+}
+
 extern "C" void TestSubcyclingMC2_SyncKs(CCTK_ARGUMENTS) {
   // do nothing
 }

diff --git a/TestSubcyclingMC2/test/gaussian_noSC.par b/TestSubcyclingMC2/test/gaussian_noSC.par
@@ -14,8 +14,8 @@ $ncells = 32
 TestSubcyclingMC2::initial_condition = "Gaussian"
 TestSubcyclingMC2::gaussian_width = 0.17677669529 # sqrt(2)*W = 0.25
 
-CarpetX::use_subcycling_wip = yes
-CarpetX::restrict_during_sync = no
+#CarpetX::use_subcycling_wip = yes
+#CarpetX::restrict_during_sync = no
 
 CarpetX::poison_undefined_values = no
 CarpetX::verbose = no

diff --git a/TestSubcyclingMC2/test/gaussian_noSC/testsubcyclingmc2-error.it000032.x.tsv b/TestSubcyclingMC2/test/gaussian_noSC/testsubcyclingmc2-error.it000032.x.tsv
diff --git a/TestSubcyclingMC2/test/gaussian_noSC/testsubcyclingmc2-error.it000032.y.tsv b/TestSubcyclingMC2/test/gaussian_noSC/testsubcyclingmc2-error.it000032.y.tsv
diff --git a/TestSubcyclingMC2/test/gaussian_noSC/testsubcyclingmc2-error.it000032.z.tsv b/TestSubcyclingMC2/test/gaussian_noSC/testsubcyclingmc2-error.it000032.z.tsv
diff --git a/TestSubcyclingMC2/test/gaussian_noSC/testsubcyclingmc2-error.it000064.x.tsv b/TestSubcyclingMC2/test/gaussian_noSC/testsubcyclingmc2-error.it000064.x.tsv
diff --git a/TestSubcyclingMC2/test/gaussian_noSC/testsubcyclingmc2-error.it000064.y.tsv b/TestSubcyclingMC2/test/gaussian_noSC/testsubcyclingmc2-error.it000064.y.tsv
diff --git a/TestSubcyclingMC2/test/gaussian_noSC/testsubcyclingmc2-error.it000064.z.tsv b/TestSubcyclingMC2/test/gaussian_noSC/testsubcyclingmc2-error.it000064.z.tsv
diff --git a/TestSubcyclingMC2/test/gaussian_noSC/testsubcyclingmc2-error.it000096.x.tsv b/TestSubcyclingMC2/test/gaussian_noSC/testsubcyclingmc2-error.it000096.x.tsv