From f01cb2c10a3ab8d41a83a360dc58f95f8508c0a7 Mon Sep 17 00:00:00 2001 From: knarf Date: Thu, 3 Jun 2010 20:25:17 +0000 Subject: reorganizes the printout of the scheduling tree Cactus does at startup a bit, fixing also some indentation problems. git-svn-id: http://svn.cactuscode.org/flesh/trunk@4620 17b73243-c579-4c4c-a9d2-2d5706c11dac --- src/main/ScheduleInterface.c | 130 +++++++++++++++++++++---------------------- 1 file changed, 65 insertions(+), 65 deletions(-) (limited to 'src') diff --git a/src/main/ScheduleInterface.c b/src/main/ScheduleInterface.c index c6074775..88506e6e 100644 --- a/src/main/ScheduleInterface.c +++ b/src/main/ScheduleInterface.c @@ -895,143 +895,143 @@ int CCTKi_ScheduleGHInit(void *GH) 0 - success @endreturndesc @@*/ +#define PUTS(x) printf("%*s%s\n", indent_level, "", x) int CCTK_SchedulePrint(const char *where) { if(!where) { - puts (" if (recover initial data)"); - puts (" Recover parameters"); - puts (" endif"); + indent_level = 2; + PUTS("if (recover initial data)"); + PUTS(" Recover parameters"); + PUTS("endif"); putchar ('\n'); - puts (" Startup routines"); - puts (" [CCTK_STARTUP]"); + PUTS("Startup routines"); + PUTS(" [CCTK_STARTUP]"); SchedulePrint("CCTK_STARTUP"); putchar ('\n'); - puts (" Startup routines which need an existing grid hierarchy"); - puts (" [CCTK_WRAGH]"); + PUTS("Startup routines which need an existing grid hierarchy"); + PUTS(" [CCTK_WRAGH]"); SchedulePrint("CCTK_WRAGH"); - puts (" Parameter checking routines"); - puts (" [CCTK_PARAMCHECK]"); + PUTS("Parameter checking routines"); + PUTS(" [CCTK_PARAMCHECK]"); SchedulePrint("CCTK_PARAMCHECK"); putchar ('\n'); - puts (" Initialisation"); - puts (" if (NOT (recover initial data AND recovery_mode is 'strict'))"); - indent_level +=2; - puts (" [CCTK_PREREGRIDINITIAL]"); + PUTS("Initialisation"); + PUTS(" if (NOT (recover initial data AND recovery_mode is 'strict'))"); + indent_level += 2; + PUTS(" [CCTK_PREREGRIDINITIAL]"); SchedulePrint("CCTK_PREREGRIDINITIAL$ENTRY"); SchedulePrint("CCTK_PREREGRIDINITIAL"); SchedulePrint("CCTK_PREREGRIDINITIAL$EXIT"); - puts (" Set up grid hierarchy"); - puts (" [CCTK_POSTREGRIDINITIAL]"); + PUTS(" Set up grid hierarchy"); + PUTS(" [CCTK_POSTREGRIDINITIAL]"); SchedulePrint("CCTK_POSTREGRIDINITIAL$ENTRY"); SchedulePrint("CCTK_POSTREGRIDINITIAL"); SchedulePrint("CCTK_POSTREGRIDINITIAL$EXIT"); - puts (" [CCTK_BASEGRID]"); + PUTS(" [CCTK_BASEGRID]"); SchedulePrint("CCTK_BASEGRID$ENTRY"); SchedulePrint("CCTK_BASEGRID"); SchedulePrint("CCTK_BASEGRID$EXIT"); - puts (" [CCTK_INITIAL]"); + PUTS(" [CCTK_INITIAL]"); SchedulePrint("CCTK_INITIAL$ENTRY"); SchedulePrint("CCTK_INITIAL"); SchedulePrint("CCTK_INITIAL$EXIT"); - puts (" [CCTK_POSTINITIAL]"); + PUTS(" [CCTK_POSTINITIAL]"); SchedulePrint("CCTK_POSTINITIAL$ENTRY"); SchedulePrint("CCTK_POSTINITIAL"); SchedulePrint("CCTK_POSTINITIAL$EXIT"); - puts (" Initialise finer grids recursively"); - puts (" Restrict from finer grids"); - puts (" [CCTK_POSTRESTRICTINITIAL]"); + 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_POSTPOSTINITIAL]"); + PUTS(" [CCTK_POSTPOSTINITIAL]"); SchedulePrint("CCTK_POSTPOSTINITIAL$ENTRY"); SchedulePrint("CCTK_POSTPOSTINITIAL"); SchedulePrint("CCTK_POSTPOSTINITIAL$EXIT"); - puts (" [CCTK_POSTSTEP]"); + PUTS(" [CCTK_POSTSTEP]"); SchedulePrint("CCTK_POSTSTEP$ENTRY"); SchedulePrint("CCTK_POSTSTEP"); SchedulePrint("CCTK_POSTSTEP$EXIT"); - puts (" endif"); - puts (" if (recover initial data)"); - puts (" [CCTK_BASEGRID]"); + PUTS("endif"); + PUTS("if (recover initial data)"); + PUTS(" [CCTK_BASEGRID]"); SchedulePrint("CCTK_BASEGRID$ENTRY"); SchedulePrint("CCTK_BASEGRID"); SchedulePrint("CCTK_BASEGRID$EXIT"); - puts (" [CCTK_RECOVER_VARIABLES]"); + PUTS(" [CCTK_RECOVER_VARIABLES]"); SchedulePrint("CCTK_RECOVER_VARIABLES"); - puts (" [CCTK_POST_RECOVER_VARIABLES]"); + PUTS(" [CCTK_POST_RECOVER_VARIABLES]"); SchedulePrint("CCTK_POST_RECOVER_VARIABLES"); - puts (" endif"); - puts (" if (checkpoint initial data)"); - puts (" [CCTK_CPINITIAL]"); + PUTS("endif"); + PUTS("if (checkpoint initial data)"); + PUTS(" [CCTK_CPINITIAL]"); SchedulePrint("CCTK_CPINITIAL"); - puts (" endif"); - puts (" if (analysis)"); - puts (" [CCTK_ANALYSIS]"); + PUTS("endif"); + PUTS("if (analysis)"); + PUTS(" [CCTK_ANALYSIS]"); SchedulePrint("CCTK_ANALYSIS$ENTRY"); SchedulePrint("CCTK_ANALYSIS"); SchedulePrint("CCTK_ANALYSIS$EXIT"); indent_level -=2; - puts (" endif"); - puts (" Output grid variables"); + PUTS("endif"); + PUTS("Output grid variables"); putchar ('\n'); - puts (" do loop over timesteps"); - puts (" [CCTK_PREREGRID]"); + 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]"); + 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 (" t = t+dt"); - puts (" [CCTK_PRESTEP]"); + PUTS(" Rotate timelevels"); + PUTS(" iteration = iteration+1"); + PUTS(" t = t+dt"); + PUTS(" [CCTK_PRESTEP]"); SchedulePrint("CCTK_PRESTEP$ENTRY"); SchedulePrint("CCTK_PRESTEP"); SchedulePrint("CCTK_PRESTEP$EXIT"); - puts (" [CCTK_EVOL]"); + PUTS(" [CCTK_EVOL]"); SchedulePrint("CCTK_EVOL$ENTRY"); SchedulePrint("CCTK_EVOL"); SchedulePrint("CCTK_EVOL$EXIT"); - puts (" Evolve finer grids recursively"); - puts (" Restrict from finer grids"); - puts (" [CCTK_POSTRESTRICT]"); + 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]"); + PUTS(" [CCTK_POSTSTEP]"); SchedulePrint("CCTK_POSTSTEP$ENTRY"); SchedulePrint("CCTK_POSTSTEP"); SchedulePrint("CCTK_POSTSTEP$EXIT"); - puts (" if (checkpoint)"); - indent_level +=2; - puts (" [CCTK_CHECKPOINT]"); + PUTS("if (checkpoint)"); + PUTS(" [CCTK_CHECKPOINT]"); SchedulePrint("CCTK_CHECKPOINT"); - puts (" endif"); - puts (" if (analysis)"); - puts (" [CCTK_ANALYSIS]"); + PUTS("endif"); + PUTS("if (analysis)"); + PUTS(" [CCTK_ANALYSIS]"); SchedulePrint("CCTK_ANALYSIS$ENTRY"); SchedulePrint("CCTK_ANALYSIS"); SchedulePrint("CCTK_ANALYSIS$EXIT"); - indent_level -=2; - puts (" endif"); - puts (" Output grid variables"); - puts (" enddo"); + PUTS("endif"); + PUTS("Output grid variables"); + PUTS("enddo"); putchar ('\n'); - puts (" Termination routines"); - puts (" [CCTK_TERMINATE]"); + PUTS("Termination routines"); + PUTS(" [CCTK_TERMINATE]"); SchedulePrint("CCTK_TERMINATE"); putchar ('\n'); - puts (" Shutdown routines"); - puts (" [CCTK_SHUTDOWN]"); + PUTS("Shutdown routines"); + PUTS(" [CCTK_SHUTDOWN]"); SchedulePrint("CCTK_SHUTDOWN"); putchar ('\n'); - puts (" Routines run after changing the grid hierarchy:"); - puts (" [CCTK_POSTREGRID]"); + PUTS("Routines run after changing the grid hierarchy:"); + PUTS(" [CCTK_POSTREGRID]"); SchedulePrint("CCTK_POSTREGRID"); } else -- cgit v1.2.3