WeylScal4: beautify schedule.ccl

WeylScal4/schedule.ccl

@@ -3,68 +3,52 @@
 STORAGE: Psi4r_group[timelevels]
 STORAGE: Psi4i_group[timelevels]
 
-# schedule group MoL_PseudoEvolution at ANALYSIS
-# {
-# } "Group to compute constraints"
-# 
-# schedule group MoL_PseudoEvolution AT INITIAL AFTER Z4c_PostStepGroup2
-# {
-# } "Group to compute constraints"
-# 
-# schedule group WeylScal4_psi4_calc_4th_group in MoL_PseudoEvolution after ADMBaseX_SetADMVars
-# {
-# } "WeylScal4_psi4_calc_4th"
-
-schedule group WeylScal4_psi4_calc_4th_group AT INITIAL AFTER Z4c_PostStepGroup2
+SCHEDULE GROUP WeylScal4_psi4_calc_4th_group AT initial AFTER Z4c_PostStepGroup2
 {
-} "Group to compute constraints"
+} "Group to compute psi4"
 
 if (CCTK_IsThornActive("ODESolvers")) {
   SCHEDULE GROUP WeylScal4_psi4_calc_4th_group IN ODESolvers_PostStep after ADMBaseX_SetADMVars 
   {
-  } "WeylScal4_psi4_calc_4th"
+  } "Group to compute psi4"
 } else {
   SCHEDULE GROUP WeylScal4_psi4_calc_4th_group AT postregrid AFTER ADMBaseX_SetADMVars 
   {
-  } "WeylScal4_psi4_calc_4th"
+  } "Group to compute psi4"
 
   SCHEDULE GROUP WeylScal4_psi4_calc_4th_group AT poststep AFTER ADMBaseX_SetADMVars 
   {
-  } "WeylScal4_psi4_calc_4th"
+  } "Group to compute psi4"
 }
 
-schedule group ApplyBCs as WeylScal4_psi4_calc_4th_ApplyBCs in WeylScal4_psi4_calc_4th_bc_group after WeylScal4_psi4_calc_4th_SelectBCs
-{
-} "Apply BCs for groups set in WeylScal4_psi4_calc_4th"
-
-schedule group WeylScal4_psi4_calc_4th_bc_group in WeylScal4_psi4_calc_4th_group after WeylScal4_psi4_calc_4th
+SCHEDULE WeylScal4_psi4_calc_4th IN WeylScal4_psi4_calc_4th_group
 {
+  LANG: C
+  READS: ADMBaseX::kxx(everywhere)
+  READS: ADMBaseX::kxy(everywhere)
+  READS: ADMBaseX::kxz(everywhere)
+  READS: ADMBaseX::kyy(everywhere)
+  READS: ADMBaseX::kyz(everywhere)
+  READS: ADMBaseX::kzz(everywhere)
+  READS: ADMBaseX::gxx(everywhere)
+  READS: ADMBaseX::gxy(everywhere)
+  READS: ADMBaseX::gxz(everywhere)
+  READS: ADMBaseX::gyy(everywhere)
+  READS: ADMBaseX::gyz(everywhere)
+  READS: ADMBaseX::gzz(everywhere)
+  READS: CoordinatesX::vertex_coords(everywhere)
+  WRITES: Psi4i_group(interior)
+  WRITES: Psi4r_group(interior)
 } "WeylScal4_psi4_calc_4th"
 
-schedule WeylScal4_psi4_calc_4th in WeylScal4_psi4_calc_4th_group
+SCHEDULE GROUP WeylScal4_psi4_calc_4th_bc_group IN WeylScal4_psi4_calc_4th_group AFTER WeylScal4_psi4_calc_4th
 {
-  LANG: C
-  READS: ADMBaseX::kxx(Everywhere)
-  READS: ADMBaseX::kxy(Everywhere)
-  READS: ADMBaseX::kxz(Everywhere)
-  READS: ADMBaseX::kyy(Everywhere)
-  READS: ADMBaseX::kyz(Everywhere)
-  READS: ADMBaseX::kzz(Everywhere)
-  READS: ADMBaseX::gxx(Everywhere)
-  READS: ADMBaseX::gxy(Everywhere)
-  READS: ADMBaseX::gxz(Everywhere)
-  READS: ADMBaseX::gyy(Everywhere)
-  READS: ADMBaseX::gyz(Everywhere)
-  READS: ADMBaseX::gzz(Everywhere)
-  READS: CoordinatesX::vertex_coords(Everywhere)
-  WRITES: WeylScal4::Psi4i(Interior)
-  WRITES: WeylScal4::Psi4r(Interior)
-} "WeylScal4_psi4_calc_4th"
+} "Group to sync psi4"
 
-schedule WeylScal4_psi4_calc_4th_SelectBCs in WeylScal4_psi4_calc_4th_bc_group
+SCHEDULE WeylScal4_psi4_calc_4th_SelectBCs IN WeylScal4_psi4_calc_4th_bc_group
 {
   LANG: C
-  OPTIONS: level
+  OPTIONS: global
   SYNC: Psi4i_group
   SYNC: Psi4r_group
-} "WeylScal4_psi4_calc_4th_SelectBCs"
+} "Sync psi4"