New names for many of the Group functions which are used by infrastructure

thorns and the flesh. The names should be more consistent now. You might
want to hold of from this update for a little while until all the thorn
changes are in.


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

4 files changed, 30 insertions, 30 deletions

diff --git a/src/comm/CactusComm.c b/src/comm/CactusComm.c
index e26915b4..d498bdd7 100644
--- a/src/comm/CactusComm.c
+++ b/src/comm/CactusComm.c
@@ -7,22 +7,22 @@
 #include "Comm.h"
 #include "GHExtensions.h"
 
-int *CCTK_ArrayGroupSize_ByIndex(cGH *GH, int index, int dir)
+int *CCTK_ArrayGroupSizeI(cGH *GH, int index, int dir)
 {
-  return CCTK_ArrayGroupSize_ByBoth(GH,index,NULL,dir);
+  return CCTK_ArrayGroupSizeB(GH,index,NULL,dir);
 }
 
 int *CCTK_ArrayGroupSize(cGH *GH, const char *groupname, int dir)
 {
-  return CCTK_ArrayGroupSize_ByBoth(GH,-1,groupname,dir);
+  return CCTK_ArrayGroupSizeB(GH,-1,groupname,dir);
 }
 
-int CCTK_QueryGroupStorage_ByIndex(cGH *GH, int index)
+int CCTK_QueryGroupStorageI(cGH *GH, int index)
 {
-  return CCTK_QueryGroupStorage_ByBoth(GH,index , NULL);
+  return CCTK_QueryGroupStorageB(GH,index , NULL);
 }
 
 int CCTK_QueryGroupStorage(cGH *GH, const char *groupname)
 {
-  return CCTK_QueryGroupStorage_ByBoth(GH, -1, groupname);
+  return CCTK_QueryGroupStorageB(GH, -1, groupname);
 }
diff --git a/src/comm/CactusDefaultComm.c b/src/comm/CactusDefaultComm.c
index 781d4a49..a9d569f9 100644
--- a/src/comm/CactusDefaultComm.c
+++ b/src/comm/CactusDefaultComm.c
@@ -81,7 +81,7 @@ cGH *CactusDefaultSetupGH(tFleshConfig *config, int convergence_level)
 
   if(thisGH)
   {
-    thisGH->cctk_dim = CCTK_GetMaxDim();
+    thisGH->cctk_dim = CCTK_MaxDim();
 
     /* Need this to be at least one otherwise the memory allocation will fail. */
     if(thisGH->cctk_dim == 0) thisGH->cctk_dim = 1;
@@ -102,7 +102,7 @@ cGH *CactusDefaultSetupGH(tFleshConfig *config, int convergence_level)
     thisGH->cctk_delta_time = 1;
     thisGH->cctk_convlevel = 1;
 
-    n_variables = CCTK_GetNumVars();
+    n_variables = CCTK_NumVars();
 
     /* Allocate memory for the variable data pointers.
      * Note we want at least one to prevent memory allocattion from failing !
@@ -113,7 +113,7 @@ cGH *CactusDefaultSetupGH(tFleshConfig *config, int convergence_level)
     {
       for(variable = 0; variable < n_variables; variable++)
       {
-	ntimelevels = CCTK_GetNumTimeLevels_ByIndex(variable);
+	ntimelevels = CCTK_NumTimeLevelsFromVarI(variable);
 
 	thisGH->data[variable] = (void **)malloc(ntimelevels*sizeof(void *));
 	if(thisGH->data[variable])
@@ -135,7 +135,7 @@ cGH *CactusDefaultSetupGH(tFleshConfig *config, int convergence_level)
     /* Allocate memory for the group data pointers.
      * Note we want at least one to prevent memory allocattion from failing !
      */
-    n_groups = CCTK_GetNumGroups();
+    n_groups = CCTK_NumGroups();
     thisGH->GroupData = (cGHGroupData *)malloc((n_groups ? n_groups:1)*sizeof(cGHGroupData));
 
   }
@@ -166,11 +166,11 @@ cGH *CactusDefaultSetupGH(tFleshConfig *config, int convergence_level)
 }
 
  /*@@
-   @routine    CactusDefaultGetMyProc
+   @routine    CactusDefaultMyProc
    @date       Tue Jan 23 1999
    @author     Gabrielle Allen
    @desc 
-   Default cactus GetMyProc routine.
+   Default cactus MyProc routine.
    @enddesc 
    @calls     
    @calledby   
@@ -180,7 +180,7 @@ cGH *CactusDefaultSetupGH(tFleshConfig *config, int convergence_level)
 
 @@*/
 
