From ff9bda189bd5095855f01bedd53fefe77b19d429 Mon Sep 17 00:00:00 2001 From: goodale Date: Tue, 14 Sep 1999 09:27:54 +0000 Subject: Changed CCTKi_rfrTraverse to CCTK_rfrTraverse, as it needs to be callable from drivers. Tom git-svn-id: http://svn.cactuscode.org/flesh/trunk@907 17b73243-c579-4c4c-a9d2-2d5706c11dac --- src/include/cctk_GHExtensions.h | 2 +- src/include/rfrInterface.h | 2 +- src/main/CactusDefaultEvolve.c | 16 ++++++++-------- src/main/CactusDefaultInitialise.c | 14 +++++++------- src/main/GHExtensions.c | 4 ++-- src/main/rfrInterface.c | 6 +++--- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/include/cctk_GHExtensions.h b/src/include/cctk_GHExtensions.h index ff4d086b..99569477 100644 --- a/src/include/cctk_GHExtensions.h +++ b/src/include/cctk_GHExtensions.h @@ -30,7 +30,7 @@ int CCTKi_SetupGHExtensions(tFleshConfig *config, int CCTKi_InitGHExtensions(cGH *GH); -int CCTKi_rfrTraverseGHExtensions(cGH *GH, int rfrpoint); +int CCTK_rfrTraverseGHExtensions(cGH *GH, int rfrpoint); int CCTK_GHExtensionHandle(const char *name); diff --git a/src/include/rfrInterface.h b/src/include/rfrInterface.h index 19d62e26..23918b31 100644 --- a/src/include/rfrInterface.h +++ b/src/include/rfrInterface.h @@ -16,7 +16,7 @@ extern "C" { #endif -int CCTKi_rfrTraverse(cGH *GH, int rfrpoint); +int CCTK_rfrTraverse(cGH *GH, int rfrpoint); int CCTKi_rfrPrintTree(cGH *GH,void *rfr_top); int CCTKi_rfrStorageOn(void *GH, int group); int CCTKi_rfrStorageOff(void *GH, int group); diff --git a/src/main/CactusDefaultEvolve.c b/src/main/CactusDefaultEvolve.c index 61991134..b454a195 100644 --- a/src/main/CactusDefaultEvolve.c +++ b/src/main/CactusDefaultEvolve.c @@ -88,7 +88,7 @@ int CactusDefaultEvolve(tFleshConfig *config) /*** an rfrTraverse with CCTK_ANALYSIS ***/ ForallConvLevels(iteration, convergence_level) { - CCTKi_rfrTraverse(config->GH[convergence_level],CCTK_ANALYSIS); + CCTK_rfrTraverse(config->GH[convergence_level],CCTK_ANALYSIS); CCTK_OutputGH(config->GH[convergence_level]); } EndForallConvLevels; @@ -133,7 +133,7 @@ int CactusDefaultEvolve(tFleshConfig *config) /* Dump out checkpoint data on all levels */ ForallConvLevels(iteration, convergence_level) { - CCTKi_rfrTraverse(config->GH[convergence_level],CCTK_CHECKPOINT); + CCTK_rfrTraverse(config->GH[convergence_level],CCTK_CHECKPOINT); } EndForallConvLevels; @@ -144,7 +144,7 @@ int CactusDefaultEvolve(tFleshConfig *config) /*** an rfrTraverse with CCTK_ANALYSIS ***/ ForallConvLevels(iteration, convergence_level) { - CCTKi_rfrTraverse(config->GH[convergence_level],CCTK_ANALYSIS); + CCTK_rfrTraverse(config->GH[convergence_level],CCTK_ANALYSIS); CCTK_OutputGH(config->GH[convergence_level]); } EndForallConvLevels; @@ -247,7 +247,7 @@ void PreStepper(cGH *GH) { int Rstep; /* Call the rfr with CCTK_PRESTEP */ - CCTKi_rfrTraverse(GH, CCTK_PRESTEP); + CCTK_rfrTraverse(GH, CCTK_PRESTEP); } /*@@ @routine EvolStepper @@ -267,7 +267,7 @@ void EvolStepper(cGH *GH) { /* Call the rfr with Evolution */ - CCTKi_rfrTraverse(GH, CCTK_EVOL); + CCTK_rfrTraverse(GH, CCTK_EVOL); /* after Evolution check for NANs */ } @@ -289,7 +289,7 @@ void EvolStepper(cGH *GH) @@*/ void BoundStepper(cGH *GH) { - CCTKi_rfrTraverse(GH,CCTK_BOUND); + CCTK_rfrTraverse(GH,CCTK_BOUND); } /*@@ @@ -309,7 +309,7 @@ void BoundStepper(cGH *GH) { void PostStepper(cGH *GH) { int Rstep; /* Call the rfr with post step */ - CCTKi_rfrTraverse(GH, CCTK_POSTSTEP); + CCTK_rfrTraverse(GH, CCTK_POSTSTEP); } /*@@ @routine TerminationStepper @@ -349,5 +349,5 @@ void TerminationStepper(cGH *GH) { cactus_terminate=TERMINATION_RAISED_BRDCAST; printf("RECEIVED GLOBAL TERMINATION SIGNAL \n"); } - CCTKi_rfrTraverse(GH,CCTK_TERMINATE); + CCTK_rfrTraverse(GH,CCTK_TERMINATE); } diff --git a/src/main/CactusDefaultInitialise.c b/src/main/CactusDefaultInitialise.c index 3d24c8b4..854e3697 100644 --- a/src/main/CactusDefaultInitialise.c +++ b/src/main/CactusDefaultInitialise.c @@ -140,23 +140,23 @@ int CactusInitialiseGH(cGH *GH) /* Do various rfr traversals. Will tidy up later. */ /* FIXME : PARAM_CHECK SHOULD BE BEFORE HERE */ - CCTKi_rfrTraverse(GH, CCTK_PARAMCHECK); + CCTK_rfrTraverse(GH, CCTK_PARAMCHECK); CCTKi_FinaliseParamWarn(); - CCTKi_rfrTraverse(GH, CCTK_BASEGRID); + CCTK_rfrTraverse(GH, CCTK_BASEGRID); /* Traverse routines setting up initial data */ - CCTKi_rfrTraverse(GH,CCTK_INITIAL); + CCTK_rfrTraverse(GH,CCTK_INITIAL); /* Traverse poststep initial routines which should only be done once */ - CCTKi_rfrTraverse(GH,CCTK_POSTINITIAL); + CCTK_rfrTraverse(GH,CCTK_POSTINITIAL); /* Ignore checkpointing for now. - * CCTKi_rfrTraverse(GH,CCTK_RECOVER); - * CCTKi_rfrTraverse(GH,CCTK_CPINITIAL); + * CCTK_rfrTraverse(GH,CCTK_RECOVER); + * CCTK_rfrTraverse(GH,CCTK_CPINITIAL); */ - CCTKi_rfrTraverse(GH,CCTK_POSTSTEP); + CCTK_rfrTraverse(GH,CCTK_POSTSTEP); #endif diff --git a/src/main/GHExtensions.c b/src/main/GHExtensions.c index 4428ec9f..7285926d 100644 --- a/src/main/GHExtensions.c +++ b/src/main/GHExtensions.c @@ -323,7 +323,7 @@ int CCTKi_InitGHExtensions(cGH *GH) /*@@ - @routine CCTKi_rfrTraverseGHExtensions + @routine CCTK_rfrTraverseGHExtensions @date Wed Feb 3 14:16:17 1999 @author Tom Goodale @desc @@ -336,7 +336,7 @@ int CCTKi_InitGHExtensions(cGH *GH) @endhistory @@*/ -int CCTKi_rfrTraverseGHExtensions(cGH *GH, int rfrpoint) +int CCTK_rfrTraverseGHExtensions(cGH *GH, int rfrpoint) { int handle; struct GHExtension *extension; diff --git a/src/main/rfrInterface.c b/src/main/rfrInterface.c index 8f70b1ca..1c8a05a0 100644 --- a/src/main/rfrInterface.c +++ b/src/main/rfrInterface.c @@ -26,7 +26,7 @@ static char *rcsid = "$Header$"; /*@@ - @routine CCTKi_rfrTraverse + @routine CCTK_rfrTraverse @date Wed Feb 3 14:45:57 1999 @author Tom Goodale @desc @@ -39,10 +39,10 @@ static char *rcsid = "$Header$"; @endhistory @@*/ -int CCTKi_rfrTraverse(cGH *GH, int rfrpoint) +int CCTK_rfrTraverse(cGH *GH, int rfrpoint) { - CCTKi_rfrTraverseGHExtensions(GH, rfrpoint); + CCTK_rfrTraverseGHExtensions(GH, rfrpoint); return 0; } -- cgit v1.2.3