Carpet: Make QueryGroupStorage not abort

Return an error code instead of causing an assertion failure when an
illegal group is specified, or when grid function storage is queried
in global mode.

darcs-hash:20060603032047-dae7b-b219ec996d06afdd249f4b89bb79909cdc1ddd74.gz

1 files changed, 7 insertions, 2 deletions

diff --git a/Carpet/Carpet/src/Storage.cc b/Carpet/Carpet/src/Storage.cc
index 1e564375f..5121b5cd3 100644
--- a/Carpet/Carpet/src/Storage.cc
+++ b/Carpet/Carpet/src/Storage.cc
@@ -262,9 +262,14 @@ namespace Carpet {
     if (groupname) {
       group = CCTK_GroupIndex(groupname);
     }
-    assert (group>=0 and group<CCTK_NumGroups());
+    if (group<0 or group>=CCTK_NumGroups()) {
+      CCTK_WARN (1, "QueryGroupStorage: illegal group specified");
+      return -1;
+    }
     int const grouptype = CCTK_GroupTypeI (group);
-    if (is_meta_mode() or is_global_mode()) assert (grouptype != CCTK_GF);
+    if (is_meta_mode() or is_global_mode()) {
+      if (grouptype == CCTK_GF) return -2;
+    }
     int const rl = grouptype == CCTK_GF ? reflevel : 0;
     // Return whether storage is allocated
     assert (groupdata.at(group).activetimelevels.at(mglevel).at(rl) != deadbeef);