mirror of
https://github.com/openmc-dev/openmc.git
synced 2026-07-21 06:25:30 -04:00
simplify mechanism to detect if geometry entity is DAG (#3269)
This commit is contained in:
Gavin Ridley
GitHub
parent
06a88526cf
commit
bcc2a4c5f0
7 changed files with 56 additions and 80 deletions
|
|
@ -349,12 +349,8 @@ public:
|
|||
|
||||
vector<int32_t> offset_; //!< Distribcell offset table
|
||||
|
||||
// Accessors
|
||||
const GeometryType& geom_type() const { return geom_type_; }
|
||||
GeometryType& geom_type() { return geom_type_; }
|
||||
|
||||
private:
|
||||
GeometryType geom_type_; //!< Geometric representation type (CSG, DAGMC)
|
||||
// Right now, either CSG or DAGMC cells are used.
|
||||
virtual GeometryType geom_type() const = 0;
|
||||
};
|
||||
|
||||
struct CellInstanceItem {
|
||||
|
|
@ -368,7 +364,7 @@ class CSGCell : public Cell {
|
|||
public:
|
||||
//----------------------------------------------------------------------------
|
||||
// Constructors
|
||||
CSGCell();
|
||||
CSGCell() = default;
|
||||
explicit CSGCell(pugi::xml_node cell_node);
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
|
|
@ -395,6 +391,8 @@ public:
|
|||
|
||||
bool is_simple() const override { return region_.is_simple(); }
|
||||
|
||||
virtual GeometryType geom_type() const override { return GeometryType::CSG; }
|
||||
|
||||
protected:
|
||||
//! Returns the beginning position of a parenthesis block (immediately before
|
||||
//! two surface tokens) in the RPN given a starting position at the end of
|
||||
|
|
|
|||
|
|
@ -54,6 +54,8 @@ public:
|
|||
|
||||
inline void to_hdf5_inner(hid_t group_id) const override {};
|
||||
|
||||
virtual GeometryType geom_type() const override { return GeometryType::DAG; }
|
||||
|
||||
// Accessor methods
|
||||
moab::DagMC* dagmc_ptr() const { return dagmc_ptr_.get(); }
|
||||
int32_t dag_index() const { return dag_index_; }
|
||||
|
|
@ -78,6 +80,8 @@ public:
|
|||
|
||||
void to_hdf5_inner(hid_t group_id) const override;
|
||||
|
||||
virtual GeometryType geom_type() const override { return GeometryType::DAG; }
|
||||
|
||||
// Accessor methods
|
||||
moab::DagMC* dagmc_ptr() const { return dagmc_ptr_.get(); }
|
||||
int32_t dag_index() const { return dag_index_; }
|
||||
|
|
@ -165,6 +169,8 @@ public:
|
|||
|
||||
void to_hdf5(hid_t universes_group) const override;
|
||||
|
||||
virtual GeometryType geom_type() const override { return GeometryType::DAG; }
|
||||
|
||||
// Data Members
|
||||
std::shared_ptr<moab::DagMC>
|
||||
dagmc_instance_; //!< DAGMC Instance for this universe
|
||||
|
|
|
|||
|
|
@ -90,30 +90,26 @@ public:
|
|||
//! Get the BoundingBox for this surface.
|
||||
virtual BoundingBox bounding_box(bool /*pos_side*/) const { return {}; }
|
||||
|
||||
// Accessors
|
||||
const GeometryType& geom_type() const { return geom_type_; }
|
||||
GeometryType& geom_type() { return geom_type_; }
|
||||
|
||||
private:
|
||||
GeometryType geom_type_; //!< Geometry type indicator (CSG or DAGMC)
|
||||
/* Must specify if this is a CSG or DAGMC-type surface. Only
|
||||
* the DAGMC surface should return the DAG type geometry, so
|
||||
* by default, this returns the CSG. The main difference is that
|
||||
* if the geom_type is found to be DAG in the geometry handling code,
|
||||
* some DAGMC-specific operations get carried out like resetting
|
||||
* the particle's intersection history when necessary.
|
||||
*/
|
||||
virtual GeometryType geom_type() const { return GeometryType::CSG; }
|
||||
|
||||
protected:
|
||||
virtual void to_hdf5_inner(hid_t group_id) const = 0;
|
||||
};
|
||||
|
||||
class CSGSurface : public Surface {
|
||||
public:
|
||||
explicit CSGSurface(pugi::xml_node surf_node);
|
||||
CSGSurface();
|
||||
};
|
||||
|
||||
//==============================================================================
|
||||
//! A plane perpendicular to the x-axis.
|
||||
//
|
||||
//! The plane is described by the equation \f$x - x_0 = 0\f$
|
||||
//==============================================================================
|
||||
|
||||
class SurfaceXPlane : public CSGSurface {
|
||||
class SurfaceXPlane : public Surface {
|
||||
public:
|
||||
explicit SurfaceXPlane(pugi::xml_node surf_node);
|
||||
double evaluate(Position r) const override;
|
||||
|
|
@ -131,7 +127,7 @@ public:
|
|||
//! The plane is described by the equation \f$y - y_0 = 0\f$
|
||||
//==============================================================================
|
||||
|
||||
class SurfaceYPlane : public CSGSurface {
|
||||
class SurfaceYPlane : public Surface {
|
||||
public:
|
||||
explicit SurfaceYPlane(pugi::xml_node surf_node);
|
||||
double evaluate(Position r) const override;
|
||||
|
|
@ -149,7 +145,7 @@ public:
|
|||
//! The plane is described by the equation \f$z - z_0 = 0\f$
|
||||
//==============================================================================
|
||||
|
||||
class SurfaceZPlane : public CSGSurface {
|
||||
class SurfaceZPlane : public Surface {
|
||||
public:
|
||||
explicit SurfaceZPlane(pugi::xml_node surf_node);
|
||||
double evaluate(Position r) const override;
|
||||
|
|
@ -167,7 +163,7 @@ public:
|
|||
//! The plane is described by the equation \f$A x + B y + C z - D = 0\f$
|
||||
//==============================================================================
|
||||
|
||||
class SurfacePlane : public CSGSurface {
|
||||
class SurfacePlane : public Surface {
|
||||
public:
|
||||
explicit SurfacePlane(pugi::xml_node surf_node);
|
||||
double evaluate(Position r) const override;
|
||||
|
|
@ -185,7 +181,7 @@ public:
|
|||
//! \f$(y - y_0)^2 + (z - z_0)^2 - R^2 = 0\f$
|
||||
//==============================================================================
|
||||
|
||||
class SurfaceXCylinder : public CSGSurface {
|
||||
class SurfaceXCylinder : public Surface {
|
||||
public:
|
||||
explicit SurfaceXCylinder(pugi::xml_node surf_node);
|
||||
double evaluate(Position r) const override;
|
||||
|
|
@ -204,7 +200,7 @@ public:
|
|||
//! \f$(x - x_0)^2 + (z - z_0)^2 - R^2 = 0\f$
|
||||
//==============================================================================
|
||||
|
||||
class SurfaceYCylinder : public CSGSurface {
|
||||
class SurfaceYCylinder : public Surface {
|
||||
public:
|
||||
explicit SurfaceYCylinder(pugi::xml_node surf_node);
|
||||
double evaluate(Position r) const override;
|
||||
|
|
@ -223,7 +219,7 @@ public:
|
|||
//! \f$(x - x_0)^2 + (y - y_0)^2 - R^2 = 0\f$
|
||||
//==============================================================================
|
||||
|
||||
class SurfaceZCylinder : public CSGSurface {
|
||||
class SurfaceZCylinder : public Surface {
|
||||
public:
|
||||
explicit SurfaceZCylinder(pugi::xml_node surf_node);
|
||||
double evaluate(Position r) const override;
|
||||
|
|
@ -242,7 +238,7 @@ public:
|
|||
//! \f$(x - x_0)^2 + (y - y_0)^2 + (z - z_0)^2 - R^2 = 0\f$
|
||||
//==============================================================================
|
||||
|
||||
class SurfaceSphere : public CSGSurface {
|
||||
class SurfaceSphere : public Surface {
|
||||
public:
|
||||
explicit SurfaceSphere(pugi::xml_node surf_node);
|
||||
double evaluate(Position r) const override;
|
||||
|
|
@ -261,7 +257,7 @@ public:
|
|||
//! \f$(y - y_0)^2 + (z - z_0)^2 - R^2 (x - x_0)^2 = 0\f$
|
||||
//==============================================================================
|
||||
|
||||
class SurfaceXCone : public CSGSurface {
|
||||
class SurfaceXCone : public Surface {
|
||||
public:
|
||||
explicit SurfaceXCone(pugi::xml_node surf_node);
|
||||
double evaluate(Position r) const override;
|
||||
|
|
@ -279,7 +275,7 @@ public:
|
|||
//! \f$(x - x_0)^2 + (z - z_0)^2 - R^2 (y - y_0)^2 = 0\f$
|
||||
//==============================================================================
|
||||
|
||||
class SurfaceYCone : public CSGSurface {
|
||||
class SurfaceYCone : public Surface {
|
||||
public:
|
||||
explicit SurfaceYCone(pugi::xml_node surf_node);
|
||||
double evaluate(Position r) const override;
|
||||
|
|
@ -297,7 +293,7 @@ public:
|
|||
//! \f$(x - x_0)^2 + (y - y_0)^2 - R^2 (z - z_0)^2 = 0\f$
|
||||
//==============================================================================
|
||||
|
||||
class SurfaceZCone : public CSGSurface {
|
||||
class SurfaceZCone : public Surface {
|
||||
public:
|
||||
explicit SurfaceZCone(pugi::xml_node surf_node);
|
||||
double evaluate(Position r) const override;
|
||||
|
|
@ -315,7 +311,7 @@ public:
|
|||
//! 0\f$
|
||||
//==============================================================================
|
||||
|
||||
class SurfaceQuadric : public CSGSurface {
|
||||
class SurfaceQuadric : public Surface {
|
||||
public:
|
||||
explicit SurfaceQuadric(pugi::xml_node surf_node);
|
||||
double evaluate(Position r) const override;
|
||||
|
|
@ -333,7 +329,7 @@ public:
|
|||
//! \f$(x-x_0)^2/B^2 + (\sqrt{(y-y_0)^2 + (z-z_0)^2} - A)^2/C^2 -1 \f$
|
||||
//==============================================================================
|
||||
|
||||
class SurfaceXTorus : public CSGSurface {
|
||||
class SurfaceXTorus : public Surface {
|
||||
public:
|
||||
explicit SurfaceXTorus(pugi::xml_node surf_node);
|
||||
double evaluate(Position r) const override;
|
||||
|
|
@ -350,7 +346,7 @@ public:
|
|||
//! \f$(y-y_0)^2/B^2 + (\sqrt{(x-x_0)^2 + (z-z_0)^2} - A)^2/C^2 -1 \f$
|
||||
//==============================================================================
|
||||
|
||||
class SurfaceYTorus : public CSGSurface {
|
||||
class SurfaceYTorus : public Surface {
|
||||
public:
|
||||
explicit SurfaceYTorus(pugi::xml_node surf_node);
|
||||
double evaluate(Position r) const override;
|
||||
|
|
@ -367,7 +363,7 @@ public:
|
|||
//! \f$(z-z_0)^2/B^2 + (\sqrt{(x-x_0)^2 + (y-y_0)^2} - A)^2/C^2 -1 \f$
|
||||
//==============================================================================
|
||||
|
||||
class SurfaceZTorus : public CSGSurface {
|
||||
class SurfaceZTorus : public Surface {
|
||||
public:
|
||||
explicit SurfaceZTorus(pugi::xml_node surf_node);
|
||||
double evaluate(Position r) const override;
|
||||
|
|
|
|||
|
|
@ -38,13 +38,13 @@ public:
|
|||
|
||||
BoundingBox bounding_box() const;
|
||||
|
||||
const GeometryType& geom_type() const { return geom_type_; }
|
||||
GeometryType& geom_type() { return geom_type_; }
|
||||
/* By default, universes are CSG universes. The DAGMC
|
||||
* universe overrides standard behaviors, and in the future,
|
||||
* other things might too.
|
||||
*/
|
||||
virtual GeometryType geom_type() const { return GeometryType::CSG; }
|
||||
|
||||
unique_ptr<UniversePartitioner> partitioner_;
|
||||
|
||||
private:
|
||||
GeometryType geom_type_ = GeometryType::CSG;
|
||||
};
|
||||
|
||||
//==============================================================================
|
||||
|
|
|
|||
|
|
@ -249,16 +249,8 @@ void Cell::to_hdf5(hid_t cell_group) const
|
|||
// CSGCell implementation
|
||||
//==============================================================================
|
||||
|
||||
// default constructor
|
||||
CSGCell::CSGCell()
|
||||
{
|
||||
geom_type() = GeometryType::CSG;
|
||||
}
|
||||
|
||||
CSGCell::CSGCell(pugi::xml_node cell_node)
|
||||
{
|
||||
geom_type() = GeometryType::CSG;
|
||||
|
||||
if (check_for_node(cell_node, "id")) {
|
||||
id_ = std::stoi(get_node_value(cell_node, "id"));
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -129,8 +129,6 @@ void DAGUniverse::set_id()
|
|||
|
||||
void DAGUniverse::initialize()
|
||||
{
|
||||
geom_type() = GeometryType::DAG;
|
||||
|
||||
#ifdef OPENMC_UWUW
|
||||
// read uwuw materials from the .h5m file if present
|
||||
read_uwuw_materials();
|
||||
|
|
@ -661,10 +659,7 @@ void DAGUniverse::override_assign_material(std::unique_ptr<DAGCell>& c) const
|
|||
//==============================================================================
|
||||
|
||||
DAGCell::DAGCell(std::shared_ptr<moab::DagMC> dag_ptr, int32_t dag_idx)
|
||||
: Cell {}, dagmc_ptr_(dag_ptr), dag_index_(dag_idx)
|
||||
{
|
||||
geom_type() = GeometryType::DAG;
|
||||
};
|
||||
: Cell {}, dagmc_ptr_(dag_ptr), dag_index_(dag_idx) {};
|
||||
|
||||
std::pair<double, int32_t> DAGCell::distance(
|
||||
Position r, Direction u, int32_t on_surface, GeometryState* p) const
|
||||
|
|
@ -765,9 +760,7 @@ BoundingBox DAGCell::bounding_box() const
|
|||
|
||||
DAGSurface::DAGSurface(std::shared_ptr<moab::DagMC> dag_ptr, int32_t dag_idx)
|
||||
: Surface {}, dagmc_ptr_(dag_ptr), dag_index_(dag_idx)
|
||||
{
|
||||
geom_type() = GeometryType::DAG;
|
||||
} // empty constructor
|
||||
{} // empty constructor
|
||||
|
||||
moab::EntityHandle DAGSurface::mesh_handle() const
|
||||
{
|
||||
|
|
|
|||
|
|
@ -187,15 +187,6 @@ void Surface::to_hdf5(hid_t group_id) const
|
|||
close_group(surf_group);
|
||||
}
|
||||
|
||||
CSGSurface::CSGSurface() : Surface {}
|
||||
{
|
||||
geom_type() = GeometryType::CSG;
|
||||
};
|
||||
CSGSurface::CSGSurface(pugi::xml_node surf_node) : Surface {surf_node}
|
||||
{
|
||||
geom_type() = GeometryType::CSG;
|
||||
};
|
||||
|
||||
//==============================================================================
|
||||
// Generic functions for x-, y-, and z-, planes.
|
||||
//==============================================================================
|
||||
|
|
@ -218,7 +209,7 @@ double axis_aligned_plane_distance(
|
|||
// SurfaceXPlane implementation
|
||||
//==============================================================================
|
||||
|
||||
SurfaceXPlane::SurfaceXPlane(pugi::xml_node surf_node) : CSGSurface(surf_node)
|
||||
SurfaceXPlane::SurfaceXPlane(pugi::xml_node surf_node) : Surface(surf_node)
|
||||
{
|
||||
read_coeffs(surf_node, id_, {&x0_});
|
||||
}
|
||||
|
|
@ -258,7 +249,7 @@ BoundingBox SurfaceXPlane::bounding_box(bool pos_side) const
|
|||
// SurfaceYPlane implementation
|
||||
//==============================================================================
|
||||
|
||||
SurfaceYPlane::SurfaceYPlane(pugi::xml_node surf_node) : CSGSurface(surf_node)
|
||||
SurfaceYPlane::SurfaceYPlane(pugi::xml_node surf_node) : Surface(surf_node)
|
||||
{
|
||||
read_coeffs(surf_node, id_, {&y0_});
|
||||
}
|
||||
|
|
@ -298,7 +289,7 @@ BoundingBox SurfaceYPlane::bounding_box(bool pos_side) const
|
|||
// SurfaceZPlane implementation
|
||||
//==============================================================================
|
||||
|
||||
SurfaceZPlane::SurfaceZPlane(pugi::xml_node surf_node) : CSGSurface(surf_node)
|
||||
SurfaceZPlane::SurfaceZPlane(pugi::xml_node surf_node) : Surface(surf_node)
|
||||
{
|
||||
read_coeffs(surf_node, id_, {&z0_});
|
||||
}
|
||||
|
|
@ -338,7 +329,7 @@ BoundingBox SurfaceZPlane::bounding_box(bool pos_side) const
|
|||
// SurfacePlane implementation
|
||||
//==============================================================================
|
||||
|
||||
SurfacePlane::SurfacePlane(pugi::xml_node surf_node) : CSGSurface(surf_node)
|
||||
SurfacePlane::SurfacePlane(pugi::xml_node surf_node) : Surface(surf_node)
|
||||
{
|
||||
read_coeffs(surf_node, id_, {&A_, &B_, &C_, &D_});
|
||||
}
|
||||
|
|
@ -457,7 +448,7 @@ Direction axis_aligned_cylinder_normal(
|
|||
//==============================================================================
|
||||
|
||||
SurfaceXCylinder::SurfaceXCylinder(pugi::xml_node surf_node)
|
||||
: CSGSurface(surf_node)
|
||||
: Surface(surf_node)
|
||||
{
|
||||
read_coeffs(surf_node, id_, {&y0_, &z0_, &radius_});
|
||||
}
|
||||
|
|
@ -500,7 +491,7 @@ BoundingBox SurfaceXCylinder::bounding_box(bool pos_side) const
|
|||
//==============================================================================
|
||||
|
||||
SurfaceYCylinder::SurfaceYCylinder(pugi::xml_node surf_node)
|
||||
: CSGSurface(surf_node)
|
||||
: Surface(surf_node)
|
||||
{
|
||||
read_coeffs(surf_node, id_, {&x0_, &z0_, &radius_});
|
||||
}
|
||||
|
|
@ -544,7 +535,7 @@ BoundingBox SurfaceYCylinder::bounding_box(bool pos_side) const
|
|||
//==============================================================================
|
||||
|
||||
SurfaceZCylinder::SurfaceZCylinder(pugi::xml_node surf_node)
|
||||
: CSGSurface(surf_node)
|
||||
: Surface(surf_node)
|
||||
{
|
||||
read_coeffs(surf_node, id_, {&x0_, &y0_, &radius_});
|
||||
}
|
||||
|
|
@ -587,7 +578,7 @@ BoundingBox SurfaceZCylinder::bounding_box(bool pos_side) const
|
|||
// SurfaceSphere implementation
|
||||
//==============================================================================
|
||||
|
||||
SurfaceSphere::SurfaceSphere(pugi::xml_node surf_node) : CSGSurface(surf_node)
|
||||
SurfaceSphere::SurfaceSphere(pugi::xml_node surf_node) : Surface(surf_node)
|
||||
{
|
||||
read_coeffs(surf_node, id_, {&x0_, &y0_, &z0_, &radius_});
|
||||
}
|
||||
|
|
@ -753,7 +744,7 @@ Direction axis_aligned_cone_normal(
|
|||
// SurfaceXCone implementation
|
||||
//==============================================================================
|
||||
|
||||
SurfaceXCone::SurfaceXCone(pugi::xml_node surf_node) : CSGSurface(surf_node)
|
||||
SurfaceXCone::SurfaceXCone(pugi::xml_node surf_node) : Surface(surf_node)
|
||||
{
|
||||
read_coeffs(surf_node, id_, {&x0_, &y0_, &z0_, &radius_sq_});
|
||||
}
|
||||
|
|
@ -785,7 +776,7 @@ void SurfaceXCone::to_hdf5_inner(hid_t group_id) const
|
|||
// SurfaceYCone implementation
|
||||
//==============================================================================
|
||||
|
||||
SurfaceYCone::SurfaceYCone(pugi::xml_node surf_node) : CSGSurface(surf_node)
|
||||
SurfaceYCone::SurfaceYCone(pugi::xml_node surf_node) : Surface(surf_node)
|
||||
{
|
||||
read_coeffs(surf_node, id_, {&x0_, &y0_, &z0_, &radius_sq_});
|
||||
}
|
||||
|
|
@ -817,7 +808,7 @@ void SurfaceYCone::to_hdf5_inner(hid_t group_id) const
|
|||
// SurfaceZCone implementation
|
||||
//==============================================================================
|
||||
|
||||
SurfaceZCone::SurfaceZCone(pugi::xml_node surf_node) : CSGSurface(surf_node)
|
||||
SurfaceZCone::SurfaceZCone(pugi::xml_node surf_node) : Surface(surf_node)
|
||||
{
|
||||
read_coeffs(surf_node, id_, {&x0_, &y0_, &z0_, &radius_sq_});
|
||||
}
|
||||
|
|
@ -849,7 +840,7 @@ void SurfaceZCone::to_hdf5_inner(hid_t group_id) const
|
|||
// SurfaceQuadric implementation
|
||||
//==============================================================================
|
||||
|
||||
SurfaceQuadric::SurfaceQuadric(pugi::xml_node surf_node) : CSGSurface(surf_node)
|
||||
SurfaceQuadric::SurfaceQuadric(pugi::xml_node surf_node) : Surface(surf_node)
|
||||
{
|
||||
read_coeffs(
|
||||
surf_node, id_, {&A_, &B_, &C_, &D_, &E_, &F_, &G_, &H_, &J_, &K_});
|
||||
|
|
@ -1009,7 +1000,7 @@ double torus_distance(double x1, double x2, double x3, double u1, double u2,
|
|||
// SurfaceXTorus implementation
|
||||
//==============================================================================
|
||||
|
||||
SurfaceXTorus::SurfaceXTorus(pugi::xml_node surf_node) : CSGSurface(surf_node)
|
||||
SurfaceXTorus::SurfaceXTorus(pugi::xml_node surf_node) : Surface(surf_node)
|
||||
{
|
||||
read_coeffs(surf_node, id_, {&x0_, &y0_, &z0_, &A_, &B_, &C_});
|
||||
}
|
||||
|
|
@ -1062,7 +1053,7 @@ Direction SurfaceXTorus::normal(Position r) const
|
|||
// SurfaceYTorus implementation
|
||||
//==============================================================================
|
||||
|
||||
SurfaceYTorus::SurfaceYTorus(pugi::xml_node surf_node) : CSGSurface(surf_node)
|
||||
SurfaceYTorus::SurfaceYTorus(pugi::xml_node surf_node) : Surface(surf_node)
|
||||
{
|
||||
read_coeffs(surf_node, id_, {&x0_, &y0_, &z0_, &A_, &B_, &C_});
|
||||
}
|
||||
|
|
@ -1115,7 +1106,7 @@ Direction SurfaceYTorus::normal(Position r) const
|
|||
// SurfaceZTorus implementation
|
||||
//==============================================================================
|
||||
|
||||
SurfaceZTorus::SurfaceZTorus(pugi::xml_node surf_node) : CSGSurface(surf_node)
|
||||
SurfaceZTorus::SurfaceZTorus(pugi::xml_node surf_node) : Surface(surf_node)
|
||||
{
|
||||
read_coeffs(surf_node, id_, {&x0_, &y0_, &z0_, &A_, &B_, &C_});
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue