CarpetLib: Correct error in calculating regridding schedule

Regridding when the previous grid hierarchy had fewer levels was not
handled correctly.

darcs-hash:20070312161246-dae7b-f9bdb2990fcbd1bc9f245aaef35398b1a25b60d3.gz

1 files changed, 9 insertions, 3 deletions

diff --git a/Carpet/CarpetLib/src/ggf.cc b/Carpet/CarpetLib/src/ggf.cc
index 7c6ed319b..979e05b54 100644
--- a/Carpet/CarpetLib/src/ggf.cc
+++ b/Carpet/CarpetLib/src/ggf.cc
@@ -379,10 +379,16 @@ void ggf::copycat (comm_state& state,
   assert (c1>=0 and c1<h.components(rl1));
   assert (ml1>=0 and ml1<h.mglevels());
   assert (tl1>=0 and tl1<timelevels(ml1,rl1));
-  assert (           ml2<h.mglevels());
-  assert (rl2>=0 and rl2<h.reflevels());
-  assert (tl2>=0 and tl2<timelevels(ml2,rl2));
   mdata & srcstorage = srcstorage_ ? * srcstorage_ : storage;
+  // Uses wrong grid hierarchy; should use "old h" instead
+  // TODO: keep old grid hierarchy around
+  //assert (           ml2<h.mglevels());
+  //assert (rl2>=0 and rl2<h.reflevels());
+  //assert (tl2>=0 and tl2<timelevels(ml2,rl2));
+  // Cannot use srcstorage, since it may be empty when *recv_pvect is empty
+  //assert (           ml2<(int)srcstorage.size());
+  //assert (rl2>=0 and rl2<(int)srcstorage.AT(ml2).size());
+  //assert (tl2>=0 and tl2<(int)srcstorage.AT(ml2).AT(rl2).AT(0).size());
   // walk all components
   static Timer copycat1 ("copycat_pvect_1");
   copycat1.start ();