Carpet: Allow querying storage in global mode

darcs-hash:20060418165635-dae7b-005505f08c269cb24ca44c9bf1ca5a0e4ed9d816.gz

1 files changed, 8 insertions, 7 deletions

diff --git a/Carpet/Carpet/src/Storage.cc b/Carpet/Carpet/src/Storage.cc
index 257154704..c7b0d9734 100644
--- a/Carpet/Carpet/src/Storage.cc
+++ b/Carpet/Carpet/src/Storage.cc
@@ -80,13 +80,6 @@ namespace Carpet {
       // Check an assumption
       if (not gp.vectorgroup) assert (gp.vectorlength == 1);
       
-      // No storage change in local mode
-      if (gp.grouptype == CCTK_GF) {
-        assert ((map == -1 or maps == 1)
-                and (component == -1
-                     or vhh.at(0)->local_components(reflevel) == 1));
-      }
-      
       // Allocate the time levels
       for (int ml=min_ml; ml<max_ml; ++ml) {
         for (int rl=min_rl; rl<max_rl; ++rl) {
@@ -122,6 +115,14 @@ namespace Carpet {
             }
             assert (can_do);
             
+            // No storage change in local mode
+            // TODO: This this seems superfluous, given the test above
+            if (gp.grouptype == CCTK_GF) {
+              assert ((map == -1 or maps == 1)
+                      and (component == -1
+                           or vhh.at(0)->local_components(reflevel) == 1));
+            }
+            
             // Set the new number of active time levels
             groupdata.at(group).activetimelevels.at(ml).at(rl) = timelevels[n];