Put #define 0 around various bits which weren't compiling.

The code will now compile, but core dumps.

Tom


git-svn-id: http://svn.cactuscode.org/flesh/trunk@39 17b73243-c579-4c4c-a9d2-2d5706c11dac

5 files changed, 25 insertions, 8 deletions

diff --git a/src/comm/CactusDefaultComm.c b/src/comm/CactusDefaultComm.c
index 862faaff..cd295f7f 100644
--- a/src/comm/CactusDefaultComm.c
+++ b/src/comm/CactusDefaultComm.c
@@ -19,7 +19,10 @@ static char *rcsid = "$Id$";
 
 cGH *CactusDefaultSetupGH(tFleshConfig *config, int convergence_level)
 {
+
   cGH *thisGH;
+
+#ifdef 0
   
   cGFconfig *GF;
   
@@ -31,7 +34,7 @@ cGH *CactusDefaultSetupGH(tFleshConfig *config, int convergence_level)
 
   if(thisGH)
   {
-    /* Traverse list of GH setup rroutines. */
+    /* Traverse list of GH setup routines. */
     CactusSetupGHTraverse(config, convergence_level, thisGH);
 
     /* Setup GFs */
@@ -48,11 +51,11 @@ cGH *CactusDefaultSetupGH(tFleshConfig *config, int convergence_level)
       }
     }
 
+#endif
   return thisGH;
 }
 
-
-cGF *CactusDefaultSetupGF(cGH *GH, cGFconfig *configdata)
+cGF *CactusDefaultSetupGF(cGH *GH, cGF *configdata)
 {
   
   printf("I'm at line %d of file %s\n", __LINE__, __FILE__);
diff --git a/src/comm/RegisterCommFunction.c b/src/comm/RegisterCommFunction.c
index 47b25b6b..e17d4be7 100644
--- a/src/comm/RegisterCommFunction.c
+++ b/src/comm/RegisterCommFunction.c
@@ -23,7 +23,7 @@ static char *rcsid = "$Id$";
 
 /* The functions. */
 
-int (*SetupGH)(cGH *);
+cGH * (*SetupGH)(tFleshConfig *, int);
 int (*SetupGF)(cGH *, cGF *);
 
 int (*SyncAllFuncs)(cGH *);
@@ -100,7 +100,7 @@ int SetupCommFunctions(void)
   
   if(functions&&functions[0])
   {
-    SetupGH = (int (*)(cGH *))functions[0];
+    SetupGH = (cGH * (*)(tFleshConfig *, int))functions[0];
   }
   else
   {
diff --git a/src/include/flesh.h b/src/include/flesh.h
index b8bdc6c6..b8496587 100644
--- a/src/include/flesh.h
+++ b/src/include/flesh.h
@@ -40,7 +40,7 @@ typedef struct
   cGH **GH;
   unsigned int nGHs;
 
-  cTimers *timer[3];
+  cTimer *timer[3];
 } tFleshConfig;
 
 
diff --git a/src/main/CactusDefaultEvolve.c b/src/main/CactusDefaultEvolve.c
index 4b053089..b2629d32 100644
--- a/src/main/CactusDefaultEvolve.c
+++ b/src/main/CactusDefaultEvolve.c
@@ -59,7 +59,10 @@ int CactusDefaultEvolve(tFleshConfig *config)
 
   CactusStartTimer(config->timer[EVOLUTION]);
 
+#ifdef 0
   InfoHeader(config);
+ #endif
+
   while (iteration<itlast) 
   {
     iteration++;
@@ -69,15 +72,19 @@ int CactusDefaultEvolve(tFleshConfig *config)
 
     ForallConvLevels(iteration, convergence_level)
       {
+#ifdef 0
 	StepGH(config->GH[convergence_level]);
 	InfoOutput(config->GH[convergence_level], convergence_level);
+#endif
       }
     EndForallConvLevels;
   
     /* Dump out checkpoint data on all levels */
     ForallConvLevels(iteration, convergence_level)
       {
+#ifdef 0
 	rfrTraverse(config->GH[convergence_level],CACTUS_CHECKPOINT);
+#endif
       }
     EndForallConvLevels;
 
@@ -88,15 +95,20 @@ int CactusDefaultEvolve(tFleshConfig *config)
     /*** an rfrTraverse with CACTUS_ANALYSIS      ***/
     ForallConvLevels(iteration, convergence_level)
       {
+#ifdef 0
 	outputGH(config->GH[convergence_level]);
+#endif
       }
     EndForallConvLevels;
       
     CactusStopTimer(config->timer[OUTPUT]);
 
+#ifdef 0
     ConvergenceReport(config->GH, iteration);
 
     TerminationStepper(config->GH[0]);
+
+#endif
     /* Termination has been raised and broadcasted, exit loop*/
     if (cactus_terminate==TERMINATION_RAISED_BRDCAST) break;
 
diff --git a/src/main/CactusDefaultInitialise.c b/src/main/CactusDefaultInitialise.c
index f7efd54a..c87204cb 100644
--- a/src/main/CactusDefaultInitialise.c
+++ b/src/main/CactusDefaultInitialise.c
@@ -20,7 +20,7 @@ static char *rcsid = "$Id$";
 
 int CactusDefaultInitialise(tFleshConfig *config)
 {
-  cGH *newGH;
+  cGH *GH;
   int convergence_level;
 
   CactusStartTimer(config->timer[INITIALISATION]);
@@ -30,12 +30,14 @@ int CactusDefaultInitialise(tFleshConfig *config)
   convergence_level = 0;
   while((GH = SetupGH(config, convergence_level)))
   {
+#ifdef 0
     CactusAddGH(config, GH, convergence_level);
+#endif
     Initialise(GH);
     convergence_level++;
   };
 
-  CactusStopTimer(config->timer, INITIALISATION);
+  CactusStopTimer(config->timer[INITIALISATION]);
   
   return 0;
 }