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, 27 insertions, 27 deletions

diff --git a/src/DumpVar.c b/src/DumpVar.c
index e91f0e0..1d0f7d1 100644
--- a/src/DumpVar.c
+++ b/src/DumpVar.c
@@ -114,9 +114,9 @@ void IOFlexIO_DumpVar (cGH *GH, int index, int timelevel, IOFile iof)
   int ioflex_type, mpi_type = 0, element_size;
 
   /* Get the handle for IOUtil extensions */
-  ioUtilGH = (ioGH *) GH->extensions [CCTK_GetGHExtensionHandle ("IO")];
+  ioUtilGH = (ioGH *) GH->extensions [CCTK_GHExtensionHandle ("IO")];
 
-  variable_type = CCTK_GetVarVType (index);
+  variable_type = CCTK_VarTypeI (index);
 
   switch (variable_type) {
     case CCTK_VARIABLE_REAL:
@@ -155,7 +155,7 @@ void IOFlexIO_DumpVar (cGH *GH, int index, int timelevel, IOFile iof)
       return;
   }
 
-  switch (CCTK_GetVarGType (index)) {
+  switch (CCTK_GroupTypeFromVarI (index)) {
     case GROUP_SCALAR:
       IOFlexIO_DumpScalar (GH, index, timelevel, iof, ioflex_type);
       break;
@@ -172,7 +172,7 @@ void IOFlexIO_DumpVar (cGH *GH, int index, int timelevel, IOFile iof)
 
     default:
       sprintf (msg, "Invalid group type %d in IOFlexIO_DumpVar",
-               CCTK_GetVarGType (index));
+               CCTK_GroupTypeFromVarI (index));
       CCTK_WARN (1, msg);
       return;
   }
@@ -227,14 +227,14 @@ void IOFlexIO_DumpScalar (cGH *GH, int index, int timelevel, IOFile iof,
 
 
   /* Get the handle for IOUtil extensions */
-  ioUtilGH = (ioGH *) GH->extensions [CCTK_GetGHExtensionHandle ("IO")];
+  ioUtilGH = (ioGH *) GH->extensions [CCTK_GHExtensionHandle ("IO")];
 
-  if (CCTK_GetMyProc (GH) != ioUtilGH->ioproc)
+  if (CCTK_MyProc (GH) != ioUtilGH->ioproc)
     return;
 
   /* first dump the data then add the attributes */
   CACTUS_IEEEIO_ERROR (IOwrite (iof, ioflex_type, 1, dim,
-                       CCTK_GetVarDataPtr_ByIndex (GH, timelevel, index)));
+                       CCTK_VarDataPtrI (GH, timelevel, index)));
   IOFlexIO_AddCommonAttributes (GH, index, timelevel, gsz, iof);
 }
 
