1 files changed, 16 insertions, 33 deletions
diff --git a/schedule.ccl b/schedule.ccl
index d6c38b3..e743105 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -1,39 +1,22 @@
 # Schedule definitions for thorn NullSurf
 #
-SCHEDULE ns_initial IN ADMBase_InitialData {
-    LANG: C
-} "NullSurf initial data"
 
-SCHEDULE ns_eval_rhs IN MoL_CalcRHS {
-    LANG: C
-    READS: ML_BSSN::alpha(Interior)
-    READS: ML_BSSN::phi(Interior)
-    READS: ML_BSSN::gt11(Interior)
-    READS: ML_BSSN::gt12(Interior)
-    READS: ML_BSSN::gt13(Interior)
-    READS: ML_BSSN::gt22(Interior)
-    READS: ML_BSSN::gt23(Interior)
-    READS: ML_BSSN::gt33(Interior)
-    READS: ML_BSSN::beta1(Interior)
-    READS: ML_BSSN::beta2(Interior)
-    READS: ML_BSSN::beta3(Interior)
-    WRITES: NullSurf::F(Interior)
-} "NullSurf eval RHS"
+if (nb_surfaces > 0) {
+    SCHEDULE ns_evol IN CCTK_ANALYSIS {
+        LANG: C
+    } "NullSurf eval RHS"
 
-SCHEDULE ns_mol_register in MoL_Register {
-    LANG: C
-} "NullSurf register MoL variables"
+    SCHEDULE ns_evol_init IN CCTK_BASEGRID AFTER TemporalSpacings {
+        LANG: C
+    } ""
 
-SCHEDULE ns_register_symmetries in SymmetryRegister {
-    LANG: C
-} "NullSurf register symmetry properties"
+    SCHEDULE ns_init IN CCTK_INITIAL {
+        LANG: C
+    } ""
 
-schedule ns_select_bc in MoL_PostStep
-{
-  LANG: C
-  OPTIONS: level
-  SYNC: null_surface
-} "select boundary conditions"
-
-STORAGE: null_surface[3]
-STORAGE: null_surface_rhs[3]
+    STORAGE: photon_coord
+    STORAGE: photon_rhs
+    STORAGE: photon_times
+    STORAGE: evol_next_step
+    STORAGE: surfaces_active
+}