diff options
-rw-r--r-- | Carpet/CarpetLib/src/defs.cc | 24 | ||||
-rw-r--r-- | Carpet/CarpetLib/src/defs.hh | 1 |
2 files changed, 17 insertions, 8 deletions
diff --git a/Carpet/CarpetLib/src/defs.cc b/Carpet/CarpetLib/src/defs.cc index f912d28a0..9fa25180f 100644 --- a/Carpet/CarpetLib/src/defs.cc +++ b/Carpet/CarpetLib/src/defs.cc @@ -10,6 +10,7 @@ #include "bbox.hh" #include "defs.hh" +#include "dh.hh" #include "region.hh" #include "vect.hh" @@ -172,16 +173,19 @@ template CCTK_REAL ipow (CCTK_REAL x, int y); template vect<int,3> ipow (vect<int,3> x, int y); 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,3> >& v); template istream& input (istream& os, vector<bbox<CCTK_REAL,3> >& v); +template istream& input (istream& os, vector<vect<int,3> >& v); +template istream& input (istream& os, vector<vect<vect<bool,2>,3> >& v); +template istream& input (istream& os, vector<region_t>& v); +template istream& input (istream& os, vector<vector<CCTK_REAL> >& v); template istream& input (istream& os, vector<vector<bbox<int,3> > >& v); template istream& input (istream& os, vector<vector<bbox<CCTK_REAL,3> > >& v); -template istream& input (istream& os, vector<region_t>& v); +template istream& input (istream& os, vector<vector<vect<vect<bool,2>,3> > >& 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 istream& input (istream& os, vector<vect<int,3> >& v); -template istream& input (istream& os, vector<vect<vect<bool,2>,3> >& v); -template istream& input (istream& os, vector<vector<vect<vect<bool,2>,3> > >& v); template ostream& output (ostream& os, const list<bbox<int,3> >& l); template ostream& output (ostream& os, const list<region_t>& l); @@ -193,15 +197,19 @@ 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,3> >& v); template ostream& output (ostream& os, const vector<bbox<CCTK_REAL,3> >& v); +template ostream& output (ostream& os, const vector<vect<int,3> >& v); +template ostream& output (ostream& os, const vector<vect<vect<bool,2>,3> >& v); +template ostream& output (ostream& os, const vector<dh::dboxes> & b); template ostream& output (ostream& os, const vector<region_t>& v); -template ostream& output (ostream& os, const vector<vector<region_t> >& v); -template ostream& output (ostream& os, const vector<vector<vector<region_t> > >& v); template ostream& output (ostream& os, const vector<list<bbox<int,3> > >& 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,3> > >& v); template ostream& output (ostream& os, const vector<vector<bbox<CCTK_REAL,3> > >& v); template ostream& output (ostream& os, const vector<vector<vect<vect<bool,2>,3> > >& v); -template ostream& output (ostream& os, const vector<vect<int,3> >& v); -template ostream& output (ostream& os, const vector<vect<vect<bool,2>,3> >& v); +template ostream& output (ostream& os, const vector<vector<dh::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,3> > > >& v); +template ostream& output (ostream& os, const vector<vector<vector<dh::dboxes> > > & b); +template ostream& output (ostream& os, const vector<vector<vector<region_t> > >& v); diff --git a/Carpet/CarpetLib/src/defs.hh b/Carpet/CarpetLib/src/defs.hh index ffc8ed7df..807e9fc59 100644 --- a/Carpet/CarpetLib/src/defs.hh +++ b/Carpet/CarpetLib/src/defs.hh @@ -66,6 +66,7 @@ typedef vect<int,dim> ivect; typedef bbox<int,dim> ibbox; typedef bboxset<int,dim> ibset; +// (Try to replace these by b2vect and i2vect) typedef vect<vect<bool,2>,dim> bbvect; typedef vect<vect<int,2>,dim> iivect; |