Carpet: skip empty groups in Poison.cc

darcs-hash:20050601161546-776a0-17fe72e400a9f2326f8fce3e15176b0892f77a3b.gz

1 files changed, 3 insertions, 4 deletions

diff --git a/Carpet/Carpet/src/Poison.cc b/Carpet/Carpet/src/Poison.cc
index 101c98922..e97e8a4f6 100644
--- a/Carpet/Carpet/src/Poison.cc
+++ b/Carpet/Carpet/src/Poison.cc
@@ -47,10 +47,9 @@ namespace Carpet {
       return;
     }
     
-    const int nvar = CCTK_NumVarsInGroupI(group);
-    if (nvar == 0) return;
     const int n0 = CCTK_FirstVarIndexI(group);
     assert (n0>=0);
+    const int nvar = CCTK_NumVarsInGroupI(group);
     const int sz = CCTK_VarTypeSize(CCTK_VarTypeI(n0));
     assert (sz>0);
     
@@ -103,12 +102,12 @@ namespace Carpet {
     Checkpoint ("PoisonCheck");
     
     for (int group=0; group<CCTK_NumGroups(); ++group) {
-      const int nvar = CCTK_NumVarsInGroupI(group);
-      if (nvar > 0 && CCTK_QueryGroupStorageI(cgh, group)) {
+      if (CCTK_QueryGroupStorageI(cgh, group)) {
         
         const int grouptype = CCTK_GroupTypeI(group);
         const int n0 = CCTK_FirstVarIndexI(group);
         assert (n0>=0);
+        const int nvar = CCTK_NumVarsInGroupI(group);
         const int tp = CCTK_VarTypeI(n0);
         const int gpdim = groupdata.at(group).info.dim;