CarpetLib: Move pseudoregion datatypes to region.hh

Rename the datatypes pseudoregion and sendrecv_pseudoregion to
pseudoregion_t and sendrecv_pseudoregion_t, respectively.  Move their
declaration and definition to region.hh and region.cc, respectively.
Instantiate templates for stream output.

darcs-hash:20080130221653-dae7b-8eb25cacc8f7750ac470179c9575785bdb32b575.gz

1 files changed, 3 insertions, 37 deletions

diff --git a/Carpet/CarpetLib/src/dh.hh b/Carpet/CarpetLib/src/dh.hh
index 9011525d7..7fda88728 100644
--- a/Carpet/CarpetLib/src/dh.hh
+++ b/Carpet/CarpetLib/src/dh.hh
@@ -11,47 +11,13 @@
 #include "bboxset.hh"
 #include "defs.hh"
 #include "gh.hh"
+#include "region.hh"
 #include "vect.hh"
 
 using namespace std;
 
 
 
-// A pseudoregion is almost a region; it is a bbox that lives on a
-// certain processor.  Pseudoregions are a compact way to store
-// information about what processors needs to send data to what other
-// processor during synchronisation or regridding.
-struct pseudoregion {
-  ibbox extent;
-  int processor;
-  pseudoregion ()
-  {
-  }
-  pseudoregion (ibbox const & extent_, int const processor_)
-    : extent (extent_), processor (processor_)
-  {
-  }
-};
-
-ostream & operator<< (ostream & os, pseudoregion const & p);
-
-struct sendrecv_pseudoregion {
-  pseudoregion send, recv;
-  sendrecv_pseudoregion ()
-  {
-  }
-  sendrecv_pseudoregion (ibbox const & send_extent, int const send_processor,
-                         ibbox const & recv_extent, int const recv_processor)
-    : send (pseudoregion (send_extent, send_processor)),
-      recv (pseudoregion (recv_extent, recv_processor))
-  {
-  }
-};
-
-ostream & operator<< (ostream & os, sendrecv_pseudoregion const & srp);
-
-
-
 // Forward declaration
 class ggf;
 class dh;
@@ -66,8 +32,8 @@ public:
   typedef list<ibbox>    iblist;
   typedef vector<iblist> iblistvect; // vector of lists
   
-  typedef vector <pseudoregion> pvect;
-  typedef vector <sendrecv_pseudoregion> srpvect;
+  typedef vector <pseudoregion_t> pvect;
+  typedef vector <sendrecv_pseudoregion_t> srpvect;