1 files changed, 9 insertions, 51 deletions

diff --git a/src/Comm.c b/src/Comm.c
index b37331c..f83268c 100644
--- a/src/Comm.c
+++ b/src/Comm.c
@@ -40,7 +40,6 @@ static int PUGH_SyncSingleProc(pGH *pughGH, pComm *comm);
    @date       30 Mar 1999
    @desc
                Synchronizes all variables in the group indicated by groupname.
-               Only groups of type GROUP_ARRAY and GROUP_GF can be synchronized.
    @enddesc
    @calls      PUGH_SyncGArrayGroup
 
@@ -57,7 +56,6 @@ static int PUGH_SyncSingleProc(pGH *pughGH, pComm *comm);
 
    @returntype int
    @returndesc
-                0 for grid scalar groups<BR>
                   return code of @seeroutine PUGH_SyncGArrayGroup
                   for grid array groups<BR>
                -1 for an unknown group or group type
@@ -86,21 +84,7 @@ int PUGH_SyncGroup(const cGH *GH, const char *groupname)
   {
     CCTK_GroupData(group, &pgroup);
 
-    if (pgroup.grouptype == CCTK_SCALAR)
-    {
-      retval = 0;
-      CCTK_VWarn(4, __LINE__, __FILE__, CCTK_THORNSTRING,
-                 "PUGH_SyncGroup: Synchronising scalar group: %s",groupname);
-    }
-    else if (pgroup.grouptype == CCTK_GF || pgroup.grouptype == CCTK_ARRAY)
-    {
-      retval = PUGH_SyncGArrayGroup(PUGH_pGH(GH), CCTK_FirstVarIndexI(group));
-    }
-    else
-    {
-      CCTK_WARN(1, "PUGH_SyncGroup: Unknown group type");
-      retval = -1;
-    }
+    retval = PUGH_SyncGArrayGroup(PUGH_pGH(GH), CCTK_FirstVarIndexI(group));
   }
 
   return (retval);
@@ -130,7 +114,6 @@ int PUGH_SyncGroup(const cGH *GH, const char *groupname)
 
    @returntype int
    @returndesc
-                1 for grid scalar groups<BR>
                   return code of @seeroutine PUGH_EnableGArrayGroupComm
                   for grid array groups<BR>
                -1 for an unknown group type
@@ -151,21 +134,9 @@ int PUGH_EnableGroupComm(const cGH *GH, const char *groupname)
   group = CCTK_GroupIndex(groupname);
   CCTK_GroupData(group, &pgroup);
 
-  if (pgroup.grouptype == CCTK_SCALAR)
-  {
-    retval = 1;
-  }
-  else if (pgroup.grouptype == CCTK_GF || pgroup.grouptype == CCTK_ARRAY)
-  {
-    retval = PUGH_EnableGArrayGroupComm(PUGH_pGH(GH),
-                                    CCTK_FirstVarIndexI(group),
-                                    PUGH_ALLCOMM);
-  }
-  else
-  {
-    CCTK_WARN(1, "Unknown group type in PUGH_EnableGroupComm");
-    retval = -1;
-  }
+  retval = PUGH_EnableGArrayGroupComm(PUGH_pGH(GH),
+                                      CCTK_FirstVarIndexI(group),
+                                      PUGH_ALLCOMM);
 
   return (retval);
 }
@@ -194,7 +165,6 @@ int PUGH_EnableGroupComm(const cGH *GH, const char *groupname)
 
    @returntype int
    @returndesc
-                1 for grid scalar groups<BR>
                   return code of @seeroutine PUGH_DisableGArrayGroupComm
                   for grid array groups<BR>
                -1 for an unknown group type
@@ -217,24 +187,12 @@ int PUGH_DisableGroupComm(const cGH *GH, const char *groupname)
   group = CCTK_GroupIndex(groupname);
   CCTK_GroupData(group, &pgroup);
 
-  if (pgroup.grouptype == CCTK_SCALAR)
-  {
-    retval = 1;
-  }
-  else if (pgroup.grouptype == CCTK_GF || pgroup.grouptype == CCTK_ARRAY)
-  {
-    first_var = CCTK_FirstVarIndexI(group);
-    pughGH = PUGH_pGH(GH);
-    GA = (pGA *) pughGH->variables[first_var][0];
+  first_var = CCTK_FirstVarIndexI(group);
+  pughGH = PUGH_pGH(GH);
+  GA = (pGA *) pughGH->variables[first_var][0];
 
-    /* FIXME:  workaround.  This one is really bad ! */
-    retval = PUGH_DisableGArrayGroupComm(pughGH, first_var, GA->groupcomm);
-  }
-  else
-  {
-    CCTK_WARN(1, "Unknown group type in PUGH_DisableGroupComm");
-    retval = -1;
-  }
+  /* FIXME:  workaround.  This one is really bad ! */
+  retval = PUGH_DisableGArrayGroupComm(pughGH, first_var, GA->groupcomm);
 
   return (retval);
 }