Merge pull request openmc-dev#1216 from dryuri92/newhex

Support different orientations for hexagonal lattices

.gitignore

@@ -9,6 +9,7 @@
 *.pyc
 
 # Python distribution
+.settings/
 dist/
 openmc.egg-info/
 

docs/source/io_formats/geometry.rst

@@ -318,6 +318,13 @@ the following attributes or sub-elements:
 
     *Default*: None
 
+  :orientation:
+    The orientation of the hexagonal lattice. The string "x" indicates that two
+    sides of the lattice are parallel to the x-axis, whereas the string "y"
+    indicates that two sides are parallel to the y-axis.
+
+    *Default*: "y"
+
   :center:
     The coordinates of the center of the lattice. If the lattice does not have
     axial sections then only the x- and y-coordinates are specified.

include/openmc/lattice.h

@@ -27,6 +27,7 @@ enum class LatticeType {
   rect, hex
 };
 
+
 //==============================================================================
 // Global variables
 //==============================================================================
@@ -265,8 +266,20 @@ class HexLattice : public Lattice
   void to_hdf5_inner(hid_t group_id) const;
 
 private:
+  enum class Orientation {
+      y, //!< Flat side of lattice parallel to y-axis
+      x  //!< Flat side of lattice parallel to x-axis
+  };
+
+  //! Fill universes_ vector for 'y' orientation
+  void fill_lattice_y(const std::vector<std::string>& univ_words);
+
+  //! Fill universes_ vector for 'x' orientation
+  void fill_lattice_x(const std::vector<std::string>& univ_words);
+
   int n_rings_;                   //!< Number of radial tile positions
   int n_axial_;                   //!< Number of axial tile positions
+  Orientation orientation_;       //!< Orientation of lattice
   Position center_;               //!< Global center of lattice
   std::array<double, 2> pitch_;   //!< Lattice tile width and height
 };