Output all preregrid and postregrid bins in the schedule, and indicate

when the grid hierarchy is changed


git-svn-id: http://svn.cactuscode.org/flesh/trunk@4468 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 34 insertions, 8 deletions

diff --git a/src/main/ScheduleInterface.c b/src/main/ScheduleInterface.c
index 05818db9..1d5f536e 100644
--- a/src/main/ScheduleInterface.c
+++ b/src/main/ScheduleInterface.c
@@ -871,7 +871,7 @@ int CCTK_SchedulePrint(const char *where)
     puts ("    [CCTK_STARTUP]");
     SchedulePrint("CCTK_STARTUP");
     putchar ('\n');
-    puts ("  Startup routines which need an existing GH");
+    puts ("  Startup routines which need an existing grid hierarchy");
     puts ("    [CCTK_WRAGH]");
     SchedulePrint("CCTK_WRAGH");
     puts ("  Parameter checking routines");
@@ -879,6 +879,15 @@ int CCTK_SchedulePrint(const char *where)
     SchedulePrint("CCTK_PARAMCHECK");
     putchar ('\n');
     puts ("  Initialisation");
+    puts ("    [CCTK_PREREGRIDINITIAL]");
+    SchedulePrint("CCTK_PREREGRIDINITIAL$ENTRY");
+    SchedulePrint("CCTK_PREREGRIDINITIAL");
+    SchedulePrint("CCTK_PREREGRIDINITIAL$EXIT");
+    puts ("    Set up grid hierarchy");
+    puts ("    [CCTK_POSTREGRIDINITIAL]");
+    SchedulePrint("CCTK_POSTREGRIDINITIAL$ENTRY");
+    SchedulePrint("CCTK_POSTREGRIDINITIAL");
+    SchedulePrint("CCTK_POSTREGRIDINITIAL$EXIT");
     puts ("    [CCTK_BASEGRID]");
     SchedulePrint("CCTK_BASEGRID$ENTRY");
     SchedulePrint("CCTK_BASEGRID");
@@ -889,6 +898,12 @@ int CCTK_SchedulePrint(const char *where)
     SchedulePrint("CCTK_INITIAL$ENTRY");
     SchedulePrint("CCTK_INITIAL");
     SchedulePrint("CCTK_INITIAL$EXIT");
+    puts ("      Initialise finer grids recursively");
+    puts ("      Restrict from finer grids");
+    puts ("      [CCTK_POSTRESTRICTINITIAL]");
+    SchedulePrint("CCTK_POSTRESTRICTINITIAL$ENTRY");
+    SchedulePrint("CCTK_POSTRESTRICTINITIAL");
+    SchedulePrint("CCTK_POSTRESTRICTINITIAL$EXIT");
     puts ("      [CCTK_POSTINITIAL]");
     SchedulePrint("CCTK_POSTINITIAL$ENTRY");
     SchedulePrint("CCTK_POSTINITIAL");
@@ -915,11 +930,20 @@ int CCTK_SchedulePrint(const char *where)
     SchedulePrint("CCTK_ANALYSIS$EXIT");
     indent_level -=2;
     puts ("    endif");
-    puts ("    Do periodic output of grid variables");
+    puts ("    Output of grid variables");
     putchar ('\n');
     puts ("  do loop over timesteps");
+    puts ("    [CCTK_PREREGRID]");
+    SchedulePrint("CCTK_PREREGRID$ENTRY");
+    SchedulePrint("CCTK_PREREGRID");
+    SchedulePrint("CCTK_PREREGRID$EXIT");
+    puts ("    Change grid hierarchy");
+    puts ("    [CCTK_POSTREGRID]");
+    SchedulePrint("CCTK_POSTREGRID$ENTRY");
+    SchedulePrint("CCTK_POSTREGRID");
+    SchedulePrint("CCTK_POSTREGRID$EXIT");
     puts ("    Rotate timelevels");
-    puts ("    iteration = iteration + 1");
+    puts ("    iteration = iteration+1");
     puts ("    t = t+dt");
     puts ("    [CCTK_PRESTEP]");
     SchedulePrint("CCTK_PRESTEP$ENTRY");
@@ -929,6 +953,12 @@ int CCTK_SchedulePrint(const char *where)
     SchedulePrint("CCTK_EVOL$ENTRY");
     SchedulePrint("CCTK_EVOL");
     SchedulePrint("CCTK_EVOL$EXIT");
+    puts ("      Evolve finer grids recursively");
+    puts ("      Restrict from finer grids");
+    puts ("      [CCTK_POSTRESTRICT]");
+    SchedulePrint("CCTK_POSTRESTRICT$ENTRY");
+    SchedulePrint("CCTK_POSTRESTRICT");
+    SchedulePrint("CCTK_POSTRESTRICT$EXIT");
     puts ("    [CCTK_POSTSTEP]");
     SchedulePrint("CCTK_POSTSTEP$ENTRY");
     SchedulePrint("CCTK_POSTSTEP");
@@ -945,7 +975,7 @@ int CCTK_SchedulePrint(const char *where)
     SchedulePrint("CCTK_ANALYSIS$EXIT");
     indent_level -=2;
     puts ("    endif");
-    puts ("    Do periodic output of grid variables");
+    puts ("    Output of grid variables");
     puts ("  enddo");
     putchar ('\n');
     puts ("  Termination routines");
@@ -956,10 +986,6 @@ int CCTK_SchedulePrint(const char *where)
     puts ("    [CCTK_SHUTDOWN]");
     SchedulePrint("CCTK_SHUTDOWN");
     putchar ('\n');
-    puts ("  Routines run after restricting:");
-    puts ("    [CCTK_POSTRESTRICT]");
-    SchedulePrint("CCTK_POSTRESTRICT");
-    putchar ('\n');
     puts ("  Routines run after changing the grid hierarchy:");
     puts ("    [CCTK_POSTREGRID]");
     SchedulePrint("CCTK_POSTREGRID");