Index: Layout/LayoutBase.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Layout/LayoutBase.h,v
retrieving revision 1.22
diff -c -p -r1.22 LayoutBase.h
*** Layout/LayoutBase.h	2001/05/04 15:41:28	1.22
--- Layout/LayoutBase.h	2001/05/29 22:01:13
*************** public:
*** 131,142 ****
    LayoutBaseData()
      :
      ID_m(Unique::get()),
      hasInternalGuards_m(false), 
      hasExternalGuards_m(false), 
-     externalGuards_m(0), 
      internalGuards_m(0),
!     domain_m(Interval<Dim>()), 
!     innerdomain_m(Interval<Dim>())
    {
    }
  
--- 131,142 ----
    LayoutBaseData()
      :
      ID_m(Unique::get()),
+     domain_m(Interval<Dim>()), 
+     innerdomain_m(Interval<Dim>()),
      hasInternalGuards_m(false), 
      hasExternalGuards_m(false), 
      internalGuards_m(0),
!     externalGuards_m(0)
    {
    }
  
*************** public:
*** 145,156 ****
  		 Domain_t d, Domain_t id)
      :
      ID_m(Unique::get()),
      hasInternalGuards_m(hasIG), 
      hasExternalGuards_m(hasEG), 
-     externalGuards_m(eg), 
      internalGuards_m(ig),
!     domain_m(d), 
!     innerdomain_m(id)
    {
    }
  
--- 145,156 ----
  		 Domain_t d, Domain_t id)
      :
      ID_m(Unique::get()),
+     domain_m(d), 
+     innerdomain_m(id),
      hasInternalGuards_m(hasIG), 
      hasExternalGuards_m(hasEG), 
      internalGuards_m(ig),
!     externalGuards_m(eg) 
    {
    }
  
Index: Layout/UniformGridLayout.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Layout/UniformGridLayout.h,v
retrieving revision 1.82
diff -c -p -r1.82 UniformGridLayout.h
*** Layout/UniformGridLayout.h	2001/05/04 15:41:28	1.82
--- Layout/UniformGridLayout.h	2001/05/29 22:01:14
*************** public:
*** 1629,1637 ****
  template <int Dim>
  inline UniformGridLayout<Dim>::
  UniformGridLayout()
! : Observable<This_t>(*this), 
!   LayoutBase<Dim,UniformGridLayoutData<Dim> >
!     (new LayoutData_t())
  { 
    pdata_m->attach(*this);
  }
--- 1629,1637 ----
  template <int Dim>
  inline UniformGridLayout<Dim>::
  UniformGridLayout()
! : LayoutBase<Dim,UniformGridLayoutData<Dim> >
!     (new LayoutData_t()),
!   Observable<This_t>(*this)
  { 
    pdata_m->attach(*this);
  }
*************** template <int Dim>
*** 1640,1650 ****
  inline UniformGridLayout<Dim>::
  UniformGridLayout(const Domain_t &gdom,
  		  const DistributedTag& t)
! : Observable<This_t>(*this), 
!   LayoutBase<Dim,UniformGridLayoutData<Dim> >
      (new LayoutData_t(gdom,
  		      UniformGridPartition<Dim>(),
! 		      DistributedMapper<Dim>(UniformGridPartition<Dim>())))
  {
    pdata_m->attach(*this);
  }
--- 1640,1650 ----
  inline UniformGridLayout<Dim>::
  UniformGridLayout(const Domain_t &gdom,
  		  const DistributedTag& t)
! : LayoutBase<Dim,UniformGridLayoutData<Dim> >
      (new LayoutData_t(gdom,
  		      UniformGridPartition<Dim>(),
! 		      DistributedMapper<Dim>(UniformGridPartition<Dim>()))),
!   Observable<This_t>(*this)
  {
    pdata_m->attach(*this);
  }
*************** template <int Dim>
*** 1653,1663 ****
  inline UniformGridLayout<Dim>::
  UniformGridLayout(const Domain_t &gdom,
  		  const ReplicatedTag & t)
