Removed last vestiges of rfr.

Tom


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

9 files changed, 15 insertions, 212 deletions

diff --git a/src/IO/IOMethods.c b/src/IO/IOMethods.c
index 68e27f60..1d3b9006 100644
--- a/src/IO/IOMethods.c
+++ b/src/IO/IOMethods.c
@@ -688,7 +688,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_OutputVarByMethod)(int *ierr, cGH *GH, TWO_FORT
  ************************************************************************/
 
  /*@@
-   @routine    CCTKi_rfrTriggerSaysGo
+   @routine    CCTKi_TriggerSaysGo
    @date       Sat March 6 1999
    @author     Gabrielle Allen
    @desc 
@@ -723,7 +723,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_OutputVarByMethod)(int *ierr, cGH *GH, TWO_FORT
    @version    $Header$
  */
 
-int CCTKi_rfrTriggerSaysGo(cGH *GH, int variable)
+int CCTKi_TriggerSaysGo(cGH *GH, int variable)
 {
   int handle;
   int flag;
@@ -751,11 +751,11 @@ int CCTKi_rfrTriggerSaysGo(cGH *GH, int variable)
 
 
  /*@@
-   @routine    CCTKi_rfrTriggerAction
+   @routine    CCTKi_TriggerAction
    @date       Sat March 6 1999
    @author     Gabrielle Allen
    @desc 
-               Essentially the same as CCTKi_rfrTriggerSaysGo, 
+               Essentially the same as CCTKi_TriggerSaysGo, 
                but now calls each IO method for which it is 
                time to output the trigger
    @enddesc 
@@ -785,7 +785,7 @@ int CCTKi_rfrTriggerSaysGo(cGH *GH, int variable)
    @returndesc
                0    = This should never happen, since at least
                       one IO method should have been found by
-                      CCTKi_rfrTriggerSaysGo
+                      CCTKi_TriggerSaysGo
                >0   = Number of IO methods called for output for
                       this variable
    @endreturndesc
@@ -793,7 +793,7 @@ int CCTKi_rfrTriggerSaysGo(cGH *GH, int variable)
    @version    $Header$
  */
 
-int CCTKi_rfrTriggerAction(void *GH, int variable)
+int CCTKi_TriggerAction(void *GH, int variable)
 {
   const char *varname;
   char *fullvarname;
diff --git a/src/include/CactusrfrInterface.h b/src/include/CactusrfrInterface.h
deleted file mode 100644
index 20ddcec2..00000000
--- a/src/include/CactusrfrInterface.h
+++ /dev/null
@@ -1,41 +0,0 @@
- /*@@
-   @header    CactusrfrInterface.h
-   @date      Thu Feb 11 18:42:03 1999
-   @author    Tom Goodale
-   @desc 
-   A file to contain prototypes for the interface between Cactus and the rfr.
-   @enddesc 
- @@*/
-
-#ifndef _CACTUSRFRINTERFACE_H_
-#define _CACTUSRFRINTERFACE_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int CCTKi_rfrStorageOn(void *GH, int group);
-
-int CCTKi_rfrStorageOff(void *GH, int group);
-
-int CCTKi_rfrCommunicationOn(void *GH, int group);
-
-int CCTKi_rfrCommunicationOff(void *GH, int group);
-
-int CCTKi_rfrTriggerable(int variable);
-
-int CCTKi_rfrTriggerSaysGo(void *GH, int variable);
-
-int CCTKi_rfrTriggerAction(void *GH, int group);
-
-int CCTKi_rfrCallFunc(void *GH, int language, void *function);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif
-
-
-
diff --git a/src/include/cGH.h b/src/include/cGH.h
index 6ba8fa4a..53b8b869 100644
--- a/src/include/cGH.h
+++ b/src/include/cGH.h
@@ -9,7 +9,7 @@
  @@*/
 
 #ifndef _CGH_H_
-#define _CGH_H_
+#define _CGH_H_ 1
 
 #ifndef _CCTK_TYPES_H
 #include "cctk_Types.h"
@@ -72,9 +72,6 @@ typedef struct
   /* All the group data for this GH (storage, comm, etc. */
   cGHGroupData *GroupData;
 
-  /* Rfr tree for this GH. */
-  void *rfr_top;
-
 } cGH;
 
-#endif
+#endif /* _CGH_H_ */
diff --git a/src/include/rfrConstants.h b/src/include/rfrConstants.h
deleted file mode 100644
index fc15367f..00000000
--- a/src/include/rfrConstants.h
+++ /dev/null
@@ -1,66 +0,0 @@
- /*@@
-   @file      rfrConstants.h
-   @date      
-   @author   
-   @desc 
-   
-   @enddesc 
-   @version $Header$
- @@*/
-
-#ifndef _RFRCONSTANTS_H
-#define _RFRCONSTANTS_H
-
-/* Be careful changing ordering. Look at tree in rfrInitialize before you do! */
-#define CCTK_PARAMCHECK  0
-#define CCTK_BASEGRID  1
-
-#define CCTK_RECOVER   3
-#define CCTK_RECOVER_PARAMETERS   4
-#define CCTK_RECOVER_VARIABLES   5
-
-/* Be sure to keep the INITIAL*, POSTSTEP*, etc... contiguous */
-#define CCTK_INITIAL   11
-#define CCTK_POSTINITIAL   12
-
-#define CCTK_CPINITIAL 25
-
-#define CCTK_PRESTEP   30
-
-#define CCTK_POSTSTEP   40
-
-#define CCTK_EVOL       60
-
-#define CCTK_CHECKPOINT 75 
-
-#define CCTK_ANALYSIS   80
-
-#define CCTK_TERMINATE  90
-
-#define CCTK_CONVERGENCE 100
-
-#define CCTK_SHUTDOWN  95 
-/* This shouldn't be here, but need it externally visable. */
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-int rfrInitTree(void **rfr_top,   
-                int (*StorageOn)(void *, int),
-                int (*StorageOff)(void *, int),
-                int (*CommunicationOn)(void *, int),
-                int (*CommunicationOff)(void *, int),
-                int (*Triggerable)(int),
-                int (*TriggerSaysGo)(void *, int),
-                int (*TriggerAction)(void *, int),
-                int (*CallFunc)(void *, int, void *));
-
-void rfrPrintDescs(void *rfr_top, void *data, int when, char *tag, char *spacing);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*  _RFRCONSTANTS_H */
diff --git a/src/include/rfrInterface.h b/src/include/rfrInterface.h
deleted file mode 100644
index 86e9ad55..00000000
--- a/src/include/rfrInterface.h
+++ /dev/null
@@ -1,31 +0,0 @@
- /*@@
-   @header    rfrInterface.h
-   @date      Tue Jun  1 16:50:22 1999
-   @author    Tom Goodale
-   @desc 
-   CCTK rfr interface calls.
-   @enddesc 
-   @version $Header$
- @@*/
-
-
-#ifndef _RFRINTERFACE_H_
-#define _RFRINTERFACE_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int CCTKi_rfrPrintTree(cGH *GH,void *rfr_top);
-int CCTKi_rfrStorageOn(void *GH, int group);
-int CCTKi_rfrStorageOff(void *GH, int group);
-int CCTKi_rfrCommunicationOn(void *GH, int group);
-int CCTKi_rfrCommunicationOff(void *GH, int group);
-int CCTKi_rfrTriggerable(int entrypoint);
-int CCTKi_rfrCallFunc(void *GH, int language, void *function);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/main/CactusDefaultInitialise.c b/src/main/CactusDefaultInitialise.c
index 113510fe..13d13927 100644
--- a/src/main/CactusDefaultInitialise.c
+++ b/src/main/CactusDefaultInitialise.c
@@ -20,7 +20,6 @@
 #include "cctki_GHExtensions.h"
 #include "cctki_WarnLevel.h"
 
-#include "CactusrfrInterface.h"
 #include "CactusMainDefaults.h"
 #include "CactusCommFunctions.h"
 
@@ -114,7 +113,7 @@ int CactusInitialiseGH(cGH *GH)
   CCTK_PRINTSEPARATOR
 #endif
   
-  /* Do the rfr initialisation on this GH */
+  /* Do the schedule initialisation on this GH */
   CCTKi_ScheduleGHInit((void *)GH);
 
   /* Initialise all the extensions. */
diff --git a/src/main/ScheduleInterface.c b/src/main/ScheduleInterface.c
index 3dede194..899ad860 100644
--- a/src/main/ScheduleInterface.c
+++ b/src/main/ScheduleInterface.c
@@ -27,8 +27,6 @@
 #include "cctk_Groups.h"
 #include "cctk_GroupsOnGH.h"
 
-#include "rfrInterface.h"
-
 #include "cctki_FortranWrappers.h"
 
 #include "CactusTimers.h"
@@ -160,10 +158,10 @@ static void CCTKi_SchedulePrintTimerHeaders(cTimerData *info);
  ********************* Other Routine Prototypes *********************
  ********************************************************************/
 
-/* FIXME: these should be renamed and put in a header somewhere */
+/* FIXME: these should be put in a header somewhere */
 
-int CCTKi_rfrTriggerSaysGo(cGH *GH, int variable);
-int CCTKi_rfrTriggerAction(void *GH, int variable);
+int CCTKi_TriggerSaysGo(cGH *GH, int variable);
+int CCTKi_TriggerAction(void *GH, int variable);
 
 
 /********************************************************************
@@ -1358,7 +1356,7 @@ static int CCTKi_ScheduleCallEntry(t_attribute *attribute,
         last  = index + CCTK_NumVarsInGroupI(attribute->trigger_groups[i]) -1;
         for(; index <= last ; index++)
         {
-          go = go || CCTKi_rfrTriggerSaysGo(data->GH, index);
+          go = go || CCTKi_TriggerSaysGo(data->GH, index);
         }
       }
     }
@@ -1427,7 +1425,7 @@ static int CCTKi_ScheduleCallExit(t_attribute *attribute,
         last  = index + CCTK_NumVarsInGroupI(attribute->trigger_groups[i]) - 1;
         for(; index <= last ; index++)
         {
-          CCTKi_rfrTriggerAction(data->GH, index);
+          CCTKi_TriggerAction(data->GH, index);
         }
       }
     }
diff --git a/src/main/make.code.defn b/src/main/make.code.defn
index 0ca21c92..00b11e89 100644
--- a/src/main/make.code.defn
+++ b/src/main/make.code.defn
@@ -28,11 +28,11 @@ Parameters.c\
 ProcessCommandLine.c\
 ProcessEnvironment.c\
 ProcessParameterDatabase.c\
-rfrInterface.c\
 ScheduleInterface.c\
 SetParams.c\
 SetupCache.c\
 ShutdownCactus.c\
 Stagger.c\
 Subsystems.c\
+Traverse.c\
 WarnLevel.c
diff --git a/src/main/rfrInterface.c b/src/main/rfrInterface.c
deleted file mode 100644
index 20db90f5..00000000
--- a/src/main/rfrInterface.c
+++ /dev/null
@@ -1,53 +0,0 @@
- /*@@
-   @file      rfrInterface.c
-   @date      Wed Feb  3 14:42:24 1999
-   @author    Tom Goodale
-   @desc 
-   Routine used by cactus to talk to the rfr.
-   @enddesc 
-   @version $Header$
- @@*/
-
-/*#define RFRDEBUG*/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "cctk_WarnLevel.h"
-#include "cctk_Flesh.h"
-#include "cctk_GHExtensions.h"
-#include "CactusrfrInterface.h"
-#include "rfrConstants.h"
-#include "rfrInterface.h"
-#include "cctk_Schedule.h"
-#include "cctki_GHExtensions.h"
-#include "cctki_Schedule.h"
-
-static char *rcsid = "$Header$";
-
-CCTK_FILEVERSION(main_rfrInterface_c)
-
-#define SCHEDULE(x) case CCTK_ ## x : CCTK_ScheduleTraverse("CCTK_" #x, data, NULL); break
-
- /*@@
-   @routine    CCTK_Traverse
-   @date       Thu Jan 27 14:42:16 2000
-   @author     Tom Goodale
-   @desc 
-   Routine called to traverse functions 
-   @enddesc 
-   @calls     
-   @calledby   
-   @history 
- 
-   @endhistory 
-
-@@*/
-int CCTK_Traverse(cGH *GH, const char *where)
-{
-  int retcode;
-
-  retcode = CCTKi_ScheduleTraverseGHExtensions(GH, where);
-
-  return retcode;
-}