Fixing rscid warnings, untabified files, combined identical case statements

for GROUP_GF and GROUP_ARRAY.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGH/PUGH/trunk@203 b61c5cb5-eaca-4651-9a7a-d64986f99364

1 files changed, 29 insertions, 72 deletions

diff --git a/src/Comm.c b/src/Comm.c
index 53f0416..b855d8e 100644
--- a/src/Comm.c
+++ b/src/Comm.c
@@ -25,6 +25,8 @@
 
 static char *rcsid="$Header$";
 
+CCTK_FILEVERSION (CactusPUGH_PUGH_Comm_c);
+
 static int totalstorage=0; /* Storage for GAs in Bytes */
 static int totalnumber=0; /* Number of stored GAs */
 
@@ -121,13 +123,6 @@ int pugh_SyncGroup (cGH *GH, const char *groupname)
       break;
 
     case GROUP_ARRAY  :
-      rc = pugh_SyncGroupGA (GH, 
-                             group, 
-                             pgroup.vartype, 
-                             pgroup.numvars, 
-                             timelevel);
-      break;
-
     case GROUP_GF     :
       rc = pugh_SyncGroupGA (GH, 
                              group, 
@@ -308,11 +303,8 @@ int pugh_QueryGroupStorage(cGH *GH, int group, const char *groupname)
   first = CCTK_FirstVarIndexI(group);
   if (first < 0) 
   {
-    char *msg;
-    msg = (char *) malloc (strlen (groupname) + 80);
-    sprintf (msg, "Invalid group ID %d in pugh_QueryGroupStorage", group);
-    CCTK_WARN (1, msg);
-    free (msg);
+    CCTK_VWarn (1, __LINE__, __FILE__, CCTK_THORNSTRING,
+                "Invalid group ID %d in pugh_QueryGroupStorage", group);
   }
  
   /* get PUGH extension handle */
@@ -408,6 +400,7 @@ int pugh_EnableGroupStorage(cGH *GH, const char *groupname)
       break;
 
     case CCTK_ARRAY  :
+    case CCTK_GF     :
       rc = pugh_EnableArrayGroupStorage (GH, 
                                          group, 
                                          pgroup.vartype, 
@@ -416,15 +409,6 @@ int pugh_EnableGroupStorage(cGH *GH, const char *groupname)
                                          pgroup.numtimelevels);
       break;
 
-    case CCTK_GF     :
-      rc = pugh_EnableArrayGroupStorage (GH, 
-					 group, 
-					 pgroup.vartype, 
-					 pgroup.dim, 
-					 pgroup.numvars,
-					 pgroup.numtimelevels);
-      break;
-
     default :
       CCTK_WARN (1, "Unknown group type in pugh_EnableGroupStorage");
       rc = 0;
@@ -445,12 +429,12 @@ int pugh_EnableGroupStorage(cGH *GH, const char *groupname)
       /* Memory toggled */
       totalnumber = totalnumber + pgroup.numvars;
       totalstorage = totalstorage +
-	((pGA ***)pughGH->variables)[first_var][0]->extras->npoints
-	*CCTK_VarTypeSize(pgroup.vartype)
-	*pgroup.numtimelevels
-	*pgroup.numvars;
+        ((pGA ***)pughGH->variables)[first_var][0]->extras->npoints
+        *CCTK_VarTypeSize(pgroup.vartype)
+        *pgroup.numtimelevels
+        *pgroup.numvars;
       printf("Switched memory on for %s \n  [Num Arrays: %d Total Size: %d]\n",
-	     groupname,totalnumber,totalstorage);
+             groupname,totalnumber,totalstorage);
     }
     else if (rc == 1)
     {
@@ -498,6 +482,7 @@ int pugh_DisableGroupStorage(cGH *GH, const char *groupname)
   int level;
   int first_var,var;
   int unchanged;           /* count how many aren't toggled */
+  int pugh_DisableGADataStorage(pGA *GA);
 
   /* get PUGH extension handle */
   pughGH = (pGH *) GH->extensions [PUGH_GHExtension];
@@ -523,24 +508,13 @@ int pugh_DisableGroupStorage(cGH *GH, const char *groupname)
       break;
 
     case GROUP_ARRAY  :
-      for (var = first_var; var < first_var+pgroup.numvars; var++)
-      {
-        for (level = 0; level < pgroup.numtimelevels; level++)
-        {
-          unchanged = unchanged + 
-	    pugh_DisableGADataStorage ((pGA *)(pughGH->variables[var][level]));
-        }
-      }
-      rc = 1;
-      break;
-
     case GROUP_GF     :
       for (var = first_var; var < first_var+pgroup.numvars; var++)
       {
         for (level = 0; level < pgroup.numtimelevels; level++)
         {
           unchanged = unchanged + 
-	    pugh_DisableGADataStorage ((pGA *)(pughGH->variables[var][level]));
+            pugh_DisableGADataStorage ((pGA *)(pughGH->variables[var][level]));
         }
       }
       rc = 1;
@@ -560,12 +534,12 @@ int pugh_DisableGroupStorage(cGH *GH, const char *groupname)
       /* Memory toggled */
       totalnumber = totalnumber - pgroup.numvars;
       totalstorage = totalstorage - 
-	((pGA ***)pughGH->variables)[first_var][0]->extras->npoints
-	*CCTK_VarTypeSize(pgroup.vartype)
-	*pgroup.numtimelevels
-	*pgroup.numvars;
+        ((pGA ***)pughGH->variables)[first_var][0]->extras->npoints
+        *CCTK_VarTypeSize(pgroup.vartype)
+        *pgroup.numtimelevels
+        *pgroup.numvars;
       printf("Switched memory off for %s \n  [Num Arrays: %d Total Size: %d]\n",
-	     groupname,totalnumber,totalstorage);
+             groupname,totalnumber,totalstorage);
     }
     else if (unchanged == pgroup.numvars)
     {
@@ -633,17 +607,6 @@ int pugh_EnableGroupComm (cGH *GH, const char *groupname)
       break;
 
     case GROUP_ARRAY  :
-      for (var = first_var; var < first_var+pgroup.numvars; var++)
-      {
-        for (level = 0; level < pgroup.numtimelevels; level++)
-        {
-          pugh_GAComm ((pGA *)(pughGH->variables[var][level]), 
-                             PUGH_ALLCOMM);
-        }
-      }
-      rc = 1;
-      break;
-
     case GROUP_GF     :
       for (var = first_var; var < first_var+pgroup.numvars; var++)
       {
@@ -717,23 +680,11 @@ int pugh_DisableGroupComm(cGH *GH, const char *groupname)
       break;
 
     case GROUP_ARRAY  :
-      for (var = first_var; var < first_var+pgroup.numvars; var++)
-      {
-        for (level = 0; level < pgroup.numtimelevels; level++)
-        {
-	    pugh_GAComm ((pGA *)(pughGH->variables[var][level]), 
-			 PUGH_NOCOMM);
-        }
-      }
-      rc = 1;
-      break;
-
     case GROUP_GF     :
       for (var = first_var; var < first_var+pgroup.numvars; var++)
         for (level = 0; level < pgroup.numtimelevels; level++)
         {
-	    pugh_GAComm ((pGA *)(pughGH->variables[var][level]), 
-			 PUGH_NOCOMM);
+          pugh_GAComm ((pGA *)(pughGH->variables[var][level]), PUGH_NOCOMM);
         }
       rc = 1;
       break;
@@ -938,21 +889,27 @@ int pugh_SyncGAs(pGH *pughGH,
       for (i=0;i<n_vars;i++)
       {
         int id = i*4;
-	GA = (pGA *) (pughGH->variables [i][timelevel]);
+        GA = (pGA *) (pughGH->variables [i][timelevel]);
         if (GA->docomm[2*Dir] &&
-            GA->storage) {
+            GA->storage)
+        {
           sr[id] = GA->sreq[2*Dir];
           sr[id+1] = GA->rreq[2*Dir];
-        } else {
+        }
+        else
+        {
           sr[id] = MPI_REQUEST_NULL;
           sr[id+1] = MPI_REQUEST_NULL;
         }
         
         if (GA->docomm[2*Dir+1] &&
-            GA->storage) {
+            GA->storage)
+        {
           sr[id+2] = GA->sreq[2*Dir+1];
           sr[id+3] = GA->rreq[2*Dir+1];
-        } else {
+        }
+        else
+        {
           sr[id+2] = MPI_REQUEST_NULL;
           sr[id+3] = MPI_REQUEST_NULL;
         }