Changed CACTUS to CCTK

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

3 files changed, 56 insertions, 56 deletions

diff --git a/src/include/rfr_constants.h b/src/include/rfr_constants.h
index 1a121183..389f9ca2 100644
--- a/src/include/rfr_constants.h
+++ b/src/include/rfr_constants.h
@@ -10,56 +10,56 @@
 /* $Id$ */
 
 /* Be careful changing ordering. Look at tree in rfrInitialize before you do! */
-#define CACTUS_PARAMCHECK  0
-#define CACTUS_BASEGRID  1
+#define CCTK_PARAMCHECK  0
+#define CCTK_BASEGRID  1
 
-#define CACTUS_RECOVER   5
+#define CCTK_RECOVER   5
 
 /* Be sure to keep the INITIAL*, POSTSTEP*, etc... contiguous */
-#define CACTUS_INITIAL0  10
-#define CACTUS_INITIAL   11
-#define CACTUS_INITIAL2  12
-#define CACTUS_INITIAL3  13
-#define CACTUS_INITIAL4  14
-#define CACTUS_INITIAL5  15
-#define CACTUS_INITIAL6  16
-#define CACTUS_INITIAL7  17
-#define CACTUS_INITIAL8  18
-#define CACTUS_INITIAL9  19
+#define CCTK_INITIAL0  10
+#define CCTK_INITIAL   11
+#define CCTK_INITIAL2  12
+#define CCTK_INITIAL3  13
+#define CCTK_INITIAL4  14
+#define CCTK_INITIAL5  15
+#define CCTK_INITIAL6  16
+#define CCTK_INITIAL7  17
+#define CCTK_INITIAL8  18
+#define CCTK_INITIAL9  19
 
-#define CACTUS_CPINITIAL 25
+#define CCTK_CPINITIAL 25
 
-#define CACTUS_PRESTEP   30
-#define CACTUS_PRESTEP2  31
-#define CACTUS_PRESTEP3  33
-#define CACTUS_PRESTEP4  34
-#define CACTUS_PRESTEP5  35
+#define CCTK_PRESTEP   30
+#define CCTK_PRESTEP2  31
+#define CCTK_PRESTEP3  33
+#define CCTK_PRESTEP4  34
+#define CCTK_PRESTEP5  35
 
 
-#define CACTUS_POSTSTEP   40
-#define CACTUS_POSTSTEP2  41
-#define CACTUS_POSTSTEP3  42
-#define CACTUS_POSTSTEP4  43
-#define CACTUS_POSTSTEP5  44
-#define CACTUS_POSTSTEP6  45
-#define CACTUS_POSTSTEP7  46
-#define CACTUS_POSTSTEP8  47
-#define CACTUS_POSTSTEP9  48
-#define CACTUS_POSTSTEP10 49
+#define CCTK_POSTSTEP   40
+#define CCTK_POSTSTEP2  41
+#define CCTK_POSTSTEP3  42
+#define CCTK_POSTSTEP4  43
+#define CCTK_POSTSTEP5  44
+#define CCTK_POSTSTEP6  45
+#define CCTK_POSTSTEP7  46
+#define CCTK_POSTSTEP8  47
+#define CCTK_POSTSTEP9  48
+#define CCTK_POSTSTEP10 49
 
 
 
-#define CACTUS_EVOL       60
+#define CCTK_EVOL       60
 
-#define CACTUS_BOUND      70
+#define CCTK_BOUND      70
 
-#define CACTUS_CHECKPOINT 75 
+#define CCTK_CHECKPOINT 75 
 
-#define CACTUS_ANALYSIS   80
+#define CCTK_ANALYSIS   80
 
-#define CACTUS_TERMINATE  90
+#define CCTK_TERMINATE  90
 
-#define CACTUS_CONVERGENCE 100
+#define CCTK_CONVERGENCE 100
 
 
 /* This shouldn't be here, but need it externally visable. */
diff --git a/src/main/CactusDefaultEvolve.c b/src/main/CactusDefaultEvolve.c
index d72ec058..bec096f0 100644
--- a/src/main/CactusDefaultEvolve.c
+++ b/src/main/CactusDefaultEvolve.c
@@ -7,7 +7,7 @@
    @enddesc 
  @@*/
 
-#define DEBUG
+/*#define DEBUG*/
 
 #include <stdio.h>
 
@@ -72,10 +72,10 @@ int CactusDefaultEvolve(tFleshConfig *config)
   CactusStartTimer(config->timer[OUTPUT]);
   /*** Call OUTPUT for this GH (this routine    ***/
   /*** checks if output is necessary) and makes ***/
-  /*** an rfrTraverse with CACTUS_ANALYSIS      ***/
+  /*** an rfrTraverse with CCTK_ANALYSIS      ***/
   ForallConvLevels(iteration, convergence_level)
   {
-      CCTK_rfrTraverse(config->GH[convergence_level],CACTUS_ANALYSIS);
+      CCTK_rfrTraverse(config->GH[convergence_level],CCTK_ANALYSIS);
       CCTK_OutputGH(config->GH[convergence_level]);
   }
   EndForallConvLevels;
@@ -116,7 +116,7 @@ int CactusDefaultEvolve(tFleshConfig *config)
     /* Dump out checkpoint data on all levels */
     ForallConvLevels(iteration, convergence_level)
     {
-      CCTK_rfrTraverse(config->GH[convergence_level],CACTUS_CHECKPOINT);
+      CCTK_rfrTraverse(config->GH[convergence_level],CCTK_CHECKPOINT);
     }
     EndForallConvLevels;
 
