From b02b147eb4702b219d4cf3e2c09e0cec7aec6fa7 Mon Sep 17 00:00:00 2001
From: Erik Schnetter <schnetter@cct.lsu.edu>
Date: Wed, 2 Dec 2009 14:41:42 -0800
Subject: CarpetIOASCII: Allow different numbers of ghost zones on different
 levels

Allow different numbers of ghost zones and different spatial
prolongation orders on different refinement levels.
---
 Carpet/CarpetIOASCII/src/ioascii.cc | 8 ++++----
 Carpet/CarpetIOASCII/src/ioascii.hh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'Carpet/CarpetIOASCII')

diff --git a/Carpet/CarpetIOASCII/src/ioascii.cc b/Carpet/CarpetIOASCII/src/ioascii.cc
index db4c531d1..1c3d0e0a2 100644
--- a/Carpet/CarpetIOASCII/src/ioascii.cc
+++ b/Carpet/CarpetIOASCII/src/ioascii.cc
@@ -562,7 +562,7 @@ namespace CarpetIOASCII {
         if (dist::rank() == proc or dist::rank() == ioproc) {
           
           const ibbox& data_ext = dd->boxes.at(ml).at(rl).at(c).exterior;
-          const ibbox ext = GetOutputBBox (cctkGH, group, m, c, data_ext);
+          const ibbox ext = GetOutputBBox (cctkGH, group, rl, m, c, data_ext);
           
           CCTK_REAL coord_time;
           rvect coord_lower, coord_upper;
@@ -1053,7 +1053,7 @@ namespace CarpetIOASCII {
   // Omit symmetry and ghost zones if requested
   ibbox GetOutputBBox (const cGH* const cctkGH,
                        const int group,
-                       const int m, const int c,
+                       const int rl, const int m, const int c,
                        const ibbox& ext)
   {
     DECLARE_CCTK_PARAMETERS;
@@ -1087,8 +1087,8 @@ namespace CarpetIOASCII {
     ivect hi = ext.upper();
     const ivect str = ext.stride();
     
-    const b2vect obnds       = vhh.at(m)->outer_boundaries(reflevel,c);
-    const i2vect ghost_width = arrdata.at(group).at(m).dd->ghost_width;
+    const b2vect obnds       = vhh.at(m)->outer_boundaries(rl,c);
+    const i2vect ghost_width = arrdata.at(group).at(m).dd->ghost_widths.at(rl);
     
     for (int d=0; d<groupdim; ++d) {
       bool const output_lower_ghosts =
diff --git a/Carpet/CarpetIOASCII/src/ioascii.hh b/Carpet/CarpetIOASCII/src/ioascii.hh
index 08b7789d6..0e1865eab 100644
--- a/Carpet/CarpetIOASCII/src/ioascii.hh
+++ b/Carpet/CarpetIOASCII/src/ioascii.hh
@@ -24,7 +24,7 @@ namespace CarpetIOASCII {
   // routines which are independent of the output dimension
   static ibbox GetOutputBBox (const cGH* cctkGH,
                               int group,
-                              int m, int c,
+                              int rl, int m, int c,
                               const ibbox& ext);
 
   static void GetCoordinates (const cGH* cctkGH, int m,
-- 
cgit v1.2.3