Changed to use the new rfrTraverse with three arguments.

Uses rfrInitTree to setup a new rfr tree.

Tom


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

2 files changed, 32 insertions, 13 deletions

diff --git a/src/main/CactusDefaultEvolve.c b/src/main/CactusDefaultEvolve.c
index ad4f0db9..c057a451 100644
--- a/src/main/CactusDefaultEvolve.c
+++ b/src/main/CactusDefaultEvolve.c
@@ -83,7 +83,7 @@ int CactusDefaultEvolve(tFleshConfig *config)
     /* Dump out checkpoint data on all levels */
     ForallConvLevels(iteration, convergence_level)
     {
-      rfrTraverse(config->GH[convergence_level],CACTUS_CHECKPOINT);
+      rfrTraverse(config->GH[convergence_level]->rfr_top,config->GH[convergence_level],CACTUS_CHECKPOINT);
     }
     EndForallConvLevels;
 
@@ -170,7 +170,7 @@ void PreStepper(cGH *GH) {
 
   /* Call the rfr with CACTUS_PRESTEP */
   for (Rstep = CACTUS_PRESTEP;Rstep <= CACTUS_PRESTEP5; Rstep++)
-    rfrTraverse(GH, Rstep);
+    rfrTraverse(GH->rfr_top,GH, Rstep);
 }
  /*@@
    @routine    EvolStepper
@@ -189,7 +189,7 @@ void PreStepper(cGH *GH) {
 
 void EvolStepper(cGH *GH) {
   /* Call the rfr with Evolution */
-  rfrTraverse(GH, CACTUS_EVOL);
+  rfrTraverse(GH->rfr_top,GH, CACTUS_EVOL);
   /* after Evolution check for NANs */
 
 #ifdef 0
@@ -217,7 +217,7 @@ void EvolStepper(cGH *GH) {
 @@*/
 
 void BoundStepper(cGH *GH) {
-  rfrTraverse(GH,CACTUS_BOUND);
+  rfrTraverse(GH->rfr_top,GH,CACTUS_BOUND);
 }
 
  /*@@
@@ -238,7 +238,7 @@ void PostStepper(cGH *GH) {
   int Rstep;  
    /* Call the rfr with post step */
   for (Rstep = CACTUS_POSTSTEP; Rstep <= CACTUS_POSTSTEP10; Rstep++)
-    rfrTraverse(GH, Rstep); 
+    rfrTraverse(GH->rfr_top,GH, Rstep); 
 }
  /*@@
    @routine    TerminationStepper
@@ -274,5 +274,5 @@ void TerminationStepper(cGH *GH) {
     cactus_terminate=TERMINATION_RAISED_BRDCAST;
     printf("RECEIVED GLOBAL TERMINATION SIGNAL \n");
   }
-  rfrTraverse(GH,CACTUS_TERMINATE);
+  rfrTraverse(GH->rfr_top,GH,CACTUS_TERMINATE);
 }
diff --git a/src/main/CactusDefaultInitialise.c b/src/main/CactusDefaultInitialise.c
index baca41a3..ee3d7088 100644
--- a/src/main/CactusDefaultInitialise.c
+++ b/src/main/CactusDefaultInitialise.c
@@ -16,6 +16,7 @@
 #include "CactusCommFunctions.h"
 #include "parameters.h"
 #include "rfr_constants.h"
+#include "Dummies.h"
 
 static char *rcsid = "$Id$";
 
@@ -104,31 +105,49 @@ int Cactus_InitialiseGH(cGH *GH)
   /*
   SetupFortranArrays(GH);
   */
+  
+  
+  /* Setup the rfr_top on this GH */
 
-  CCTK_TraverseGHExtensions(GH, "INITIALISE");
+  GH->rfr_top = NULL;
+
+  rfrInitTree(&(GH->rfr_top), 
+	      CCTK_DummyStorageOn,
+	      CCTK_DummyStorageOff,
+	      CCTK_DummyCommunicationOn,
+	      CCTK_DummyCommunicationOff,
+	      CCTK_DummyTriggerable,
+	      CCTK_DummyTriggerSaysGo,
+	      CCTK_DummyTriggerAction,
+	      CCTK_DummyCallFunc);
 
+  /* Do the rfr initialisation on this GH */
   CCTK_BindingsScheduleRegister("RFRINIT", (void *)GH);
 
 
+  /* Traverse all the extensions. */
+  CCTK_TraverseGHExtensions(GH, "INITIALISE");
+
+
   /* Do various rfr traversals.  Will tidy up later. */
 
-  rfrTraverse(GH, CACTUS_BASEGRID); 
-  rfrTraverse(GH,CACTUS_INITIAL0);
+  rfrTraverse(GH->rfr_top,GH, CACTUS_BASEGRID); 
+  rfrTraverse(GH->rfr_top,GH,CACTUS_INITIAL0);
 
   /* Loops like this should go eventually... */
   for (Rstep = CACTUS_INITIAL; Rstep <= CACTUS_INITIAL9; Rstep++)
   {
-    rfrTraverse(GH,Rstep);
+    rfrTraverse(GH->rfr_top,GH,Rstep);
   }
 
   /* Ignore checkpointing for now.
-   * rfrTraverse(GH,CACTUS_RECOVER);
-   * rfrTraverse(GH,CACTUS_CPINITIAL);
+   * rfrTraverse(GH->rfr_top,GH,CACTUS_RECOVER);
+   * rfrTraverse(GH->rfr_top,GH,CACTUS_CPINITIAL);
    */
 
   for (Rstep = CACTUS_POSTSTEP; Rstep <= CACTUS_POSTSTEP10; Rstep++)
   {
-    rfrTraverse(GH,Rstep);
+    rfrTraverse(GH->rfr_top,GH,Rstep);
   }
 
 }