! : Observable<This_t>(*this), 
!   LayoutBase<Dim,UniformGridLayoutData<Dim> >
      (new LayoutData_t(gdom,
  		      UniformGridPartition<Dim>(),
! 		      LocalMapper<Dim>()))
  {
    pdata_m->attach(*this);
  }
--- 1653,1663 ----
  inline UniformGridLayout<Dim>::
  UniformGridLayout(const Domain_t &gdom,
  		  const ReplicatedTag & t)
! : LayoutBase<Dim,UniformGridLayoutData<Dim> >
      (new LayoutData_t(gdom,
  		      UniformGridPartition<Dim>(),
! 		      LocalMapper<Dim>())),
!   Observable<This_t>(*this)
  {
    pdata_m->attach(*this);
  }
*************** inline UniformGridLayout<Dim>::
*** 1667,1677 ****
  UniformGridLayout(const Domain_t &gdom, 
  		  const GuardLayers_t &gcs,
  		  const DistributedTag &)
! : Observable<This_t>(*this), 
!   LayoutBase<Dim,UniformGridLayoutData<Dim> >
      (new LayoutData_t(gdom,
  		      UniformGridPartition<Dim>(gcs),
! 		      DistributedMapper<Dim>(UniformGridPartition<Dim>(gcs))))
  {
    pdata_m->attach(*this);
  }
--- 1667,1677 ----
  UniformGridLayout(const Domain_t &gdom, 
  		  const GuardLayers_t &gcs,
  		  const DistributedTag &)
! : LayoutBase<Dim,UniformGridLayoutData<Dim> >
      (new LayoutData_t(gdom,
  		      UniformGridPartition<Dim>(gcs),
! 		      DistributedMapper<Dim>(UniformGridPartition<Dim>(gcs)))),
!   Observable<This_t>(*this)
  {
    pdata_m->attach(*this);
  }
*************** inline UniformGridLayout<Dim>::
*** 1681,1691 ****
  UniformGridLayout(const Domain_t &gdom, 
  		  const GuardLayers_t &gcs,
  		  const ReplicatedTag & )
! : Observable<This_t>(*this), 
!   LayoutBase<Dim,UniformGridLayoutData<Dim> >
      (new LayoutData_t(gdom,
  		      UniformGridPartition<Dim>(gcs),
! 		      LocalMapper<Dim>()))
  {
    pdata_m->attach(*this);
  }
--- 1681,1691 ----
  UniformGridLayout(const Domain_t &gdom, 
  		  const GuardLayers_t &gcs,
  		  const ReplicatedTag & )
! : LayoutBase<Dim,UniformGridLayoutData<Dim> >
      (new LayoutData_t(gdom,
  		      UniformGridPartition<Dim>(gcs),
! 		      LocalMapper<Dim>())),
!   Observable<This_t>(*this)
  {
    pdata_m->attach(*this);
  }
*************** inline UniformGridLayout<Dim>::
*** 1695,1706 ****
  UniformGridLayout(const Domain_t &gdom, 
  		  const Loc<Dim> &blocks,
  		  const DistributedTag & )
! : Observable<This_t>(*this), 
!   LayoutBase<Dim,UniformGridLayoutData<Dim> >
      (new LayoutData_t(gdom,
  		      UniformGridPartition<Dim>(blocks),
  		      DistributedMapper<Dim>(
!                          UniformGridPartition<Dim>(blocks))))
  {
    pdata_m->attach(*this);
  }
--- 1695,1706 ----
  UniformGridLayout(const Domain_t &gdom, 
  		  const Loc<Dim> &blocks,
  		  const DistributedTag & )
! : LayoutBase<Dim,UniformGridLayoutData<Dim> >
      (new LayoutData_t(gdom,
  		      UniformGridPartition<Dim>(blocks),
  		      DistributedMapper<Dim>(
! 		        UniformGridPartition<Dim>(blocks)))),
!   Observable<This_t>(*this)
  {
    pdata_m->attach(*this);
  }
