1 files changed, 25 insertions, 9 deletions
diff --git a/schedule.ccl b/schedule.ccl
index d648d79..2b2c5eb 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -1,21 +1,37 @@
 # Schedule definitions for thorn AHFinderDirect
 # $Header$
 
-#
-# FIXME:
-# we'd like to schedule at ANALYSIS, but that doesn't get run unless
-# some trigger variable is being output at this time step
-# ==> quick-n-dirty hack for now: just schedule at POSTINITIAL
-#
-
 ##schedule test_patch_system at CCTK_POSTINITIAL
 ##{
 ##LANG: C
 ##OPTIONS: global
 ##} "test driver to verify that src/util/ and src/jtutil/ code works properly"
 
-schedule AHFinderDirect_driver at CCTK_POSTINITIAL
+schedule AHFinderDirect_setup at CCTK_BASEGRID after SpatialCoordinates
+{
+lang: C
+options: global
+} "setup data structures"
+
+schedule AHFinderDirect_initial_guess at CCTK_INITIAL
 {
 lang: C
 options: global
-} "find apparent horizon(s)"
+} "set initial guess"
+
+if (find_AHs_at_postinitial != 0)
+    {
+	schedule AHFinderDirect_find_horizons at CCTK_POSTINITIAL
+	{
+	lang: C
+	options: global
+	} "find apparent horizon(s) in initial data"
+    }
+if (find_AHs_at_poststep != 0)
+    {
+	schedule AHFinderDirect_find_horizons at CCTK_POSTSTEP
+	{
+	lang: C
+	options: global
+	} "find apparent horizon(s) after this time step"
+    }