aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Carpet/CarpetIOASCII/param.ccl12
-rw-r--r--Carpet/CarpetIOASCII/src/ioascii.cc8
2 files changed, 14 insertions, 6 deletions
diff --git a/Carpet/CarpetIOASCII/param.ccl b/Carpet/CarpetIOASCII/param.ccl
index b75f2e836..281bcf0be 100644
--- a/Carpet/CarpetIOASCII/param.ccl
+++ b/Carpet/CarpetIOASCII/param.ccl
@@ -368,11 +368,19 @@ BOOLEAN output_symmetry_points "Output symmetry points (assuming that there are
{
} "yes"
-BOOLEAN out3D_ghosts "Output ghost zones"
+BOOLEAN output_ghost_points "Output ghost points"
{
} "yes"
-BOOLEAN out3D_outer_ghosts "Output outer boundary zones (assuming that there are nghostzones boundary points)"
+BOOLEAN output_boundary_points "Output outer boundary points (assuming that there are nghostzones boundary points)"
+{
+} "yes"
+
+BOOLEAN out3D_ghosts "Output ghost zones (DEPRECATED)"
+{
+} "yes"
+
+BOOLEAN out3D_outer_ghosts "Output outer boundary zones (assuming that there are nghostzones boundary points) (DEPRECATED)"
{
} "yes"
diff --git a/Carpet/CarpetIOASCII/src/ioascii.cc b/Carpet/CarpetIOASCII/src/ioascii.cc
index f8d1cb9b7..db4c531d1 100644
--- a/Carpet/CarpetIOASCII/src/ioascii.cc
+++ b/Carpet/CarpetIOASCII/src/ioascii.cc
@@ -1095,14 +1095,14 @@ namespace CarpetIOASCII {
obnds[0][d]
? (is_symbnd[2*d]
? output_symmetry_points
- : out3D_outer_ghosts)
- : out3D_ghosts;
+ : (output_boundary_points and out3D_outer_ghosts))
+ : (output_ghost_points and out3D_ghosts);
bool const output_upper_ghosts =
obnds[1][d]
? (is_symbnd[2*d+1]
? output_symmetry_points
- : out3D_outer_ghosts)
- : out3D_ghosts;
+ : (output_boundary_points and out3D_outer_ghosts))
+ : (output_ghost_points and out3D_ghosts);
if (not output_lower_ghosts) {
lo[d] += ghost_width[0][d] * str[d];