-int CactusDefaultGetMyProc(cGH *GH)
+int CactusDefaultMyProc(cGH *GH)
 {
   int myproc;
 
@@ -197,11 +197,11 @@ int CactusDefaultGetMyProc(cGH *GH)
 }
 
  /*@@
-   @routine    CactusDefaultGetnProcs
+   @routine    CactusDefaultnProcs
    @date       Tue Jan 23 1999
    @author     Gabrielle Allen
    @desc 
-   Default cactus GetnProcs routine.
+   Default cactus nProcs routine.
    @enddesc 
    @calls     
    @calledby   
@@ -211,7 +211,7 @@ int CactusDefaultGetMyProc(cGH *GH)
 
 @@*/
 
-int CactusDefaultGetnProcs(cGH *GH)
+int CactusDefaultnProcs(cGH *GH)
 {
   int nprocs;
 
diff --git a/src/comm/OverloadComm.c b/src/comm/OverloadComm.c
index 97a19679..cf4bed3b 100644
--- a/src/comm/OverloadComm.c
+++ b/src/comm/OverloadComm.c
@@ -23,15 +23,15 @@ static char *rcsid="$Header$";
 
   /* Deal seperately with the SetupGH routine */
 #define CCTK_DummySetupGH  CactusDefaultSetupGH
-#define CCTK_DummyGetMyProc  CactusDefaultGetMyProc
-#define CCTK_DummyGetnProcs  CactusDefaultGetnProcs
+#define CCTK_DummyMyProc  CactusDefaultMyProc
+#define CCTK_DummynProcs  CactusDefaultnProcs
 
 #include "CommOverloadables.h"
 
   /* Reset the #define to prevent complications. */
 #undef CCTK_DummySetupGH  
-#undef CCTK_DummyGetMyProc  
-#undef CCTK_DummyGetnProcs
+#undef CCTK_DummyMyProc  
+#undef CCTK_DummynProcs
 
 #undef OVERLOADABLE
 
@@ -66,15 +66,15 @@ int SetupCommFunctions(void)
 
   /* Deal seperately with the SetupGH routine */
 #define CCTK_DummySetupGH  CactusDefaultSetupGH
-#define CCTK_DummyGetMyProc  CactusDefaultGetMyProc
-#define CCTK_DummyGetnProcs  CactusDefaultGetnProcs
+#define CCTK_DummyMyProc  CactusDefaultMyProc
+#define CCTK_DummynProcs  CactusDefaultnProcs
 
 #include "CommOverloadables.h"
 
   /* Reset the #define to prevent complications. */
 #undef CCTK_DummySetupGH  
-#undef CCTK_DummyGetMyProc  
-#undef CCTK_DummyGetnProcs
+#undef CCTK_DummyMyProc  
+#undef CCTK_DummynProcs
 
 #undef OVERLOADABLE
 
diff --git a/src/comm/Reduction.c b/src/comm/Reduction.c
index e5324023..9fe386bd 100644
--- a/src/comm/Reduction.c
+++ b/src/comm/Reduction.c
@@ -88,7 +88,7 @@ int CCTK_RegisterReductionOperator(void (*function)(REGISTER_ARGLIST),
 
 
  /*@@
-   @routine    CCTK_GetReductionHandle
+   @routine    CCTK_ReductionHandle
    @date       April 28 1999
    @author     Gabrielle Allen
    @desc 
@@ -102,7 +102,7 @@ int CCTK_RegisterReductionOperator(void (*function)(REGISTER_ARGLIST),
    @endvar 
 @@*/
 
-int CCTK_GetReductionHandle(const char *reduction)
+int CCTK_ReductionHandle(const char *reduction)
 {
 
   int handle;
@@ -112,8 +112,8 @@ int CCTK_GetReductionHandle(const char *reduction)
 
 #ifdef DEBUG_REDUCTION
   CCTK_PRINTSEPARATOR
-  printf("In CCTK_GetReductionHandle\n");
-  printf("--------------------------\n");
+  printf("In CCTK_ReductionHandle\n");
+  printf("-----------------------\n");
   printf("  Got handle %d for %s\n",handle,reduction);
   CCTK_PRINTSEPARATOR
 #endif
@@ -125,10 +125,10 @@ int CCTK_GetReductionHandle(const char *reduction)
 
 }  
 
-void FMODIFIER FORTRAN_NAME(CCTK_GetReductionHandle)(int *handle, ONE_FORTSTRING_ARG)
+void FMODIFIER FORTRAN_NAME(CCTK_ReductionHandle)(int *handle, ONE_FORTSTRING_ARG)
 {
   ONE_FORTSTRING_CREATE(reduction)
-  *handle = CCTK_GetReductionHandle(reduction);
+  *handle = CCTK_ReductionHandle(reduction);
   free(reduction);
 }