*************** inline UniformGridLayout<Dim>::
*** 1710,1720 ****
  UniformGridLayout(const Domain_t &gdom, 
  		  const Loc<Dim> &blocks,
  		  const ReplicatedTag & t)
! : Observable<This_t>(*this), 
!   LayoutBase<Dim,UniformGridLayoutData<Dim> >
      (new LayoutData_t(gdom,
  		      UniformGridPartition<Dim>(blocks),
! 		      LocalMapper<Dim>()))
  {
    pdata_m->attach(*this);
  }
--- 1710,1720 ----
  UniformGridLayout(const Domain_t &gdom, 
  		  const Loc<Dim> &blocks,
  		  const ReplicatedTag & t)
! : LayoutBase<Dim,UniformGridLayoutData<Dim> >
      (new LayoutData_t(gdom,
  		      UniformGridPartition<Dim>(blocks),
! 		      LocalMapper<Dim>())),
!   Observable<This_t>(*this)
  {
    pdata_m->attach(*this);
  }
*************** UniformGridLayout(const Domain_t &gdom, 
*** 1725,1736 ****
                    const Loc<Dim> &blocks, 
                    const GuardLayers_t &igcs,
  		  const DistributedTag &)
! : Observable<This_t>(*this), 
!  LayoutBase<Dim,UniformGridLayoutData<Dim> >
     (new LayoutData_t(gdom,
  		     UniformGridPartition<Dim>(blocks,igcs),
  		     DistributedMapper<Dim>(
!                        UniformGridPartition<Dim>(blocks,igcs))))
  {
    pdata_m->attach(*this);
  }
--- 1725,1736 ----
                    const Loc<Dim> &blocks, 
                    const GuardLayers_t &igcs,
  		  const DistributedTag &)
! : LayoutBase<Dim,UniformGridLayoutData<Dim> >
     (new LayoutData_t(gdom,
  		     UniformGridPartition<Dim>(blocks,igcs),
  		     DistributedMapper<Dim>(
! 		      UniformGridPartition<Dim>(blocks,igcs)))),
!   Observable<This_t>(*this)
  {
    pdata_m->attach(*this);
  }
*************** UniformGridLayout(const Domain_t &gdom, 
*** 1741,1751 ****
                    const Loc<Dim> &blocks, 
                    const GuardLayers_t &igcs,
  		  const ReplicatedTag &)
!   : Observable<This_t>(*this), 
!     LayoutBase<Dim,UniformGridLayoutData<Dim> >
!        (new LayoutData_t(gdom,
! 			 UniformGridPartition<Dim>(blocks,igcs),
! 			 LocalMapper<Dim>()))
  {
    pdata_m->attach(*this);
  }
--- 1741,1751 ----
                    const Loc<Dim> &blocks, 
                    const GuardLayers_t &igcs,
  		  const ReplicatedTag &)
! : LayoutBase<Dim,UniformGridLayoutData<Dim> >
!      (new LayoutData_t(gdom,
! 		       UniformGridPartition<Dim>(blocks,igcs),
! 		       LocalMapper<Dim>())),
!   Observable<This_t>(*this)
  {
    pdata_m->attach(*this);
  }
*************** UniformGridLayout(const Domain_t &gdom, 
*** 1758,1769 ****
                    const GuardLayers_t &egcs,
  		  const DistributedTag &)
       
! : Observable<This_t>(*this), 
!  LayoutBase<Dim,UniformGridLayoutData<Dim> >
! (new LayoutData_t(gdom,
! 		  UniformGridPartition<Dim>(blocks,igcs,egcs),
! 		  DistributedMapper<Dim>(
! 		    UniformGridPartition<Dim>(blocks,igcs,egcs))))
  {
    pdata_m->attach(*this);
  }
--- 1758,1769 ----
                    const GuardLayers_t &egcs,
  		  const DistributedTag &)
       
! : LayoutBase<Dim,UniformGridLayoutData<Dim> >
!     (new LayoutData_t(gdom,
! 		      UniformGridPartition<Dim>(blocks,igcs,egcs),
! 		      DistributedMapper<Dim>(
!                        UniformGridPartition<Dim>(blocks,igcs,egcs)))),
!   Observable<This_t>(*this)
  {
    pdata_m->attach(*this);
  }
