Merge pull request #1216 from dryuri92/newhex

Support different orientations for hexagonal lattices
This commit is contained in:
Sterling Harper 2019-06-17 15:21:49 -04:00 committed by GitHub
commit 2c0b16e73d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 1034 additions and 139 deletions

View file

@ -27,6 +27,7 @@ enum class LatticeType {
rect, hex
};
//==============================================================================
// Global variables
//==============================================================================
@ -265,8 +266,20 @@ public:
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
};