Requirements: fix a couple of bugs in the debug output

3 files changed, 9 insertions, 5 deletions

diff --git a/Carpet/Requirements/src/.Requirements.cc.swp b/Carpet/Requirements/src/.Requirements.cc.swp
deleted file mode 100644
index 6ee944ea1..000000000
--- a/Carpet/Requirements/src/.Requirements.cc.swp
+++ /dev/null
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);