From d23f0dbab9fa644c1be6a9446bd73ed51b04ea49 Mon Sep 17 00:00:00 2001
From: Erik Schnetter <schnetter@cct.lsu.edu>
Date: Tue, 27 Apr 2010 10:14:08 -0500
Subject: CarpetIOF5: Update to new dh classes

---
 CarpetDev/CarpetIOF5/src/writer.cc | 26 +++++++++++++-------------
 CarpetDev/CarpetIOF5/src/writer.hh |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'CarpetDev')

diff --git a/CarpetDev/CarpetIOF5/src/writer.cc b/CarpetDev/CarpetIOF5/src/writer.cc
index cf00271a0..a07e1d94f 100644
--- a/CarpetDev/CarpetIOF5/src/writer.cc
+++ b/CarpetDev/CarpetIOF5/src/writer.cc
@@ -181,9 +181,9 @@ namespace CarpetIOF5 {
         BEGIN_COMPONENT_LOOP (m_cctkGH, grouptype)
         {
           dh * const dd = Carpet::arrdata.at(group).at(Carpet::map).dd;
-          dh::dboxes const & boxes
-            = dd->boxes.at(Carpet::mglevel).at(Carpet::reflevel).at(myproc);
-          bbox<int, dim> const & region = determine_region (boxes);
+          dh::light_dboxes const & light_boxes
+            = dd->light_boxes.at(Carpet::mglevel).at(Carpet::reflevel).at(myproc);
+          bbox<int, dim> const & region = determine_region (light_boxes);
           F5::meta_data_region_t meta_data_region (physical_quantity, region);
           
           gh * const hh = Carpet::vhh.at(Carpet::map);
@@ -199,9 +199,9 @@ namespace CarpetIOF5 {
         BEGIN_LOCAL_COMPONENT_LOOP (m_cctkGH, grouptype)
         {
           dh * const dd = Carpet::arrdata.at(group).at(Carpet::map).dd;
-          dh::dboxes const & boxes
-            = dd->boxes.at(Carpet::mglevel).at(Carpet::reflevel).at(myproc);
-          bbox<int, dim> const & region = determine_region (boxes);
+          dh::light_dboxes const & light_boxes
+            = dd->light_boxes.at(Carpet::mglevel).at(Carpet::reflevel).at(myproc);
+          bbox<int, dim> const & region = determine_region (light_boxes);
           F5::data_region_t data_region (physical_quantity, region);
           
           F5::tensor_component_t tensor_component (data_region, m_variable);
@@ -341,7 +341,7 @@ namespace CarpetIOF5 {
     {
       dh * const dd = Carpet::vdd.at(Carpet::map);
       bbox<int, dim> const & region
-        = (dd->boxes.at(Carpet::mglevel).at(Carpet::reflevel)
+        = (dd->light_boxes.at(Carpet::mglevel).at(Carpet::reflevel)
            .at(Carpet::component).exterior);
       
       if (write_metafile)
@@ -369,32 +369,32 @@ namespace CarpetIOF5 {
   
   
   bbox<int,dim> const & writer_t::
-  determine_region (dh::dboxes const & boxes)
+  determine_region (dh::light_dboxes const & light_boxes)
   {
     DECLARE_CCTK_PARAMETERS;
     
     // TODO: use superregions instead of regions (?  only if the
     // regions are on the same processor?)
     
-    bbox<int,dim> dh::dboxes::* boxptr;
+    bbox<int,dim> dh::light_dboxes::* boxptr;
     if (CCTK_EQUALS (output_regions, "exterior"))
     {
-      boxptr = & dh::dboxes::exterior;
+      boxptr = & dh::light_dboxes::exterior;
     }
     else if (CCTK_EQUALS (output_regions, "owned"))
     {
-      boxptr = & dh::dboxes::owned;
+      boxptr = & dh::light_dboxes::owned;
     }
     else if (CCTK_EQUALS (output_regions, "interior"))
     {
-      boxptr = & dh::dboxes::interior;
+      boxptr = & dh::light_dboxes::interior;
     }
     else
     {
       assert (0);
     }
     
-    return boxes.*boxptr;
+    return light_boxes.*boxptr;
   }
   
 } // namespace CarpetIOF5
diff --git a/CarpetDev/CarpetIOF5/src/writer.hh b/CarpetDev/CarpetIOF5/src/writer.hh
index 77bad3915..d3a6611aa 100644
--- a/CarpetDev/CarpetIOF5/src/writer.hh
+++ b/CarpetDev/CarpetIOF5/src/writer.hh
@@ -61,7 +61,7 @@ namespace CarpetIOF5 {
     
     
     static bbox<int,dim> const &
-    determine_region (dh::dboxes const & boxes);
+    determine_region (dh::light_dboxes const & light_boxes);
     
   };
   
-- 
cgit v1.2.3