summaryrefslogtreecommitdiff
path: root/src/main/CactusDefaultEvolve.c
diff options
context:
space:
mode:
authorallen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac>2001-02-24 14:31:06 +0000
committerallen <allen@17b73243-c579-4c4c-a9d2-2d5706c11dac>2001-02-24 14:31:06 +0000
commit167e1d2fdbb38cf7976973bff78543d5397836ea (patch)
treeb0d71f833f4441326a57e27719476a184d79a360 /src/main/CactusDefaultEvolve.c
parent9d229e556c2d00dd0fa862b9eeb8915918f0be83 (diff)
Fixing warnings
git-svn-id: http://svn.cactuscode.org/flesh/trunk@2049 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src/main/CactusDefaultEvolve.c')
-rw-r--r--src/main/CactusDefaultEvolve.c31
1 files changed, 27 insertions, 4 deletions
diff --git a/src/main/CactusDefaultEvolve.c b/src/main/CactusDefaultEvolve.c
index 0493191a..89ab45b8 100644
--- a/src/main/CactusDefaultEvolve.c
+++ b/src/main/CactusDefaultEvolve.c
@@ -25,6 +25,8 @@ CCTK_FILEVERSION(main_CactusDefaultEvolve_c)
/* Define some macros for convenience. */
+#define TERMINATION_RAISED_BRDCAST 4
+
#define ForallConvLevels(iteration, conv_level) { \
int factor = 1; \
for(conv_level = 0 ; \
@@ -42,15 +44,36 @@ CCTK_FILEVERSION(main_CactusDefaultEvolve_c)
int cactus_terminate;
+
+/********************************************************************
+ ********************* Local Data Types ***********************
+ ********************************************************************/
+
+/********************************************************************
+ ********************* Local Data *****************************
+ ********************************************************************/
+
+
static int cactus_terminate_global = 0;
-#define TERMINATION_RAISED_BRDCAST 4
+/********************************************************************
+ ********************* Local Routine Prototypes *********************
+ ********************************************************************/
-/* Local function prototypes. */
static int DoneMainLoop (CCTK_REAL cctk_time, int iteration);
static int StepGH(cGH *GH);
+int CactusDefaultEvolve(tFleshConfig *config);
+void TerminationStepper(cGH *GH) ;
+/********************************************************************
+ ********************* External Routines **********************
+ ********************************************************************/
+
+/********************************************************************
+ ********************* Local Routines *************************
+ ********************************************************************/
+
/*@@
@routine CactusDefaultEvolve
@date Thu Oct 8 17:30:15 1998
@@ -68,8 +91,8 @@ static int StepGH(cGH *GH);
@@*/
int CactusDefaultEvolve(tFleshConfig *config)
{
- int convergence_level;
- int iteration;
+ unsigned int convergence_level;
+ unsigned int iteration;
iteration = CCTK_MainLoopIndex();