Removing rfrTraverse, replaced by CCTK_ScheduleTraverse

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

5 files changed, 0 insertions, 163 deletions

diff --git a/src/include/cctk_GHExtensions.h b/src/include/cctk_GHExtensions.h
index 853eb2eb..b0568006 100644
--- a/src/include/cctk_GHExtensions.h
+++ b/src/include/cctk_GHExtensions.h
@@ -24,9 +24,6 @@ int CCTK_RegisterGHExtensionSetupGH(int handle,
 int CCTK_RegisterGHExtensionInitGH(int handle, 
                                    int (*func)(cGH *));
 
-int CCTK_RegisterGHExtensionrfrTraverseGH(int handle, 
-                                          int (*func)(cGH *, int));
-
 int CCTK_RegisterGHExtensionScheduleTraverseGH(int handle, 
                                                int (*func)(cGH *, const char *));
 
diff --git a/src/include/cctki_GHExtensions.h b/src/include/cctki_GHExtensions.h
index 28af1771..fa5101d1 100644
--- a/src/include/cctki_GHExtensions.h
+++ b/src/include/cctki_GHExtensions.h
@@ -22,8 +22,6 @@ int CCTKi_SetupGHExtensions(tFleshConfig *config,
 
 int CCTKi_InitGHExtensions(cGH *GH);
 
-int CCTKi_rfrTraverseGHExtensions(cGH *GH, int rfrpoint);
-
 int CCTKi_ScheduleTraverseGHExtensions(cGH *GH, const char *where);
 
 #ifdef __cplusplus
diff --git a/src/include/rfrInterface.h b/src/include/rfrInterface.h
index 23918b31..86e9ad55 100644
--- a/src/include/rfrInterface.h
+++ b/src/include/rfrInterface.h
@@ -16,7 +16,6 @@
 extern "C" {
 #endif
 
-int CCTK_rfrTraverse(cGH *GH, int rfrpoint);
 int CCTKi_rfrPrintTree(cGH *GH,void *rfr_top);
 int CCTKi_rfrStorageOn(void *GH, int group);
 int CCTKi_rfrStorageOff(void *GH, int group);
diff --git a/src/main/GHExtensions.c b/src/main/GHExtensions.c
index 5512c3a2..9cb2ce32 100644
--- a/src/main/GHExtensions.c
+++ b/src/main/GHExtensions.c
@@ -42,7 +42,6 @@ struct GHExtension
 {
   void *(*SetupGH)(tFleshConfig *, int, cGH *);
   int    (*InitGH)(cGH *);
-  int    (*rfrTraverseGH)(cGH *, int);
   int    (*ScheduleTraverseGH)(cGH *, const char *);
 };
 
@@ -58,8 +57,6 @@ static void *DummySetupGH(tFleshConfig *config,
                           int convergence_level, 
                           cGH *GH);
 static int DummyInitGH(cGH *GH);
-static int DummyrfrTraverseGH(cGH *GH, 
-                              int rfrpoint);
 static int DummyScheduleTraverseGH(cGH *GH, 
                                    const char *where);
 
@@ -110,7 +107,6 @@ int CCTK_RegisterGHExtension(const char *name)
       /* Initialise the extension structure. */
       new_extension->InitGH = NULL;
       new_extension->SetupGH = NULL;
-      new_extension->rfrTraverseGH = NULL;
       new_extension->ScheduleTraverseGH = NULL;
       
       /* Remember how many extensions there are */
@@ -210,42 +206,6 @@ int CCTK_RegisterGHExtensionInitGH(int handle,
 }
 
  /*@@
-   @routine    CCTK_RegisterGHExtensionrfrTraverseGH
-   @date       Wed Feb  3 14:31:20 1999
-   @author     Tom Goodale
-   @desc 
-   Registers a GH extension rfr traversal routine routine.   
-   @enddesc 
-   @calls     
-   @calledby   
-   @history 
- 
-   @endhistory 
-
-@@*/
-int CCTK_RegisterGHExtensionrfrTraverseGH(int handle, 
-                                          int (*func)(cGH *, int))
-{
-  int return_code;
-  struct GHExtension *extension;
-
-  /* Get the extension. */
-  extension = Util_GetHandledData(GHExtensions, handle);
-
-  if(extension)
-  {
-    extension->rfrTraverseGH = func;
-    return_code = 1;
-  }
-  else
-  {
-    return_code = 0;
-  }
-
-  return return_code;
-}
-
- /*@@
    @routine    CCTK_RegisterGHExtensionScheduleTraverseGH
    @date       Thu Jan 27 14:37:09 2000
    @author     Tom Goodale
@@ -375,36 +335,6 @@ int CCTKi_InitGHExtensions(cGH *GH)
   return 0;
 }
 
-
- /*@@
-   @routine    CCTKi_rfrTraverseGHExtensions
-   @date       Wed Feb  3 14:16:17 1999
-   @author     Tom Goodale
-   @desc 
-   Calls the routines which an extension needs called at an rfr traversal.
-   @enddesc 
-   @calls     
-   @calledby   
-   @history 
- 
-   @endhistory 
-
-@@*/
-int CCTKi_rfrTraverseGHExtensions(cGH *GH, 
-                                  int rfrpoint)
-{
-  int handle;
-  struct GHExtension *extension;
-
-  for(handle = 0; handle < num_extensions; handle++)
-  {
-    extension =  (struct GHExtension *)Util_GetHandledData(GHExtensions, handle);
-    extension->rfrTraverseGH(GH, rfrpoint);
-  }
-
-  return 0;
-}
-
  /*@@
    @routine    CCTKi_ScheduleTraverseGHExtensions
    @date       Thu Jan 27 14:47:06 2000
@@ -494,17 +424,6 @@ static int CheckAllExtensionsSetup(void)
       extension->InitGH=DummyInitGH;
     }
 
-    /* rfrTraverse */
-    if(!extension->rfrTraverseGH)
-    {
-      const char *handlename = Util_GetHandleName(GHExtensions, handle);
-      char *message = (char *)malloc(300*sizeof(char));
-      sprintf(message,"GH Extension '%s' has not registered a rfrTraverse routine",handlename);
-      CCTK_Warn(4,__LINE__,__FILE__,"Cactus",message) ;
-      free(message);
-      extension->rfrTraverseGH=DummyrfrTraverseGH;
-    }
-
     /* ScheduleTraverse */
     if(!extension->ScheduleTraverseGH)
     {
@@ -605,26 +524,6 @@ static int DummyInitGH(cGH *GH)
 
 
  /*@@
-   @routine    DummyrfrTraverseGH
-   @date       Wed Feb  3 14:17:57 1999
-   @author     Tom Goodale
-   @desc 
-   Dummy for rfrTraverseGH functions.
-   @enddesc 
-   @calls     
-   @calledby   
-   @history 
- 
-   @endhistory 
-
-@@*/
-static int DummyrfrTraverseGH(cGH *GH, 
-                              int rfrpoint)
-{
-  return 0;
-}
-
- /*@@
    @routine    DummyScheduleTraverseGH
    @date       Thu Jan 27 14:34:41 2000
    @author     Tom Goodale
diff --git a/src/main/rfrInterface.c b/src/main/rfrInterface.c
index ffe31bc3..00b2ce96 100644
--- a/src/main/rfrInterface.c
+++ b/src/main/rfrInterface.c
@@ -24,66 +24,10 @@
 
 static char *rcsid = "$Header$";
 
-
- /*@@
-   @routine    CCTK_rfrTraverse
-   @date       Wed Feb  3 14:45:57 1999
-   @author     Tom Goodale
-   @desc 
-   Calls the rfrTraverse, then deals with extensions.
-   @enddesc 
-   @calls     
-   @calledby   
-   @history 
- 
-   @endhistory 
-
-@@*/
-int CCTK_rfrTraverse(cGH *GH, int rfrpoint)
-{
-
-  CCTK_Warn(1,__LINE__,__FILE__,"Cactus",
-	    "CCTK_rfrTraverse is deprecated, please use CCTK_Traverse");
-  
-  CCTKi_rfrTraverseGHExtensions(GH, rfrpoint);
-
-  return 0;
-}
-
 #include "cctki_Schedule.h"
 
 #define SCHEDULE(x) case CCTK_ ## x : CCTK_ScheduleTraverse("CCTK_" #x, data, NULL); break
 
-void rfrTraverse(void *rfr_top, void *data, int when) 
-{
-
-  CCTK_Warn(1,__LINE__,__FILE__,"Cactus",
-	    "rfrTraverse is deprecated, please use CCTK_ScheduleTraverse");
-
-  switch(when)
-  {
-    SCHEDULE(PARAMCHECK);
-    SCHEDULE(BASEGRID);
-    SCHEDULE(RECOVER_PARAMETERS);
-    SCHEDULE(RECOVER_VARIABLES);
-    SCHEDULE(RECOVER);
-    SCHEDULE(INITIAL);
-    SCHEDULE(POSTINITIAL);
-    SCHEDULE(CPINITIAL);
-    SCHEDULE(PRESTEP);
-    SCHEDULE(POSTSTEP);
-    SCHEDULE(EVOL);
-    SCHEDULE(CHECKPOINT);
-    SCHEDULE(ANALYSIS);
-    SCHEDULE(TERMINATE);
-    SCHEDULE(CONVERGENCE);
-    default :
-      CCTK_Warn(0,__LINE__,__FILE__,"Cactus","Unknown scheduling point"); 
-  }
-
-  return;
-}
-
  /*@@
    @routine    CCTK_Traverse
    @date       Thu Jan 27 14:42:16 2000