CarpetLib: Allow different numbers of ghost zones on different levels

Allow different numbers of ghost zones and different spatial
prolongation orders on different refinement levels.

1 files changed, 33 insertions, 27 deletions

diff --git a/Carpet/CarpetLib/src/defs.cc b/Carpet/CarpetLib/src/defs.cc
index 4462e1bb8..3bfdcd585 100644
--- a/Carpet/CarpetLib/src/defs.cc
+++ b/Carpet/CarpetLib/src/defs.cc
@@ -330,8 +330,8 @@ template CCTK_REAL ipow (CCTK_REAL x, int y);
 template vect<int,dim> ipow (vect<int,dim> x, int y);
 template vect<CCTK_REAL,dim> ipow (vect<CCTK_REAL,dim> x, int y);
 
-template size_t memoryof (list<bbox<int,dim> > const & l);
-template size_t memoryof (list<vect<int,dim> > const & l);
+template size_t memoryof (list<ibbox> const & l);
+template size_t memoryof (list<ivect> const & l);
 template size_t memoryof (list<dh*> const & l);
 template size_t memoryof (list<gh*> const & l);
 template size_t memoryof (list<gdata*> const & l);
@@ -341,15 +341,16 @@ template size_t memoryof (stack<void*> const & s);
 template size_t memoryof (vector<bool> const & v);
 template size_t memoryof (vector<int> const & v);
 template size_t memoryof (vector<CCTK_REAL> const & v);
-template size_t memoryof (vector<bbox<int,dim> > const & v);
-template size_t memoryof (vector<vect<int,dim> > const & v);
+template size_t memoryof (vector<ibbox> const & v);
+template size_t memoryof (vector<ivect> const & v);
+template size_t memoryof (vector<i2vect> const & v);
 template size_t memoryof (vector<fulltree <int,dim,pseudoregion_t> *> const & f);
 template size_t memoryof (vector<pseudoregion_t> const & v);
 template size_t memoryof (vector<region_t> const & v);
 template size_t memoryof (vector<sendrecv_pseudoregion_t> const & v);
 template size_t memoryof (vector<vector<int> > const & v);
 template size_t memoryof (vector<vector<CCTK_REAL> > const & v);
-template size_t memoryof (vector<vector<bbox<int,dim> > > const & v);
+template size_t memoryof (vector<vector<ibbox> > const & v);
 template size_t memoryof (vector<vector<dh::dboxes> > const & v);
 template size_t memoryof (vector<vector<dh::fast_dboxes> > const & v);
 template size_t memoryof (vector<vector<region_t> > const & v);
@@ -359,54 +360,59 @@ template size_t memoryof (vector<vector<vector<region_t> > > const & v);
 template size_t memoryof (vector<vector<vector<gdata*> > > const & v);
 template size_t memoryof (vector<vector<vector<vector<gdata*> > > > const & v);
 
-template istream& input (istream& os, list<bbox<int,dim> >& l);
-template istream& input (istream& os, set<bbox<int,dim> >& s);
+template istream& input (istream& os, list<ibbox>& l);
+template istream& input (istream& os, set<ibbox>& s);
 template istream& input (istream& os, vector<int>& v);
 template istream& input (istream& os, vector<CCTK_REAL>& v);
-template istream& input (istream& os, vector<bbox<int,dim> >& v);
-template istream& input (istream& os, vector<bbox<CCTK_REAL,dim> >& v);
-template istream& input (istream& os, vector<vect<int,dim> >& v);
-template istream& input (istream& os, vector<vect<vect<bool,2>,dim> >& v);
+template istream& input (istream& os, vector<ibbox>& v);
+template istream& input (istream& os, vector<rbbox>& v);
+template istream& input (istream& os, vector<ivect>& v);
+template istream& input (istream& os, vector<bbvect>& v);
+template istream& input (istream& os, vector<i2vect>& v);
 template istream& input (istream& os, vector<region_t>& v);
 template istream& input (istream& os, vector<pseudoregion_t>& v);
 template istream& input (istream& os, vector<sendrecv_pseudoregion_t>& v);
+template istream& input (istream& os, vector<vector<int> >& v);
 template istream& input (istream& os, vector<vector<CCTK_REAL> >& v);
