diff options
author | Erik Schnetter <schnetter@cct.lsu.edu> | 2009-12-02 14:41:42 -0800 |
---|---|---|
committer | Barry Wardell <barry.wardell@gmail.com> | 2011-12-14 16:45:20 +0000 |
commit | b02b147eb4702b219d4cf3e2c09e0cec7aec6fa7 (patch) | |
tree | 4dd6a4c235eb1f2bfba20157ea601580a52138e9 /Carpet/CarpetIOASCII | |
parent | 7dce84cd639b8fe38226363df1152d502f555fb3 (diff) |
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.
Diffstat (limited to 'Carpet/CarpetIOASCII')
-rw-r--r-- | Carpet/CarpetIOASCII/src/ioascii.cc | 8 | ||||
-rw-r--r-- | Carpet/CarpetIOASCII/src/ioascii.hh | 2 |
2 files changed, 5 insertions, 5 deletions
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, |