Merge pull request #1260 from pshriwise/overlap_plotting

Overlap plotting

include/openmc/geometry.h

@@ -47,7 +47,7 @@ inline bool coincident(double d1, double d2) {
 //! Check for overlapping cells at a particle's position.
 //==============================================================================
 
-bool check_cell_overlap(Particle* p);
+bool check_cell_overlap(Particle* p, bool error=true);
 
 //==============================================================================
 //! Locate a particle in the geometry tree and set its geometry data fields.

include/openmc/plot.h

@@ -49,10 +49,19 @@ struct RGBColor {
     blue = v[2];
   }
 
+  bool operator ==(const RGBColor& other) {
+    return red == other.red && green == other.green && blue == other.blue;
+  }
+
   // Members
   uint8_t red, green, blue;
 };
 
+// some default colors
+const RGBColor WHITE {255, 255, 255};
+const RGBColor RED {255,   0,   0};
+
+
 typedef xt::xtensor<RGBColor, 2> ImageData;
 
 struct IdData {
@@ -61,6 +70,7 @@ struct IdData {
 
   // Methods
   void set_value(size_t y, size_t x, const Particle& p, int level);
+  void set_overlap(size_t y, size_t x);
 
   // Members
   xt::xtensor<int32_t, 3> data_; //!< 2D array of cell & material ids
@@ -72,6 +82,7 @@ struct PropertyData {
 
   // Methods
   void set_value(size_t y, size_t x, const Particle& p, int level);
+  void set_overlap(size_t y, size_t x);
 
   // Members
   xt::xtensor<double, 3> data_; //!< 2D array of temperature & density data
@@ -106,6 +117,7 @@ public:
   Position width_; //!< Plot width in geometry
   PlotBasis basis_; //!< Plot basis (XY/XZ/YZ)
   std::array<size_t, 3> pixels_; //!< Plot size in pixels
+  bool color_overlaps_; //!< Show overlapping cells?
   int level_; //!< Plot universe level
 };
 
@@ -173,6 +185,9 @@ T PlotBase::get_map() const {
         if (found_cell) {
           data.set_value(y, x, p, j);
         }
+        if (color_overlaps_ && check_cell_overlap(&p, false)) {
+          data.set_overlap(y, x);
+        }
       } // inner for
     } // outer for
   } // omp parallel
@@ -200,6 +215,7 @@ private:
   void set_user_colors(pugi::xml_node plot_node);
   void set_meshlines(pugi::xml_node plot_node);
   void set_mask(pugi::xml_node plot_node);
+  void set_overlap_color(pugi::xml_node plot_node);
 
 // Members
 public:
@@ -207,9 +223,10 @@ public:
   PlotType type_; //!< Plot type (Slice/Voxel)
   PlotColorBy color_by_; //!< Plot coloring (cell/material)
   int meshlines_width_; //!< Width of lines added to the plot
-  int index_meshlines_mesh_; //!< Index of the mesh to draw on the plot
+  int index_meshlines_mesh_ {-1}; //!< Index of the mesh to draw on the plot
   RGBColor meshlines_color_; //!< Color of meshlines on the plot
-  RGBColor not_found_; //!< Plot background color
+  RGBColor not_found_ {WHITE}; //!< Plot background color
+  RGBColor overlap_color_ {RED}; //!< Plot overlap color
   std::vector<RGBColor> colors_; //!< Plot colors
   std::string path_plot_; //!< Plot output filename
 };