-template istream& input (istream& os, vector<vector<bbox<int,dim> > >& v);
-template istream& input (istream& os, vector<vector<bbox<CCTK_REAL,dim> > >& v);
-template istream& input (istream& os, vector<vector<vect<vect<bool,2>,dim> > >& v);
+template istream& input (istream& os, vector<vector<ibbox> >& v);
+template istream& input (istream& os, vector<vector<rbbox> >& v);
+template istream& input (istream& os, vector<vector<bbvect> >& v);
+template istream& input (istream& os, vector<vector<i2vect> >& v);
 template istream& input (istream& os, vector<vector<region_t> >& v);
 template istream& input (istream& os, vector<vector<vector<CCTK_REAL> > >& v);
 template istream& input (istream& os, vector<vector<vector<region_t> > >& v);
 
-template ostream& output (ostream& os, const list<bbox<int,dim> >& l);
+template ostream& output (ostream& os, const list<ibbox>& l);
 template ostream& output (ostream& os, const list<region_t>& l);
 template ostream& output (ostream& os, const map<string,Carpet::Timer*>& m);
-template ostream& output (ostream& os, const set<bbox<int,dim> >& s);
-template ostream& output (ostream& os, const set<bboxset<int,dim> >& s);
-template ostream& output (ostream& os, const stack<bbox<int,dim> >& s);
+template ostream& output (ostream& os, const set<ibbox>& s);
+template ostream& output (ostream& os, const set<ibset>& s);
+template ostream& output (ostream& os, const stack<ibbox>& s);
 template ostream& output (ostream& os, const vector<bool>& v);
 template ostream& output (ostream& os, const vector<int>& v);
 template ostream& output (ostream& os, const vector<CCTK_REAL>& v);
-template ostream& output (ostream& os, const vector<bbox<int,dim> >& v);
-template ostream& output (ostream& os, const vector<bbox<CCTK_REAL,dim> >& v);
-template ostream& output (ostream& os, const vector<vect<int,dim> >& v);
-template ostream& output (ostream& os, const vector<vect<vect<bool,2>,dim> >& v);
+template ostream& output (ostream& os, const vector<ibbox>& v);
+template ostream& output (ostream& os, const vector<rbbox>& v);
+template ostream& output (ostream& os, const vector<ivect>& v);
+template ostream& output (ostream& os, const vector<bbvect>& v);
+template ostream& output (ostream& os, const vector<i2vect>& v);
 template ostream& output (ostream& os, const vector<dh::dboxes> & v);
 template ostream& output (ostream& os, const vector<dh::fast_dboxes> & v);
 template ostream& output (ostream& os, const vector<region_t>& v);
 template ostream& output (ostream& os, const vector<pseudoregion_t>& v);
 template ostream& output (ostream& os, const vector<sendrecv_pseudoregion_t>& v);
-template ostream& output (ostream& os, const vector<list<bbox<int,dim> > >& v);
+template ostream& output (ostream& os, const vector<list<ibbox> >& v);
 template ostream& output (ostream& os, const vector<vector<int> >& v);
 template ostream& output (ostream& os, const vector<vector<CCTK_REAL> >& v);
-template ostream& output (ostream& os, const vector<vector<bbox<int,dim> > >& v);
-template ostream& output (ostream& os, const vector<vector<bbox<CCTK_REAL,dim> > >& v);
-template ostream& output (ostream& os, const vector<vector<vect<vect<bool,2>,dim> > >& v);
+template ostream& output (ostream& os, const vector<vector<ibbox> >& v);
+template ostream& output (ostream& os, const vector<vector<rbbox> >& v);
+template ostream& output (ostream& os, const vector<vector<bbvect> >& v);
+template ostream& output (ostream& os, const vector<vector<i2vect> >& v);
 template ostream& output (ostream& os, const vector<vector<dh::dboxes> > & b);
 template ostream& output (ostream& os, const vector<vector<dh::fast_dboxes> > & b);
 template ostream& output (ostream& os, const vector<vector<region_t> >& v);
 template ostream& output (ostream& os, const vector<vector<vector<CCTK_REAL> > >& v);
-template ostream& output (ostream& os, const vector<vector<vector<bbox<int,dim> > > >& v);
+template ostream& output (ostream& os, const vector<vector<vector<ibbox> > >& v);
 template ostream& output (ostream& os, const vector<vector<vector<dh::dboxes> > > & b);
 template ostream& output (ostream& os, const vector<vector<vector<dh::fast_dboxes> > > & b);
 template ostream& output (ostream& os, const vector<vector<vector<region_t> > >& v);