New Group function names

git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/IOUtil/trunk@13 b32723a9-ab3a-4a60-88e2-2e5d99d7c17a

1 files changed, 29 insertions, 29 deletions

diff --git a/src/GHExtension.c b/src/GHExtension.c
index 7cfd951..fc10be2 100644
--- a/src/GHExtension.c
+++ b/src/GHExtension.c
@@ -42,7 +42,7 @@ int IOUtil_InitGH(cGH *GH)
   int i;
   ioGH *myGH;
 
-  myGH = (ioGH *) GH->extensions [CCTK_GetGHExtensionHandle ("IO")];
+  myGH = (ioGH *) GH->extensions [CCTK_GHExtensionHandle ("IO")];
 
   /* How often to output with each method */
   myGH->infoevery  = IO_every;
@@ -77,7 +77,7 @@ int IOUtil_InitGH(cGH *GH)
 
   /* Create the output directories */
   if (myGH->IO_0Devery > 0) {
-    if (CCTK_GetMyProc (GH) == 0) {
+    if (CCTK_MyProc (GH) == 0) {
       char *command = (char *) malloc (1024 * sizeof (char));
 
       sprintf (command, "mkdir -p %s", myGH->outpfx_0D);
@@ -87,7 +87,7 @@ int IOUtil_InitGH(cGH *GH)
     }
   }
   if (myGH->IO_1Devery > 0) {
-    if (CCTK_GetMyProc (GH) == 0) {
+    if (CCTK_MyProc (GH) == 0) {
       char *command = (char *) malloc (1024 * sizeof (char));
 
       sprintf (command, "mkdir -p %s", myGH->outpfx_1D);
@@ -97,7 +97,7 @@ int IOUtil_InitGH(cGH *GH)
     }
   }
   if (myGH->IO_2Devery > 0) {
-    if (CCTK_GetMyProc (GH) == 0) {
+    if (CCTK_MyProc (GH) == 0) {
       char *command = (char *) malloc (1024 * sizeof (char));
 
       sprintf (command, "mkdir -p %s", myGH->outpfx_2D);
@@ -107,7 +107,7 @@ int IOUtil_InitGH(cGH *GH)
     }
   }
   if (myGH->IO_3Devery > 0) {
-    if (CCTK_GetMyProc (GH) == 0) {
+    if (CCTK_MyProc (GH) == 0) {
       char *command = (char *) malloc (1024 * sizeof (char));
 
       sprintf (command, "mkdir -p %s", myGH->outpfx_3D);
@@ -120,7 +120,7 @@ int IOUtil_InitGH(cGH *GH)
 
   /* Create the checkpoint directory */
   if (checkpoint_every > 0 && CCTK_Equals (checkpoint_dir, IO_outdir) != 0) {
-    if (CCTK_GetMyProc (GH) == 0) {
+    if (CCTK_MyProc (GH) == 0) {
       char *command = (char *) malloc (1024 * sizeof (char));
 
       sprintf (command, "mkdir -p %s", checkpoint_dir);
@@ -131,34 +131,34 @@ int IOUtil_InitGH(cGH *GH)
   }
 
   if (CCTK_Equals (iomode, "proc")) {
-    myGH->ioproc = CCTK_GetMyProc (GH);
-    myGH->nioprocs = CCTK_GetnProcs (GH);
+    myGH->ioproc = CCTK_MyProc (GH);
+    myGH->nioprocs = CCTK_nProcs (GH);
     myGH->ioproc_every = 1;
   } else if (CCTK_Equals (iomode, "np")) {
-    if (ioproc_every > CCTK_GetnProcs (GH)) {
-      myGH->ioproc_every = CCTK_GetnProcs (GH);
+    if (ioproc_every > CCTK_nProcs (GH)) {
+      myGH->ioproc_every = CCTK_nProcs (GH);
       printf ("Reducing ioproc_every to %d\n", myGH->ioproc_every);
     } else
       myGH->ioproc_every  = ioproc_every;
 
-    myGH->nioprocs = CCTK_GetnProcs (GH) / myGH->ioproc_every +
-                      (CCTK_GetnProcs (GH) % myGH->ioproc_every ? 1 : 0);
-    myGH->ioproc   = CCTK_GetMyProc (GH) -
-                      CCTK_GetMyProc (GH) % myGH->ioproc_every;
+    myGH->nioprocs = CCTK_nProcs (GH) / myGH->ioproc_every +
+                      (CCTK_nProcs (GH) % myGH->ioproc_every ? 1 : 0);
+    myGH->ioproc   = CCTK_MyProc (GH) -
+                      CCTK_MyProc (GH) % myGH->ioproc_every;
   } else if (CCTK_Equals (iomode, "onefile")) {
     myGH->ioproc   = 0;
     myGH->nioprocs = 1;
-    myGH->ioproc_every = CCTK_GetnProcs (GH);
+    myGH->ioproc_every = CCTK_nProcs (GH);
   } else {
     printf ("I don't understand iomode setting. Using onefile.\n");
     myGH->ioproc   = 0;
     myGH->nioprocs = 1;
-    myGH->ioproc_every = CCTK_GetnProcs (GH);
+    myGH->ioproc_every = CCTK_nProcs (GH);
   }
 
   /* At the moment only have unchunked for a single output file */
-  if (unchunked || CCTK_GetnProcs (GH) == 1) {
-    if (myGH->ioproc_every >= CCTK_GetnProcs (GH))
+  if (unchunked || CCTK_nProcs (GH) == 1) {
+    if (myGH->ioproc_every >= CCTK_nProcs (GH))
       myGH->unchunked = 1;
     else {
       printf ("Unchunked output not currently supported for multiple\n");
@@ -203,7 +203,7 @@ int InitIONum(int *array, char *string)
   int first,groupnum,i,last,index,varnum;
 
   /* First initialise every variable to no output */
-  for (i=0; i<CCTK_GetNumVars(); i++)
+  for (i=0; i<CCTK_NumVars(); i++)
     array[i] = 0;
 
   splitstring=string;
@@ -222,16 +222,16 @@ int InitIONum(int *array, char *string)
       /* Look for any special tokens */
       if (CCTK_Equals(before,"all")) {
         int ilab;
-        for (ilab=0;ilab<CCTK_GetNumVars();ilab++)
+        for (ilab=0;ilab<CCTK_NumVars();ilab++)
           array[ilab]=1;
       } else {
 
         /* See if this name is implementation::variable */
-        varnum = CCTK_GetVarIndex(before);
+        varnum = CCTK_VarIndex(before);
         if ( varnum < 0 ) {
 
           /* See if this name is implementation::group */
-          groupnum = CCTK_GetGroupIndex(before);
+          groupnum = CCTK_GroupIndex(before);
           if (groupnum < 0) {
             char *msg;
             msg = (char *)malloc((100+strlen(before))*sizeof(char));
@@ -240,8 +240,8 @@ int InitIONum(int *array, char *string)
             free(msg);
           } else {
             /* We have a group so now need all the variables in the group */
-            first = CCTK_GetFirstVarIndex_ByIndex(groupnum);
-            last = first+CCTK_GetNumVarsInGroup_ByIndex(groupnum)-1;
+            first = CCTK_FirstVarIndexI(groupnum);
+            last = first+CCTK_NumVarsInGroupI(groupnum)-1;
             for (index=first;index<=last;index++)
               array[index] = 1;
           }
@@ -257,13 +257,13 @@ int InitIONum(int *array, char *string)
     /* Special cases */
     if (CCTK_Equals(splitstring,"all")) {
       int ilab;
-      for (ilab=0;ilab<CCTK_GetNumVars();ilab++)
+      for (ilab=0;ilab<CCTK_NumVars();ilab++)
         array[ilab]=1;
     } else {
 
-      varnum = CCTK_GetVarIndex(splitstring);
+      varnum = CCTK_VarIndex(splitstring);
       if (varnum < 0) {
-        groupnum = CCTK_GetGroupIndex(splitstring);
+        groupnum = CCTK_GroupIndex(splitstring);
         if (groupnum < 0) {
           char *msg;
           msg = (char *)malloc((100+strlen(splitstring))*sizeof(char));
@@ -272,8 +272,8 @@ int InitIONum(int *array, char *string)
           free(msg);
         } else {
           /* We have a group so now need all the variables in the group */
-          first = CCTK_GetFirstVarIndex_ByIndex(groupnum);
-          last = first+CCTK_GetNumVarsInGroup_ByIndex(groupnum)-1;
+          first = CCTK_FirstVarIndexI(groupnum);
+          last = first+CCTK_NumVarsInGroupI(groupnum)-1;
           for (index=first;index<=last;index++)
             array[index] = 1;
         }