@@ -124,10 +124,10 @@ int CactusDefaultEvolve(tFleshConfig *config)
     CactusStartTimer(config->timer[OUTPUT]);
     /*** Call OUTPUT for this GH (this routine    ***/
     /*** checks if output is necessary) and makes ***/
-    /*** an rfrTraverse with CACTUS_ANALYSIS      ***/
+    /*** an rfrTraverse with CCTK_ANALYSIS      ***/
     ForallConvLevels(iteration, convergence_level)
     {
-        CCTK_rfrTraverse(config->GH[convergence_level],CACTUS_ANALYSIS);
+        CCTK_rfrTraverse(config->GH[convergence_level],CCTK_ANALYSIS);
 	CCTK_OutputGH(config->GH[convergence_level]);
     }
     EndForallConvLevels;
@@ -205,8 +205,8 @@ int CCTK_StepGH(cGH *GH) {
 void PreStepper(cGH *GH) {
   int Rstep;  
 
-  /* Call the rfr with CACTUS_PRESTEP */
-  for (Rstep = CACTUS_PRESTEP;Rstep <= CACTUS_PRESTEP5; Rstep++)
+  /* Call the rfr with CCTK_PRESTEP */
+  for (Rstep = CCTK_PRESTEP;Rstep <= CCTK_PRESTEP5; Rstep++)
     CCTK_rfrTraverse(GH, Rstep);
 }
  /*@@
@@ -225,7 +225,7 @@ void PreStepper(cGH *GH) {
 
 void EvolStepper(cGH *GH) {
   /* Call the rfr with Evolution */
-  CCTK_rfrTraverse(GH, CACTUS_EVOL);
+  CCTK_rfrTraverse(GH, CCTK_EVOL);
   /* after Evolution check for NANs */
 }
  /*@@
@@ -233,7 +233,7 @@ void EvolStepper(cGH *GH) {
    @date       Fri Aug 14 12:44:58 1998
    @author     Gerd Lanfermann
    @desc 
-     calls RFR-CACTUS_BOUND applies boudnary conditions
+     calls RFR-CCTK_BOUND applies boudnary conditions
    @enddesc 
    @calls     
    @calledby   
@@ -244,7 +244,7 @@ void EvolStepper(cGH *GH) {
 @@*/
 
 void BoundStepper(cGH *GH) {
-  CCTK_rfrTraverse(GH,CACTUS_BOUND);
+  CCTK_rfrTraverse(GH,CCTK_BOUND);
 }
 
  /*@@
@@ -252,7 +252,7 @@ void BoundStepper(cGH *GH) {
    @date       Fri Aug 14 12:45:39 1998
    @author     Gerd Lanfermann
    @desc 
-     calls the routines rgeistered as CACTUS_POSSTEPS
+     calls the routines rgeistered as CCTK_POSSTEPS
    @enddesc 
    @calls     
    @calledby   
@@ -264,7 +264,7 @@ void BoundStepper(cGH *GH) {
 void PostStepper(cGH *GH) {
   int Rstep;  
    /* Call the rfr with post step */
-  for (Rstep = CACTUS_POSTSTEP; Rstep <= CACTUS_POSTSTEP10; Rstep++)
+  for (Rstep = CCTK_POSTSTEP; Rstep <= CCTK_POSTSTEP10; Rstep++)
     CCTK_rfrTraverse(GH, Rstep); 
 }
  /*@@
@@ -303,5 +303,5 @@ void TerminationStepper(cGH *GH) {
     cactus_terminate=TERMINATION_RAISED_BRDCAST;
     printf("RECEIVED GLOBAL TERMINATION SIGNAL \n");
   }
-  CCTK_rfrTraverse(GH,CACTUS_TERMINATE);
+  CCTK_rfrTraverse(GH,CCTK_TERMINATE);
 }
diff --git a/src/main/CactusDefaultInitialise.c b/src/main/CactusDefaultInitialise.c
index 36486327..400fdf88 100644
--- a/src/main/CactusDefaultInitialise.c
+++ b/src/main/CactusDefaultInitialise.c
@@ -120,23 +120,23 @@ int Cactus_InitialiseGH(cGH *GH)
   /* Do various rfr traversals.  Will tidy up later. */
 
   /* FIXME : PARAM_CHECK SHOULD BE BEFORE HERE */
-  CCTK_rfrTraverse(GH, CACTUS_PARAMCHECK);
+  CCTK_rfrTraverse(GH, CCTK_PARAMCHECK);
 
-  CCTK_rfrTraverse(GH, CACTUS_BASEGRID); 
-  CCTK_rfrTraverse(GH, CACTUS_INITIAL0);
+  CCTK_rfrTraverse(GH, CCTK_BASEGRID); 
+  CCTK_rfrTraverse(GH, CCTK_INITIAL0);
 
   /* Loops like this should go eventually... */
-  for (Rstep = CACTUS_INITIAL; Rstep <= CACTUS_INITIAL9; Rstep++)
+  for (Rstep = CCTK_INITIAL; Rstep <= CCTK_INITIAL9; Rstep++)
   {
     CCTK_rfrTraverse(GH,Rstep);
   }
 
   /* Ignore checkpointing for now.
-   * CCTK_rfrTraverse(GH,CACTUS_RECOVER);
-   * CCTK_rfrTraverse(GH,CACTUS_CPINITIAL);
+   * CCTK_rfrTraverse(GH,CCTK_RECOVER);
+   * CCTK_rfrTraverse(GH,CCTK_CPINITIAL);
    */
 
-  for (Rstep = CACTUS_POSTSTEP; Rstep <= CACTUS_POSTSTEP10; Rstep++)
+  for (Rstep = CCTK_POSTSTEP; Rstep <= CCTK_POSTSTEP10; Rstep++)
   {
     CCTK_rfrTraverse(GH,Rstep);
   }