Distinguish between persistent variables and those that need to be checkpointed; e.g. eta (the shift driver parameter) is persistent, but is not checkpointed.

3 files changed, 34 insertions, 79 deletions

diff --git a/m/prototype/ML_BSSN_Helper/src/CopyADMBase.c b/m/prototype/ML_BSSN_Helper/src/CopyADMBase.c
deleted file mode 100644
index 529e1c8..0000000
--- a/m/prototype/ML_BSSN_Helper/src/CopyADMBase.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-
-#include <cctk.h>
-#include <cctk_Arguments.h>
-
-static void
-copy (cGH const * restrict cctkGH,
-      CCTK_REAL * restrict dst, CCTK_REAL const * restrict src);
-
-void
-ML_BSSN_CopyADMBase (CCTK_ARGUMENTS)
-{
-  DECLARE_CCTK_ARGUMENTS;
-  
-  copy (cctkGH, gxx, gxx_p);
-  copy (cctkGH, gxy, gxx_p);
-  copy (cctkGH, gxz, gxx_p);
-  copy (cctkGH, gyy, gxx_p);
-  copy (cctkGH, gyz, gxx_p);
-  copy (cctkGH, gzz, gxx_p);
-  
-  copy (cctkGH, kxx, gxx_p);
-  copy (cctkGH, kxy, gxx_p);
-  copy (cctkGH, kxz, gxx_p);
-  copy (cctkGH, kyy, gxx_p);
-  copy (cctkGH, kyz, gxx_p);
-  copy (cctkGH, kzz, gxx_p);
-  
-  copy (cctkGH, alp, alp_p);
-  
-  copy (cctkGH, betax, betax_p);
-  copy (cctkGH, betay, betay_p);
-  copy (cctkGH, betaz, betaz_p);
-  
-  copy (cctkGH, dtalp, dtalp_p);
-  
-  copy (cctkGH, dtbetax, dtbetax_p);
-  copy (cctkGH, dtbetay, dtbetay_p);
-  copy (cctkGH, dtbetaz, dtbetaz_p);
-}
-
-static void
-copy (cGH const * restrict const cctkGH,
-      CCTK_REAL * restrict const dst, CCTK_REAL const * restrict const src)
-{
-  size_t const npoints =
-    (size_t) cctkGH->cctk_lsh[0] * cctkGH->cctk_lsh[1] * cctkGH->cctk_lsh[2];
-  memcpy (dst, src, npoints * sizeof *dst);
-}
diff --git a/m/prototype/ML_BSSN_Helper/src/SetGroupTags.c b/m/prototype/ML_BSSN_Helper/src/SetGroupTags.c
index a3f20a7..7663e61 100644
--- a/m/prototype/ML_BSSN_Helper/src/SetGroupTags.c
+++ b/m/prototype/ML_BSSN_Helper/src/SetGroupTags.c
@@ -5,7 +5,9 @@
 #include <assert.h>
 
 static void