@@ -375,11 +375,11 @@ void IOFlexIO_DumpGF (cGH *GH, int index, int timelevel, IOFile iof,
 #endif
 
   /* Get the handles for pugh and IO extensions */
-  ioUtilGH = (ioGH *) GH->extensions [CCTK_GetGHExtensionHandle ("IO")];
-  pughGH = (pGH *) GH->extensions [CCTK_GetGHExtensionHandle ("PUGH")];
+  ioUtilGH = (ioGH *) GH->extensions [CCTK_GHExtensionHandle ("IO")];
+  pughGH = (pGH *) GH->extensions [CCTK_GHExtensionHandle ("PUGH")];
 
-  myproc = CCTK_GetMyProc (GH);
-  nprocs = CCTK_GetnProcs (GH);
+  myproc = CCTK_MyProc (GH);
+  nprocs = CCTK_nProcs (GH);
 
   /* If I'm not vertex centered, bail (for now) */
   if (pughGH->stagger != PUGH_VERTEXCTR) {
@@ -518,23 +518,23 @@ void IOFlexIO_AddCommonAttributes (cGH *GH, int index, int timelevel,
   ioGH *ioUtilGH;
 
   /* Get the handles for pugh and IO extensions */
-  pughGH = (pGH *) GH->extensions [CCTK_GetGHExtensionHandle ("PUGH")];
-  ioUtilGH = (ioGH *) GH->extensions [CCTK_GetGHExtensionHandle ("IO")];
+  pughGH = (pGH *) GH->extensions [CCTK_GHExtensionHandle ("PUGH")];
+  ioUtilGH = (ioGH *) GH->extensions [CCTK_GHExtensionHandle ("IO")];
 
-  name = CCTK_GetFullName (index);
+  name = CCTK_FullName (index);
   CACTUS_IEEEIO_ERROR (IOwriteAttribute (iof, "name", BYTE,
                        strlen (name) + 1, name));
   free (name);
 
-  gname = CCTK_GetGroupNameFromVar_ByIndex (index);
+  gname = CCTK_GroupNameFromVarI (index);
   CACTUS_IEEEIO_ERROR (IOwriteAttribute (iof, "groupname", BYTE,
                        strlen (gname) + 1, gname));
 
-  i_to_IO = CCTK_GetVarGType (index);
+  i_to_IO = CCTK_GroupTypeFromVarI (index);
   CACTUS_IEEEIO_ERROR (IOwriteAttribute (iof, "grouptype", FLEXIO_INT4,
                        1, &i_to_IO));
 
-  i_to_IO = CCTK_GetNumTimeLevels_ByIndex (index);
+  i_to_IO = CCTK_NumTimeLevelsFromVarI (index);
   CACTUS_IEEEIO_ERROR (IOwriteAttribute (iof, "ntimelevels", FLEXIO_INT4,
                        1, &i_to_IO));
 
@@ -579,7 +579,7 @@ void IOFlexIO_AddCommonAttributes (cGH *GH, int index, int timelevel,
   CACTUS_IEEEIO_ERROR (IOwriteAttribute (iof, "global_size", FLEXIO_INT4,
                        3, gsz));
 
-  i_to_IO = CCTK_GetnProcs (GH);
+  i_to_IO = CCTK_nProcs (GH);
   CACTUS_IEEEIO_ERROR (IOwriteAttribute (iof, "nprocs", FLEXIO_INT4,
                        1, &i_to_IO));
 
@@ -621,7 +621,7 @@ void IOFlexIO_AddChunkAttributes (cGH *GH, int index, CCTK_INT4 chunk_origin [3]
   CCTK_INT4 i_to_IO;
 
   /* there is nothing to do for a serial run */
-  if (CCTK_GetnProcs (GH) == 1)
+  if (CCTK_nProcs (GH) == 1)
     return;
 
   CACTUS_IEEEIO_ERROR (IOwriteAttribute (iof, "chunk_origin", FLEXIO_INT4,
@@ -631,7 +631,7 @@ void IOFlexIO_AddChunkAttributes (cGH *GH, int index, CCTK_INT4 chunk_origin [3]
   CACTUS_IEEEIO_ERROR (IOwriteAttribute (iof, "chunk_dataset", FLEXIO_INT4,
                        1, &i_to_IO));
 
-  name = CCTK_GetFullName (index);
+  name = CCTK_FullName (index);
   CACTUS_IEEEIO_ERROR (IOwriteAttribute (iof, "name", BYTE,
                        strlen (name)+1, name));
 }
@@ -699,12 +699,12 @@ void IOFlexIO_getDumpData (cGH *GH, int index, int timelevel, void **outme,
   CCTK_REAL *real_ptr;
   CCTK_CHAR *char_ptr;
   CCTK_INT *int_ptr;
-  void *data = CCTK_GetVarDataPtr_ByIndex (GH, timelevel, index);
+  void *data = CCTK_VarDataPtrI (GH, timelevel, index);
 
-  ioUtilGH = (ioGH *) GH->extensions [CCTK_GetGHExtensionHandle ("IO")];
-  pughGH = (pGH *) GH->extensions [CCTK_GetGHExtensionHandle ("PUGH")];
+  ioUtilGH = (ioGH *) GH->extensions [CCTK_GHExtensionHandle ("IO")];
+  pughGH = (pGH *) GH->extensions [CCTK_GHExtensionHandle ("PUGH")];
 
-  myproc = CCTK_GetMyProc (GH);
+  myproc = CCTK_MyProc (GH);
 
   if (ioUtilGH->downsample_x == 1 &&
       ioUtilGH->downsample_y == 1 &&
@@ -796,7 +796,7 @@ void IOFlexIO_getDumpData (cGH *GH, int index, int timelevel, void **outme,
     /* I hate it to repeat the loops for each case label
        but that way produces much more efficient code */
     l = 0;
-    switch (CCTK_GetVarVType (index)) {
+    switch (CCTK_VarTypeI (index)) {
       case CCTK_VARIABLE_CHAR:
         char_ptr = (CCTK_CHAR *) *outme;
         for (k = start [2]; k <= end [2]; k += ioUtilGH->downsample_z)
@@ -864,7 +864,7 @@ void IOFlexIO_eachProcDump (cGH *GH, int index, int timelevel, void *outme,
   int chunk_dims [3];
   ioGH *ioUtilGH;
 
-  ioUtilGH = (ioGH *) GH->extensions [CCTK_GetGHExtensionHandle ("IO")];
+  ioUtilGH = (ioGH *) GH->extensions [CCTK_GHExtensionHandle ("IO")];
 
   /* So set up the local shape. */
   chunk_dims [0] = bnd [3];
@@ -908,7 +908,7 @@ void IOFlexIO_procDump (IOFile iof, cGH *GH, int index, void *outme,
   int chunk_dims [3], chunk_origin [3];      /* Chunk dim and origin */
   ioGH *ioUtilGH;
 
-  ioUtilGH = (ioGH *) GH->extensions [CCTK_GetGHExtensionHandle ("IO")];
+  ioUtilGH = (ioGH *) GH->extensions [CCTK_GHExtensionHandle ("IO")];
 
   chunk_origin [0] = bnd [0];
   chunk_origin [1] = bnd [1];