summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac>2001-12-17 22:31:27 +0000
committertradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac>2001-12-17 22:31:27 +0000
commitd09158cc4cd54adf0eb75e998b398610070d9687 (patch)
tree51676ddbcd4cdad381ec46e64619609cd9dbaa9f
parentee9db711399c584116385e5798dc1ca38e8f81f6 (diff)
Moved the very first CCTK_POSTSTEP schedule bin before CCTK_RECOVER_VARIABLES.
Now POSTSTEP routines aren't run anymore twice on the same timestep after recovery. Closes PR Cactus-824 and Cactus-826. git-svn-id: http://svn.cactuscode.org/flesh/trunk@2512 17b73243-c579-4c4c-a9d2-2d5706c11dac
-rw-r--r--src/main/CactusDefaultInitialise.c4
-rw-r--r--src/main/ScheduleInterface.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/CactusDefaultInitialise.c b/src/main/CactusDefaultInitialise.c
index 34fdbec6..0306e84d 100644
--- a/src/main/CactusDefaultInitialise.c
+++ b/src/main/CactusDefaultInitialise.c
@@ -130,12 +130,12 @@ int CactusInitialiseGH(cGH *GH)
/* Traverse poststep initial routines which should only be done once */
CCTK_Traverse(GH, "CCTK_POSTINITIAL");
+ CCTK_Traverse(GH, "CCTK_POSTSTEP");
+
/* Traverse recovery and ID checkpoint routines */
CCTK_Traverse(GH, "CCTK_RECOVER_VARIABLES");
CCTK_Traverse(GH, "CCTK_CPINITIAL");
- CCTK_Traverse(GH, "CCTK_POSTSTEP");
-
return 1;
}
diff --git a/src/main/ScheduleInterface.c b/src/main/ScheduleInterface.c
index 7ced93ad..b0c4ae79 100644
--- a/src/main/ScheduleInterface.c
+++ b/src/main/ScheduleInterface.c
@@ -822,6 +822,9 @@ int CCTK_SchedulePrint(const char *where)
SchedulePrint("CCTK_POSTINITIAL$ENTRY");
SchedulePrint("CCTK_POSTINITIAL");
SchedulePrint("CCTK_POSTINITIAL$EXIT");
+ SchedulePrint("CCTK_POSTSTEP$ENTRY");
+ SchedulePrint("CCTK_POSTSTEP");
+ SchedulePrint("CCTK_POSTSTEP$EXIT");
printf (" if (recover)\n");
indent_level +=2;
SchedulePrint("CCTK_RECOVER_VARIABLES");
@@ -832,9 +835,6 @@ int CCTK_SchedulePrint(const char *where)
SchedulePrint("CCTK_CPINITIAL");
indent_level -=2;
printf (" endif\n");
- SchedulePrint("CCTK_POSTSTEP$ENTRY");
- SchedulePrint("CCTK_POSTSTEP");
- SchedulePrint("CCTK_POSTSTEP$EXIT");
printf (" if (analysis)\n");
indent_level +=2;
SchedulePrint("CCTK_ANALYSIS$ENTRY");