1 files changed, 21 insertions, 12 deletions
diff --git a/schedule.ccl b/schedule.ccl
index 4353c66..643ddb5 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -2,6 +2,8 @@
 
 if (CCTK_Equals(initial_data, "twopunctures"))
 {
+  STORAGE: energy, angular_momentum, puncture_adm_mass
+
   if (keep_u_around) {
     STORAGE: puncture_u bare_mass
   }
@@ -13,20 +15,27 @@ if (CCTK_Equals(initial_data, "twopunctures"))
 
   if (schedule_in_ADMBase_InitialData)
   {
-    SCHEDULE TwoPunctures IN ADMBase_InitialData
-    {
-      LANG: C
-      STORAGE: puncture_u bare_mass
-      # SYNC: ADMBase::metric ADMBase::curv ADMBase::lapse
-    } "Create puncture black hole initial data"
+      SCHEDULE GROUP TwoPunctures_Group IN ADMBase_InitialData
+      {
+      } "TwoPunctures initial data group"
   }
   else
   {
-    SCHEDULE TwoPunctures AT Initial AFTER ADMBase_InitialData BEFORE ADMBase_PostInitial AFTER HydroBase_Initial before SetTmunu before HydroBase_Prim2ConInitial
-    {
-      LANG: C
-      STORAGE: puncture_u bare_mass
-      # SYNC: ADMBase::metric ADMBase::curv ADMBase::lapse
-    } "Create puncture black hole initial data"
+      SCHEDULE GROUP TwoPunctures_Group AT Initial AFTER ADMBase_InitialData BEFORE ADMBase_PostInitial AFTER HydroBase_Initial before SetTmunu before HydroBase_Prim2ConInitial
+      {
+      } "TwoPunctures initial data group"
   }
+
+  SCHEDULE TwoPunctures IN TwoPunctures_Group
+  {
+    LANG: C
+    STORAGE: puncture_u bare_mass
+    # SYNC: ADMBase::metric ADMBase::curv ADMBase::lapse
+  } "Create puncture black hole initial data"
+
+  SCHEDULE TwoPunctures_Metadata IN TwoPunctures_Group after TwoPunctures
+  {
+    LANG: C
+    OPTIONS: global
+  } "Output TwoPunctures metadata"
 }