New names for Group function calls

git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOFlexIO/trunk@14 ebee0441-1374-4afa-a3b5-247f3ba15b9a

1 files changed, 25 insertions, 25 deletions

diff --git a/src/Output3D.c b/src/Output3D.c
index d1d8cec..ad9b04d 100644
--- a/src/Output3D.c
+++ b/src/Output3D.c
@@ -31,10 +31,10 @@ int IOFlexIO_TimeFor3D (cGH *GH, int index);
    @desc
    Loops over all variables and outputs them if necessary
    @enddesc
-   @calls    CCTK_GetGHExtensionHandle
-             CCTK_GetNumVars
-             CCTK_GetImplementationFromVar
-             CCTK_GetVarName
+   @calls    CCTK_GHExtensionHandle
+             CCTK_NumVars
+             CCTK_ImplementationFromVar
+             CCTK_VarName
              IOFlexIO_TimeFor3D
              IOFlexIO_Output3DVarAs
    @calledby
@@ -59,13 +59,13 @@ int IOFlexIO_Output3DGH (cGH *GH)
   DECLARE_CCTK_PARAMETERS
 
   /* Get the GH extension for IOFlexIO */
-  myGH = (flexioGH *) GH->extensions [CCTK_GetGHExtensionHandle ("IOFlexIO")];
+  myGH = (flexioGH *) GH->extensions [CCTK_GHExtensionHandle ("IOFlexIO")];
 
   /* Loop over all variables */
-  for (i = 0; i < CCTK_GetNumVars (); i++) {
+  for (i = 0; i < CCTK_NumVars (); i++) {
     if (IOFlexIO_TimeFor3D (GH, i)) {
-      implementation = CCTK_GetImplementationFromVar (i);
-      name           = CCTK_GetVarName (i);
+      implementation = CCTK_ImpFromVarI (i);
+      name           = CCTK_VarName (i);
       fullname       = (char *) malloc (strlen (implementation) +
                                         strlen (name) + 3);
       assert (fullname);
@@ -100,8 +100,8 @@ int IOFlexIO_Output3DGH (cGH *GH)
    unconditional output of a variable using the IOFlexIO 3D output method
    @enddesc
    @calls    CCTK_DecomposeName
-             CCTK_GetVarIndex
-             CCTK_GetGHExtensionHandle
+             CCTK_VarIndex
+             CCTK_GHExtensionHandle
              IOFlexIO_Write3D
    @calledby IOFlexIO_Output3DGH
    @history
@@ -133,10 +133,10 @@ int IOFlexIO_Output3DVarAs (cGH *GH, const char *fullname, const char *alias)
   int index, first;
   flexioGH *myGH;
 
-  index = CCTK_GetVarIndex(fullname);
+  index = CCTK_VarIndex(fullname);
 
   /* Get the GH extension for IOFlexIO */
-  myGH = (flexioGH *) GH->extensions [CCTK_GetGHExtensionHandle ("IOFlexIO")];
+  myGH = (flexioGH *) GH->extensions [CCTK_GHExtensionHandle ("IOFlexIO")];
 
   /* Output with correct file opening behaviour */
   first = (myGH->IO_3Dnum [index] == 1);
@@ -163,11 +163,11 @@ int IOFlexIO_Output3DVarAs (cGH *GH, const char *fullname, const char *alias)
    Decides if it is time to output a variable using the IOFlexIO 3D output
    method
    @enddesc
-   @calls    CCTK_GetGHExtensionHandle
-             CCTK_GetVarGType
+   @calls    CCTK_GHExtensionHandle
+             CCTK_GroupTypeFromVarI
              CCTK_WARN
-             CCTK_QueryGroupStorage_ByIndex
-             CCTK_GetGroupNameFromVar_ByIndex
+             CCTK_QueryGroupStorageI
+             CCTK_GroupNameFromVarI
    @calledby IOFlexIO_Output3DGH
    @history
 
@@ -192,8 +192,8 @@ int IOFlexIO_TimeFor3D (cGH *GH, int index)
   flexioGH *myGH;
 
   /* Get the GH extension for IOUtil and IOFlexIO */
-  ioUtilGH = (ioGH *) GH->extensions [CCTK_GetGHExtensionHandle ("IO")];
-  myGH = (flexioGH *) GH->extensions [CCTK_GetGHExtensionHandle ("IOFlexIO")];
+  ioUtilGH = (ioGH *) GH->extensions [CCTK_GHExtensionHandle ("IO")];
+  myGH = (flexioGH *) GH->extensions [CCTK_GHExtensionHandle ("IOFlexIO")];
 
   /* Check this GF should be output */
   if (! (myGH->IO_3Dnum [index] != 0 &&
@@ -207,9 +207,9 @@ int IOFlexIO_TimeFor3D (cGH *GH, int index)
   }
 
   /* Check GF has storage */
-  if (! CCTK_QueryGroupStorage_ByIndex (GH,
-            CCTK_GetGroupIndexFromVar_ByIndex(index))) {
-    char *fullname = CCTK_GetFullName (index);
+  if (! CCTK_QueryGroupStorageI (GH,
+            CCTK_GroupIndexFromVarI(index))) {
+    char *fullname = CCTK_FullName (index);
     char *msg = (char *) malloc (80 + strlen (fullname));
 
     sprintf (msg, "No IOFlexIO 3D output for '%s' (no storage)", fullname);
@@ -231,8 +231,8 @@ int IOFlexIO_TimeFor3D (cGH *GH, int index)
    Triggers the output a variable using the IOFlexIO 3D output
    method
    @enddesc
-   @calls    CCTK_GetGHExtensionHandle
-             CCTK_GetVarName
+   @calls    CCTK_GHExtensionHandle
+             CCTK_VarName
              IOFlexIO_Write3D
    @calledby
    @history
@@ -259,10 +259,10 @@ int IOFlexIO_TriggerOutput3D (cGH *GH, int index)
   flexioGH *myGH;
   char *varname;
 
-  varname = CCTK_GetVarName (index);
+  varname = CCTK_VarName (index);
 
   /* Get the GH extension for IOFlexIO */
-  myGH = (flexioGH *) GH->extensions [CCTK_GetGHExtensionHandle ("IOFlexIO")];
+  myGH = (flexioGH *) GH->extensions [CCTK_GHExtensionHandle ("IOFlexIO")];
 
   /* Output with correct file opening behaviour */
   first =  (myGH->IO_3Dnum [index] == 1);