Changed the way output is handled. Now output is per refinement level

Changed the way output is handled.  Now output is per refinement level
only.  A single cctk_iteration is now a time step on the finest grid,
instead of a time step on the coarsest grid.  The analysis stage
should now work on the finer grid.

darcs-hash:20010316203212-f6438-36f1809e816f4b3ae73a1a837c0fcd8d81616120.gz

2 files changed, 9 insertions, 9 deletions

diff --git a/Carpet/CarpetLib/src/dh.cc b/Carpet/CarpetLib/src/dh.cc
index ba3cb79df..573e9b426 100644
--- a/Carpet/CarpetLib/src/dh.cc
+++ b/Carpet/CarpetLib/src/dh.cc
@@ -6,7 +6,7 @@
     copyright            : (C) 2000 by Erik Schnetter
     email                : schnetter@astro.psu.edu
 
-    $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/dh.cc,v 1.7 2001/03/13 17:40:38 eschnett Exp $
+    $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/dh.cc,v 1.8 2001/03/16 21:32:17 eschnett Exp $
 
  ***************************************************************************/
 
@@ -162,14 +162,14 @@ void dh<D>::recompose () {
       	if (rl<h.reflevels()-1) {
       	  for (int cc=0; cc<h.components(rl+1); ++cc) {
       	    const ibbox intrf = boxes[rl+1][cc][ml].interior;
-      	    const ibbox extrf = boxes[rl+1][cc][ml].exterior;
+// 	    const ibbox extrf = boxes[rl+1][cc][ml].exterior;
       	    // Restriction (interior)
       	    {
       	      // (the restriction may fill the interior of the of the
-      	      // coarse grid, and may use the exterior of the fine
+      	      // coarse grid, and may use the interior of the fine
       	      // grid, and the bbox must be as large as possible)
-      	      const ibbox recv = extrf.contracted_for(intr) & intr;
-      	      const ibbox send = recv.expanded_for(extrf);
+      	      const ibbox recv = intrf.contracted_for(intr) & intr;
+      	      const ibbox send = recv.expanded_for(intrf);
       	      boxes[rl+1][cc][ml].send_ref_coarse[c ].push_back(send);
       	      boxes[rl  ][c ][ml].recv_ref_fine  [cc].push_back(recv);
       	    }
diff --git a/Carpet/CarpetLib/src/gdata.cc b/Carpet/CarpetLib/src/gdata.cc
index fa852b881..40a6338cf 100644
--- a/Carpet/CarpetLib/src/gdata.cc
+++ b/Carpet/CarpetLib/src/gdata.cc
@@ -5,7 +5,7 @@
     copyright            : (C) 2000 by Erik Schnetter
     email                : schnetter@astro.psu.edu
 
-    $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gdata.cc,v 1.6 2001/03/12 16:54:25 eschnett Exp $
+    $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gdata.cc,v 1.7 2001/03/16 21:32:17 eschnett Exp $
 
  ***************************************************************************/
 
@@ -58,7 +58,7 @@ void generic_data<D>::write_ascii (const string name, const int time,
   assert (_has_storage);
   CHECKPOINT;
   
-  if (_proc==0) {
+  if (proc()==0) {
     // output on processor 0
     
     int rank;
@@ -118,8 +118,8 @@ void generic_data<D>::write_ascii (const string name, const int time,
     // copy to processor 0 and output there
     
     generic_data* const tmp = make_typed();
-    tmp->allocate(_extent, 0);
-    tmp->copy_from (this, _extent);
+    tmp->allocate(extent(), 0);
+    tmp->copy_from (this, extent());
     tmp->write_ascii (name, time, org, dirs, tl, rl, c, ml);
     delete tmp;