-set_group_tags (int const checkpoint, int const prolongate,
+set_group_tags (int const checkpoint,
+                int const persistent,
+                int const prolongate,
                 char const * restrict const gn);
 
 int
@@ -13,35 +15,39 @@ ML_BSSN_SetGroupTags (void)
 {
   DECLARE_CCTK_PARAMETERS;
   
-  set_group_tags (0, 1, "ADMBase::metric");
-  set_group_tags (0, 1, "ADMBase::curv");
-  set_group_tags (0, 1, "ADMBase::lapse");
-  set_group_tags (0, 1, "ADMBase::shift");
-  set_group_tags (0, 1, "ADMBase::dtlapse");
-  set_group_tags (0, 1, "ADMBase::dtshift");
+  set_group_tags (0, 0, 1, "ADMBase::metric");
+  set_group_tags (0, 0, 1, "ADMBase::curv");
+  set_group_tags (0, 0, 1, "ADMBase::lapse");
+  set_group_tags (0, 0, 1, "ADMBase::shift");
+  set_group_tags (0, 0, 1, "ADMBase::dtlapse");
+  set_group_tags (0, 0, 1, "ADMBase::dtshift");
   
-  set_group_tags (0, 0, "ML_BSSN::ML_cons_detg");
-  set_group_tags (0, 0, "ML_BSSN::ML_cons_Gamma");
-  set_group_tags (0, 0, "ML_BSSN::ML_cons_traceA");
-  set_group_tags (0, 0, "ML_BSSN::ML_Ham");
-  set_group_tags (0, 0, "ML_BSSN::ML_mom");
-  set_group_tags (0, 0, "ML_BSSN::ML_curvrhs");
+  set_group_tags (0, 0, 0, "ML_BSSN::ML_cons_detg");
+  set_group_tags (0, 0, 0, "ML_BSSN::ML_cons_Gamma");
+  set_group_tags (0, 0, 0, "ML_BSSN::ML_cons_traceA");
+  set_group_tags (0, 0, 0, "ML_BSSN::ML_Ham");
+  set_group_tags (0, 0, 0, "ML_BSSN::ML_mom");
+  
+  set_group_tags (0, 1, 0, "ML_BSSN::ML_BetaDriver");
   
   int const checkpoint = rhs_timelevels > 1;
-  set_group_tags (checkpoint, 0, "ML_BSSN::ML_dtlapserhs");
-  set_group_tags (checkpoint, 0, "ML_BSSN::ML_dtshiftrhs");
-  set_group_tags (checkpoint, 0, "ML_BSSN::ML_Gammarhs");
-  set_group_tags (checkpoint, 0, "ML_BSSN::ML_lapserhs");
-  set_group_tags (checkpoint, 0, "ML_BSSN::ML_log_confacrhs");
-  set_group_tags (checkpoint, 0, "ML_BSSN::ML_metricrhs");
-  set_group_tags (checkpoint, 0, "ML_BSSN::ML_shiftrhs");
-  set_group_tags (checkpoint, 0, "ML_BSSN::ML_trace_curvrhs");
+  set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_dtlapserhs");
+  set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_dtshiftrhs");
+  set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_Gammarhs");
+  set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_lapserhs");
+  set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_log_confacrhs");
+  set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_metricrhs");
+  set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_shiftrhs");
+  set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_trace_curvrhs");
+  set_group_tags (checkpoint, checkpoint, 0, "ML_BSSN::ML_curvrhs");
   
   return 0;
 }
 
 static void
-set_group_tags (int const checkpoint, int const prolongate,
+set_group_tags (int const checkpoint,
+                int const persistent,
+                int const prolongate,
                 char const * restrict const gn)
 {
   assert (gn);
@@ -53,17 +59,17 @@ set_group_tags (int const checkpoint, int const prolongate,
   assert (table >= 0);
   
   if (! checkpoint) {
-    int ierr;
-    ierr = Util_TableSetString (table, "no", "Checkpoint");
+    int const ierr = Util_TableSetString (table, "no", "Checkpoint");
     assert (! ierr);
-    
-    ierr = Util_TableSetString (table, "no", "Persistent");
+  }
+  
+  if (! persistent) {
+    int const ierr = Util_TableSetString (table, "no", "Persistent");
     assert (! ierr);
   }
   
   if (! prolongate) {
-    int ierr;
-    ierr = Util_TableSetString (table, "none", "Prolongation");
+    int const ierr = Util_TableSetString (table, "none", "Prolongation");
     assert (! ierr);
   }
 }
diff --git a/m/prototype/ML_BSSN_Helper/src/make.code.defn b/m/prototype/ML_BSSN_Helper/src/make.code.defn
index 2625d6c..a3ac433 100644
--- a/m/prototype/ML_BSSN_Helper/src/make.code.defn
+++ b/m/prototype/ML_BSSN_Helper/src/make.code.defn
@@ -1,3 +1,2 @@
 # -*-Makefile-*-
 SRCS = ExtrapolateGammas.c NewRad.c RegisterConstrained.c RegisterSlicing.c SelectBCsADMBase.c SetGroupTags.c
-#  CopyADMBase.c