*************** UniformGridLayout(const Domain_t &gdom, 
*** 1775,1785 ****
                    const GuardLayers_t &igcs, 
                    const GuardLayers_t &egcs,
  		  const ReplicatedTag &t)
! : Observable<This_t>(*this), 
!  LayoutBase<Dim,UniformGridLayoutData<Dim> >
      (new LayoutData_t(gdom,
  		      UniformGridPartition<Dim>(blocks,igcs,egcs),
! 		      LocalMapper<Dim>()))
  {
    pdata_m->attach(*this);
  }
--- 1775,1785 ----
                    const GuardLayers_t &igcs, 
                    const GuardLayers_t &egcs,
  		  const ReplicatedTag &t)
! : LayoutBase<Dim,UniformGridLayoutData<Dim> >
      (new LayoutData_t(gdom,
  		      UniformGridPartition<Dim>(blocks,igcs,egcs),
! 		      LocalMapper<Dim>())),
!   Observable<This_t>(*this)
  {
    pdata_m->attach(*this);
  }
*************** inline UniformGridLayout<Dim>::
*** 1790,1798 ****
  UniformGridLayout(const Domain_t &gdom, 
  		  const Partitioner &gpar,
  		  const DistributedTag & )
! : Observable<This_t>(*this),
!   LayoutBase<Dim,UniformGridLayoutData<Dim> >
!    (new LayoutData_t(gdom,gpar,DistributedMapper<Dim>(gpar)))
  {
    pdata_m->attach(*this);
  }
--- 1790,1798 ----
  UniformGridLayout(const Domain_t &gdom, 
  		  const Partitioner &gpar,
  		  const DistributedTag & )
! : LayoutBase<Dim,UniformGridLayoutData<Dim> >
!    (new LayoutData_t(gdom,gpar,DistributedMapper<Dim>(gpar))),
!   Observable<This_t>(*this)
  {
    pdata_m->attach(*this);
  }
*************** inline UniformGridLayout<Dim>::
*** 1803,1811 ****
  UniformGridLayout(const Domain_t &gdom, 
  		  const Partitioner &gpar,
  		  const ReplicatedTag &)
! : Observable<This_t>(*this),
!  LayoutBase<Dim,UniformGridLayoutData<Dim> >
!    (new LayoutData_t(gdom,gpar,LocalMapper<Dim>()))
  {
    pdata_m->attach(*this);
  }
--- 1803,1811 ----
  UniformGridLayout(const Domain_t &gdom, 
  		  const Partitioner &gpar,
  		  const ReplicatedTag &)
! : LayoutBase<Dim,UniformGridLayoutData<Dim> >
!    (new LayoutData_t(gdom,gpar,LocalMapper<Dim>())),
!   Observable<This_t>(*this)
  {
    pdata_m->attach(*this);
  }
*************** inline UniformGridLayout<Dim>::
*** 1816,1824 ****
  UniformGridLayout(const Domain_t &gdom, 
  		  const Partitioner &gpar,
  		  const ContextMapper<Dim> & cmap)
! : Observable<This_t>(*this), 
!  LayoutBase<Dim,UniformGridLayoutData<Dim> >
!    (new LayoutData_t(gdom,gpar,cmap))
  {
    pdata_m->attach(*this);
  }
--- 1816,1824 ----
  UniformGridLayout(const Domain_t &gdom, 
  		  const Partitioner &gpar,
  		  const ContextMapper<Dim> & cmap)
! : LayoutBase<Dim,UniformGridLayoutData<Dim> >
!     (new LayoutData_t(gdom,gpar,cmap)),
!   Observable<This_t>(*this)
  {
    pdata_m->attach(*this);
  }
