Fix the return values of CactusDefaultGroupStorage{In,De}crease. They

cannot rely on CCTK_{En,Dis}ableGroupStorage, becuase those just
return a flag.  Explicltly call CCTK_QueryGroupStorageI and
CCTK_NumTimeLevelsI.


git-svn-id: http://svn.cactuscode.org/flesh/trunk@3516 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 20 insertions, 14 deletions

diff --git a/src/comm/CactusDefaultComm.c b/src/comm/CactusDefaultComm.c
index 6b16fa90..f8b28ab0 100644
--- a/src/comm/CactusDefaultComm.c
+++ b/src/comm/CactusDefaultComm.c
@@ -654,18 +654,21 @@ int CactusDefaultGroupStorageIncrease (const cGH *GH, int n_groups,
          * false and did all timelevels, only enable storage if timelevels is
          not 0
          */
-        value = 0;
+        if(CCTK_QueryGroupStorageI(GH, groups[i]))
+        {
+          value = CCTK_NumTimeLevelsI(groups[i]);
+        }
+        else
+        {
+          value = 0;
+        }
         if(timelevels[i] != 0)
         {
           gname = CCTK_GroupName(groups[i]);
-          value = CCTK_EnableGroupStorage(GH, gname);
+          CCTK_EnableGroupStorage(GH, gname);
           free (gname);
-          if (value)
-          {
-            value = CCTK_NumTimeLevelsI(groups[i]);
-          }
-          retval += value;
         }
+        retval += value;
         if(status)
         {
           status[i] = value;
@@ -760,18 +763,21 @@ int CactusDefaultGroupStorageDecrease (const cGH *GH, int n_groups,
         /* Since the old enable and disable group storage just returned true or
          * false and did all timelevels, only disable storage if timelevels is 0
          */
-        value = 0;
+        if(CCTK_QueryGroupStorageI(GH, groups[i]))
+        {
+          value = CCTK_NumTimeLevelsI(groups[i]);
+        }
+        else
+        {
+          value = 0;
+        }
         if(timelevels[i] == 0)
         {
           gname = CCTK_GroupName(groups[i]);
-          value = CCTK_DisableGroupStorage(GH, gname);
+          CCTK_DisableGroupStorage(GH, gname);
           free (gname);
-          if (value)
-          {
-            value = CCTK_NumTimeLevelsI(groups[i]);
-          }
-          retval += value;
         }
+        retval += value;
         if(status)
         {
           status[i] = value;