New Group function names

git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/CartGrid3D/trunk@34 c78560ca-4b45-4335-b268-5f3340f3cb52

2 files changed, 13 insertions, 13 deletions

diff --git a/src/GHExtension.c b/src/GHExtension.c
index 5177424..fe93fd3 100644
--- a/src/GHExtension.c
+++ b/src/GHExtension.c
@@ -15,8 +15,8 @@ void *Symmetry_AllocGHex(tFleshConfig *config, int convlevel, cGH *GH) {
   SymmetryGHex *newGHex;  /* Type of GHextension is EinsteinBoundGHex */
 
   printf("Setting up GH extension\n");
-  NumVars  = CCTK_GetNumVars(); /* Get number of grid functions */
-  grid_dim = CCTK_GetMaxDim();  /* Get maximal dimension of the grid */
+  NumVars  = CCTK_NumVars(); /* Get number of grid functions */
+  grid_dim = CCTK_MaxDim();  /* Get maximal dimension of the grid */
 
   /* allocate the GHextension */
   newGHex = (SymmetryGHex*)malloc(sizeof(SymmetryGHex));
@@ -32,7 +32,7 @@ void *Symmetry_AllocGHex(tFleshConfig *config, int convlevel, cGH *GH) {
   /* Now we have something, that looks like [0..NumVars-1][0..grid_dim-1] 
      and we return that. For the progammer (that's me): This will be merged into
      the GH and can be referenced  in the following manner:
-     int handle  = CCTK_GetGHExtensionHandle("Symmetry");
+     int handle  = CCTK_GHExtensionHandle("Symmetry");
                    ..... which returns a pointer the GHextension
      BoundGHEx   = ((pGH *)GH->extensions[handle]);
                    ..... BoundGHex can now be used as:
@@ -47,11 +47,11 @@ void Symmetry_InitGHex(cGH *GH) {
   SymmetryGHex *newGHex;   
   int handle;              
   int gf,d;
-  int NumVars =CCTK_GetNumVars(); 
+  int NumVars =CCTK_NumVars(); 
   int grid_dim;                    
 
-  grid_dim = CCTK_GetMaxDim();    
-  handle   = CCTK_GetGHExtensionHandle("Symmetry"); 
+  grid_dim = CCTK_MaxDim();    
+  handle   = CCTK_GHExtensionHandle("Symmetry"); 
   newGHex  = (SymmetryGHex*) GH->extensions[handle]; 
 
   /* ... and initialize them: */
diff --git a/src/Symmetry.c b/src/Symmetry.c
index d6f853f..c4363b0 100644
--- a/src/Symmetry.c
+++ b/src/Symmetry.c
@@ -50,10 +50,10 @@ void SetSymmetry(cGH *GH, int sx, int sy, int sz, const char *imp_gf) {
   int index;
 
   /* Pointer to the SymmetryGHextension */
-  sGHex  = (SymmetryGHex *)GH->extensions[CCTK_GetGHExtensionHandle("Symmetry")];
+  sGHex  = (SymmetryGHex *)GH->extensions[CCTK_GHExtensionHandle("Symmetry")];
 
   /* now that we have the same, get the index to the GFs */
-  index = CCTK_GetVarIndex(imp_gf);
+  index = CCTK_VarIndex(imp_gf);
   if (index<0) {
     CCTK_WARN(0,"Grid function has no index"); 
   };
@@ -155,7 +155,7 @@ void ApplySymmetry(cGH *GH, char *imp_group) {
   if (CCTK_Equals(symmetry,"full")) return;
 
   /* Get the pointer to the Symmetry GH extension */
-  sGHex  = (SymmetryGHex*)GH->extensions[CCTK_GetGHExtensionHandle("Symmetry")];
+  sGHex  = (SymmetryGHex*)GH->extensions[CCTK_GHExtensionHandle("Symmetry")];
 
 #ifdef DEBUG_BOUND
   printf("\n In ApplySymmetry\n -----------\n");
@@ -163,7 +163,7 @@ void ApplySymmetry(cGH *GH, char *imp_group) {
 #endif
 
   /* Get the group number */
-  groupnum = CCTK_GetGroupIndex(imp_group);
+  groupnum = CCTK_GroupIndex(imp_group);
   if (groupnum < 0) 
   {
     char *message=NULL;
@@ -174,14 +174,14 @@ void ApplySymmetry(cGH *GH, char *imp_group) {
   }
 
   /*get the index of the first GF in the group and how many Vars there are*/
-  first = CCTK_GetFirstVarIndex_ByIndex(groupnum);
-  last  = first+CCTK_GetNumVarsInGroup_ByIndex(groupnum)-1;
+  first = CCTK_FirstVarIndexI(groupnum);
+  last  = first+CCTK_NumVarsInGroupI(groupnum)-1;
 
   /* loop over the variables in the group */
   for (index=first; index<=last; index++) {
 
     /* and check that we actually have a grid function (and not a scalar)*/
-    if (CCTK_GetVarGType(index) == GROUP_GF) {
+    if (CCTK_GroupTypeFromVarI(index) == GROUP_GF) {
 
       /*at this point, there should be NO ESYM_UNSET anymore 
         if there is, we forgot to register the symmetries for a GF */