*************** UniformGridLayout(const Domain_t &gdom, 
*** 1826,1833 ****
  template <int Dim>
  inline UniformGridLayout<Dim>::
  UniformGridLayout(const This_t &model) 
!   : LayoutBase<Dim,UniformGridLayoutData<Dim> >(model.pdata_m),
!     Observable<This_t>(*this)
  { 
     pdata_m->attach(*this);
  }
--- 1826,1833 ----
  template <int Dim>
  inline UniformGridLayout<Dim>::
  UniformGridLayout(const This_t &model) 
! : LayoutBase<Dim,UniformGridLayoutData<Dim> >(model.pdata_m),
!   Observable<This_t>(*this)
  { 
     pdata_m->attach(*this);
  }
Index: Partition/UniformGridPartition.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Partition/UniformGridPartition.h,v
retrieving revision 1.24
diff -c -p -r1.24 UniformGridPartition.h
*** Partition/UniformGridPartition.h	2001/04/18 01:41:44	1.24
--- Partition/UniformGridPartition.h	2001/05/29 22:01:15
*************** public:
*** 223,233 ****
    {
      if (this != &g)
        {
  	hasGuards_m           = g.hasGuards_m;
  	hasCustomEdgeGuards_m = g.hasCustomEdgeGuards_m;
  	internalGuards_m      = g.internalGuards_m;
  	externalGuards_m      = g.externalGuards_m;
- 	blocks_m              = g.blocks();
  	num_m                 = g.maxSize();
        }
      return *this;
--- 223,233 ----
    {
      if (this != &g)
        {
+ 	blocks_m              = g.blocks();
  	hasGuards_m           = g.hasGuards_m;
  	hasCustomEdgeGuards_m = g.hasCustomEdgeGuards_m;
  	internalGuards_m      = g.internalGuards_m;
  	externalGuards_m      = g.externalGuards_m;
  	num_m                 = g.maxSize();
        }
      return *this;
*************** UniformGridPartition(const GuardLayers<D
*** 501,509 ****
  template <int Dim>
  inline UniformGridPartition<Dim>::
  UniformGridPartition(const Loc<Dim> &a)
! : hasGuards_m(false), 
!   hasCustomEdgeGuards_m(false),
!   blocks_m(a) 
  {
    calcNum();
  }
--- 501,509 ----
  template <int Dim>
  inline UniformGridPartition<Dim>::
  UniformGridPartition(const Loc<Dim> &a)
! : blocks_m(a),
!   hasGuards_m(false), 
!   hasCustomEdgeGuards_m(false)
  {
    calcNum();
  }
*************** template <int Dim>
*** 512,522 ****
  inline UniformGridPartition<Dim>::
  UniformGridPartition(const Loc<Dim> &a, 
                       const GuardLayers<Dim> &gcs)
! : hasGuards_m(gcs != 0), 
    hasCustomEdgeGuards_m(false), 
    internalGuards_m(gcs), 
!   externalGuards_m(gcs),
!   blocks_m(a) 
  {
    calcNum();
  }
--- 512,522 ----
  inline UniformGridPartition<Dim>::
  UniformGridPartition(const Loc<Dim> &a, 
                       const GuardLayers<Dim> &gcs)
! : blocks_m(a),
!   hasGuards_m(gcs != 0), 
    hasCustomEdgeGuards_m(false), 
    internalGuards_m(gcs), 
!   externalGuards_m(gcs)
  {
    calcNum();
  }
*************** inline UniformGridPartition<Dim>::
*** 526,536 ****
  UniformGridPartition(const Loc<Dim> &a, 
                       const GuardLayers<Dim> &igcs,
                       const GuardLayers<Dim> &egcs)
! : hasGuards_m(igcs != 0 || egcs != 0), 
    hasCustomEdgeGuards_m(igcs != egcs), 
    internalGuards_m(igcs), 
!   externalGuards_m(egcs),
!   blocks_m(a) 
  {
    calcNum();
  }
--- 526,536 ----
  UniformGridPartition(const Loc<Dim> &a, 
                       const GuardLayers<Dim> &igcs,
                       const GuardLayers<Dim> &egcs)
! : blocks_m(a),
!   hasGuards_m(igcs != 0 || egcs != 0), 
    hasCustomEdgeGuards_m(igcs != egcs), 
    internalGuards_m(igcs), 
!   externalGuards_m(egcs)
  {
    calcNum();
  }
*************** UniformGridPartition(const Loc<Dim> &a, 
*** 538,548 ****
  template <int Dim>
  inline UniformGridPartition<Dim>::
  UniformGridPartition(const UniformGridPartition<Dim> &b)
! : hasGuards_m(b.hasGuards_m), 
    hasCustomEdgeGuards_m(b.hasCustomEdgeGuards_m), 
    internalGuards_m(b.internalGuards_m), 
    externalGuards_m(b.externalGuards_m),
-   blocks_m(b.blocks_m), 
    num_m(b.num_m) 
  { }
  
--- 538,548 ----
  template <int Dim>
  inline UniformGridPartition<Dim>::
  UniformGridPartition(const UniformGridPartition<Dim> &b)
! : blocks_m(b.blocks_m), 
!   hasGuards_m(b.hasGuards_m), 
    hasCustomEdgeGuards_m(b.hasCustomEdgeGuards_m), 
    internalGuards_m(b.internalGuards_m), 
    externalGuards_m(b.externalGuards_m),
    num_m(b.num_m) 
  { }
  
Index: Utilities/RefCountedBlockPtr.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Utilities/RefCountedBlockPtr.h,v
retrieving revision 1.61
diff -c -p -r1.61 RefCountedBlockPtr.h
*** Utilities/RefCountedBlockPtr.h	2001/05/14 21:11:24	1.61
--- Utilities/RefCountedBlockPtr.h	2001/05/29 22:01:15
*************** public:
*** 588,605 ****
    { }
  
    inline RefCountedBlockPtr(size_t size, const T & model)
!     : blockControllerPtr_m(new Controller(size,model)),
!       offset_m(0)
    { }
  
    inline RefCountedBlockPtr(size_t size, const NoInitTag &)
!     : blockControllerPtr_m(new Controller(size,
  #ifndef __MWERKS__
! 					  typename Controller::NoInitTag())),
  #else
! 					  Controller::NoInitTag())),
  #endif
-       offset_m(0)
    { 
  #ifndef __MWERKS__
      blockControllerPtr_m->resize(0,typename Controller::NoInitTag());
--- 588,605 ----
    { }
  
    inline RefCountedBlockPtr(size_t size, const T & model)
!     : offset_m(0),
!       blockControllerPtr_m(new Controller(size,model))
    { }
  
    inline RefCountedBlockPtr(size_t size, const NoInitTag &)
!     : offset_m(0),
!       blockControllerPtr_m(new Controller(size,
  #ifndef __MWERKS__
! 					  typename Controller::NoInitTag()))
  #else
! 					  Controller::NoInitTag()))
  #endif
    { 
  #ifndef __MWERKS__
      blockControllerPtr_m->resize(0,typename Controller::NoInitTag());
*************** public:
*** 613,620 ****
    // but not the bounds checking.
  
    inline RefCountedBlockPtr(T *p, size_t size)
!     : blockControllerPtr_m(new Controller(p, size)),
!       offset_m(0)
    { }
    
    // Copy constructor
--- 613,620 ----
    // but not the bounds checking.
  
    inline RefCountedBlockPtr(T *p, size_t size)
!     : offset_m(0),
!       blockControllerPtr_m(new Controller(p, size))
    { }
    
    // Copy constructor
*************** public:
*** 628,635 ****
    // checking polarity (That_t).
  
    inline RefCountedBlockPtr(const That_t & model)
!     : blockControllerPtr_m(model.blockControllerPtr_m),
!       offset_m(model.offset_m)
    { }
  
    // Copy constructor with offset
--- 628,635 ----
    // checking polarity (That_t).
  
    inline RefCountedBlockPtr(const That_t & model)
!     : offset_m(model.offset_m),
!       blockControllerPtr_m(model.blockControllerPtr_m)
    { }
  
    // Copy constructor with offset