diff options
| author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-06-01 15:13:58 +0000 |
|---|---|---|
| committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 1999-06-01 15:13:58 +0000 |
| commit | 4a2f8a2b44f74e5108818d70f071b6341b8dea62 (patch) | |
| tree | c3e6c384e7c3f24ef2913400919d8535af604d03 /src/main | |
| parent | 44484a6f3f722cca2883b9285568ad0e5b894867 (diff) | |
Mainly changes to include missing header files so that there are less
warnings when all warnings switched on (also better style 8-).
Tom
git-svn-id: http://svn.cactuscode.org/flesh/trunk@542 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/CactusDefaultEvolve.c | 13 | ||||
| -rw-r--r-- | src/main/CactusDefaultInitialise.c | 14 | ||||
| -rw-r--r-- | src/main/rfrInterface.c | 4 |
3 files changed, 24 insertions, 7 deletions
diff --git a/src/main/CactusDefaultEvolve.c b/src/main/CactusDefaultEvolve.c index 0e41b4ce..e2411fe1 100644 --- a/src/main/CactusDefaultEvolve.c +++ b/src/main/CactusDefaultEvolve.c @@ -15,6 +15,8 @@ #include "cctk.h" #include "declare_parameters.h" #include "rfr_constants.h" +#include "rfrInterface.h" + #include "CactusIOFunctions.h" static char *rcsid="$Id$"; @@ -42,6 +44,10 @@ static char *rcsid="$Id$"; int cactus_terminate; static int cactus_terminate_global = 0; #define TERMINATION_RAISED_BRDCAST 4 + +/* Local function prototypes. */ + +int CCTK_StepGH(cGH *GH); /*@@ @@ -145,7 +151,7 @@ int CactusDefaultEvolve(tFleshConfig *config) CactusStopTimer(config->timer[OUTPUT]); -#ifdef 0 +#if 0 ConvergenceReport(config->GH, iteration); TerminationStepper(config->GH[0]); @@ -182,7 +188,8 @@ int CactusDefaultEvolve(tFleshConfig *config) @calledby main @@*/ -int CCTK_StepGH(cGH *GH) { +int CCTK_StepGH(cGH *GH) +{ void PreStepper(cGH *GH); void EvolStepper(cGH *GH); @@ -331,7 +338,7 @@ void TerminationStepper(cGH *GH) { int cactus_terminate_global; cactus_terminate_global=cactus_terminate; -#ifdef 0 +#if 0 #ifdef MPI MPI_Allreduce(&cactus_terminate,&cactus_terminate_global,1, MPI_INT,MPI_LOR,GH->PUGH_COMM_WORLD); diff --git a/src/main/CactusDefaultInitialise.c b/src/main/CactusDefaultInitialise.c index 9f65fb86..710808f8 100644 --- a/src/main/CactusDefaultInitialise.c +++ b/src/main/CactusDefaultInitialise.c @@ -15,13 +15,19 @@ #include "flesh.h" #include "CactusMainDefaults.h" #include "CactusCommFunctions.h" -#include "parameters.h" +#include "GHExtensions.h" #include "rfr_constants.h" #include "CactusrfrInterface.h" +#include "CCTK_Bindings.h" +#include "rfrInterface.h" + #include "declare_parameters.h" static char *rcsid = "$Id$"; +/* Local function prototypes */ +int CactusInitialiseGH(cGH *GH); + /*@@ @routine CactusDefaultInitialise @@ -53,7 +59,7 @@ int CactusDefaultInitialise(tFleshConfig *config) { CCTK_AddGH(config, convergence_level, GH); - Cactus_InitialiseGH(GH); + CactusInitialiseGH(GH); convergence_level++; }; @@ -65,7 +71,7 @@ int CactusDefaultInitialise(tFleshConfig *config) /*@@ - @routine Cactus_InitialiseGH + @routine CactusInitialiseGH @date Mon Feb 1 12:13:09 1999 @author Tom Goodale @desc @@ -78,7 +84,7 @@ int CactusDefaultInitialise(tFleshConfig *config) @endhistory @@*/ -int Cactus_InitialiseGH(cGH *GH) +int CactusInitialiseGH(cGH *GH) { DECLARE_PARAMETERS diff --git a/src/main/rfrInterface.c b/src/main/rfrInterface.c index e45df32d..64d90512 100644 --- a/src/main/rfrInterface.c +++ b/src/main/rfrInterface.c @@ -9,6 +9,9 @@ /*#define RFRDEBUG*/ +#include <stdio.h> +#include <stdlib.h> + #include "flesh.h" #include "GHExtensions.h" #include "Groups.h" @@ -17,6 +20,7 @@ #include "CactusCommFunctions.h" #include "IOMethods.h" #include "declare_parameters.h" +#include "rfrInterface.h" static char *rcsid = "$Header$"; |