CarpetLib: Remove unoptimised fields of dh::boxes structure

Remove the unoptimised and the old-style optimised fields for the
communication and regridding structure from the dh::boxes structure.
(Keep the new-style optimised fields.)  Remove the code that sets
them.  Remove the old-style optimisation routines.  Update the output
routines.

darcs-hash:20080130221033-dae7b-cd7a9b8445ba13eaf95af2b1739bf6592cebdbcf.gz

1 files changed, 0 insertions, 58 deletions

diff --git a/Carpet/CarpetLib/src/dh.hh b/Carpet/CarpetLib/src/dh.hh
index 7fda88728..ea9b0f294 100644
--- a/Carpet/CarpetLib/src/dh.hh
+++ b/Carpet/CarpetLib/src/dh.hh
@@ -63,35 +63,6 @@ public:
     
     // Communication schedule:
     
-    // ref_prol_recv[cc] and ref_rest_send[cc] determine what needs to
-    // be sent from and received from cc for prolongation to this box
-    
-    iblist mg_rest_recv;
-    iblist mg_rest_send;
-    iblist mg_prol_recv;
-    iblist mg_prol_send;
-    iblistvect ref_prol_recv;
-    iblistvect ref_prol_send;
-    iblistvect ref_rest_recv;
-    iblistvect ref_rest_send;
-    iblistvect sync_recv;
-    iblistvect sync_send;
-    iblistvect ref_bnd_prol_recv;
-    iblistvect ref_bnd_prol_send;
-    
-    pvect fast_mg_rest_recv;
-    pvect fast_mg_rest_send;
-    pvect fast_mg_prol_recv;
-    pvect fast_mg_prol_send;
-    pvect fast_ref_prol_recv;
-    pvect fast_ref_prol_send;
-    pvect fast_ref_rest_recv;
-    pvect fast_ref_rest_send;
-    pvect fast_sync_recv;
-    pvect fast_sync_send;
-    pvect fast_ref_bnd_prol_recv;
-    pvect fast_ref_bnd_prol_send;
-    
     srpvect fast_mg_rest_sendrecv;
     srpvect fast_mg_prol_sendrecv;
     srpvect fast_ref_prol_sendrecv;
@@ -101,16 +72,6 @@ public:
     
     // Regridding schedule:
     
-    iblistvect old2new_sync_recv;
-    iblistvect old2new_sync_send;
-    iblistvect old2new_ref_prol_recv;
-    iblistvect old2new_ref_prol_send;
-    
-    pvect fast_old2new_sync_recv;
-    pvect fast_old2new_sync_send;
-    pvect fast_old2new_ref_prol_recv;
-    pvect fast_old2new_ref_prol_send;
-    
     srpvect fast_old2new_sync_sendrecv;
     srpvect fast_old2new_ref_prol_sendrecv;
     
@@ -128,25 +89,6 @@ private:
   void
   setup_bboxes ();
   
-  static
-  void
-  optimise_field (dboxes & b,
-                  iblistvect const dboxes::* field,
-                  pvect dboxes::* fast_field);
-  static
-  void
-  optimise_field (dboxes & b,
-                  int proc,
-                  iblist const dboxes::* field,
-                  pvect dboxes::* fast_field);
-  
-  static
-  void
-  optimise2_field (cboxes & bs,
-                   pvect const dboxes::* fast_field_recv,
-                   pvect const dboxes::* fast_field_send,
-                   srpvect dboxes::* fast_field_sendrecv);
-  
 public:                         // should be readonly
   
   // Fields