Enable multiple maps

darcs-hash:20040504201149-07bb3-cf7f9bfd2004d97467cac41637826e0fe00193b7.gz

1 files changed, 7 insertions, 8 deletions

diff --git a/Carpet/CarpetReduce/src/reduce.cc b/Carpet/CarpetReduce/src/reduce.cc
index b3a356858..ba7ce1328 100644
--- a/Carpet/CarpetReduce/src/reduce.cc
+++ b/Carpet/CarpetReduce/src/reduce.cc
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.cc,v 1.36 2004/03/31 16:38:21 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.cc,v 1.37 2004/05/04 22:11:49 schnetter Exp $
 
 #include <assert.h>
 #include <float.h>
@@ -23,7 +23,7 @@
 #include "reduce.hh"
 
 extern "C" {
-  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.cc,v 1.36 2004/03/31 16:38:21 schnetter Exp $";
+  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.cc,v 1.37 2004/05/04 22:11:49 schnetter Exp $";
   CCTK_FILEVERSION(Carpet_CarpetReduce_reduce_cc);
 }
 
@@ -891,13 +891,12 @@ namespace CarpetReduce {
     Initialise (cgh, proc, num_invars * num_outvals, &myoutvals[0], outtype,
                 &mycounts[0], red);
     
-    // Multiple maps are not supported
-    // (because we don't know how to select a map)
-    assert (maps == 1);
-    const int m = 0;
-    
+    // Ensure that all maps have the same number of refinement levels
+    for (int m=0; m<(int)vhh.size(); ++m) {
+      assert (vhh.at(m)->reflevels() == vhh.at(0)->reflevels());
+    }
     int const minrl = reduce_arrays ? 0 : reflevel==-1 ? 0                      : reflevel;
-    int const maxrl = reduce_arrays ? 1 : reflevel==-1 ? vhh.at(m)->reflevels() : reflevel+1;
+    int const maxrl = reduce_arrays ? 1 : reflevel==-1 ? vhh.at(0)->reflevels() : reflevel+1;
     
     BEGIN_GLOBAL_MODE(cgh) {
       for (int rl=minrl; rl<maxrl; ++rl) {