From 95558fa30a530d677723f63ee813f1d1fc029161 Mon Sep 17 00:00:00 2001 From: Frank Löffler Date: Thu, 4 Apr 2013 00:17:44 -0500 Subject: Requirements: fix a couple of bugs in the debug output --- Carpet/Requirements/src/.Requirements.cc.swp | Bin 90112 -> 0 bytes Carpet/Requirements/src/Requirements.cc | 8 ++++---- Carpet/Requirements/src/Requirements.hh | 6 +++++- 3 files changed, 9 insertions(+), 5 deletions(-) delete mode 100644 Carpet/Requirements/src/.Requirements.cc.swp (limited to 'Carpet/Requirements') diff --git a/Carpet/Requirements/src/.Requirements.cc.swp b/Carpet/Requirements/src/.Requirements.cc.swp deleted file mode 100644 index 6ee944ea1..000000000 Binary files a/Carpet/Requirements/src/.Requirements.cc.swp and /dev/null differ diff --git a/Carpet/Requirements/src/Requirements.cc b/Carpet/Requirements/src/Requirements.cc index 737e2f28e..19a67f9fd 100644 --- a/Carpet/Requirements/src/Requirements.cc +++ b/Carpet/Requirements/src/Requirements.cc @@ -136,29 +136,29 @@ namespace Requirements { { if (i_interior == b) return; - output_location(l, 1); i_interior = b; + output_location(l, BIT_INTERIOR); } void gridpoint_t::set_boundary(bool b, location_t &l) { if (i_boundary == b) return; - output_location(l, 2); i_boundary = b; + output_location(l, BIT_BOUNDARY); } void gridpoint_t::set_ghostzones(bool b, location_t &l) { if (i_ghostzones == b) return; - output_location(l, 4); i_ghostzones = b; + output_location(l, BIT_GHOSTZONES); } void gridpoint_t::set_boundary_ghostzones(bool b, location_t &l) { if (i_boundary_ghostzones == b) return; - output_location(l, 8); i_boundary_ghostzones = b; + output_location(l, BIT_BOUNDARY_GHOSTZONES); } inline ostream& operator<< (ostream& os, const gridpoint_t& a) { diff --git a/Carpet/Requirements/src/Requirements.hh b/Carpet/Requirements/src/Requirements.hh index 26647c9d8..94a45cdac 100644 --- a/Carpet/Requirements/src/Requirements.hh +++ b/Carpet/Requirements/src/Requirements.hh @@ -14,7 +14,11 @@ namespace Requirements { enum valid_t { nowhere, interior, everywhere }; } - enum zones_t { BIT_NONE, BIT_INTERIOR, BIT_BOUNDARY, BIT_GHOSTZONES, BIT_BOUNDARY_GHOSTZONES }; + enum zones_t { BIT_INTERIOR = 1, + BIT_BOUNDARY = 2, + BIT_GHOSTZONES = 4, + BIT_BOUNDARY_GHOSTZONES = 8 + }; // Set up basic grid structure void Setup(int maps); -- cgit v1.2.3