crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-27 05:35:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only expose methods that are needed externally

Browse source
This commit is contained in:
helen-brooks 2022-04-19 15:50:34 +01:00
parent fb9c12bd14
commit 5dd6da91c5
2 changed files with 14 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/openmc/dagmc.h
View file

@ -98,13 +98,6 @@ public:
//! assignments, etc.
void initialize();
//! When providing an external DAGMC instance, the user will need to call
//! these methods manually
void init_metadata(); //!< Create and initialise dagmcMetaData pointer
void init_uwuw(); //!< Create UWUW pointer
void init_cells(); //!< Create cells from DAGMC volumes
void init_surfaces(); //!< Create surfaces from DAGMC surfaces
//! Reads UWUW materials and returns an ID map
void read_uwuw_materials();
//! Indicates whether or not UWUW materials are present
@ -155,6 +148,8 @@ public:
private:
void set_id(); //!< Deduce the universe id from model::universes
void init_dagmc(); //!< Create and initialise DAGMC pointer
void init_metadata(); //!< Create and initialise dagmcMetaData pointer
void init_geometry(); //!< Create cells and surfaces from DAGMC entities
std::string
filename_; //!< Name of the DAGMC file used to create this universe
@ -169,7 +164,6 @@ private:
//!< generate new material IDs for the universe
bool has_graveyard_; //!< Indicates if the DAGMC geometry has a "graveyard"
//!< volume
moab::EntityHandle graveyard; //!< MOAB index for graveyard
};
//==============================================================================

33
src/dagmc.cpp
View file

@ -83,7 +83,9 @@ DAGUniverse::DAGUniverse(std::shared_ptr<moab::DagMC> external_dagmc_ptr,
adjust_geometry_ids_(auto_geom_ids), adjust_material_ids_(auto_mat_ids)
{
set_id();
uwuw_disabled = (filename=="");
init_metadata();
read_uwuw_materials();
init_geometry();
}
void DAGUniverse::set_id()
@ -103,19 +105,14 @@ void DAGUniverse::set_id()
void DAGUniverse::initialize()
{
geom_type() = GeometryType::DAG;
uwuw_disabled = false;
init_dagmc();
init_metadata();
init_uwuw();
read_uwuw_materials();
init_cells();
init_surfaces();
init_geometry();
}
void DAGUniverse::init_dagmc()
@ -151,7 +148,7 @@ void DAGUniverse::init_metadata()
MB_CHK_ERR_CONT(rval);
}
void DAGUniverse::init_cells()
void DAGUniverse::init_geometry()
{
moab::ErrorCode rval;
@ -166,7 +163,7 @@ void DAGUniverse::init_cells()
// initialize cell objects
int n_cells = dagmc_instance_->num_entities(3);
graveyard = 0;
moab::EntityHandle graveyard = 0;
for (int i = 0; i < n_cells; i++) {
moab::EntityHandle vol_handle = dagmc_instance_->entity_by_index(3, i + 1);
@ -259,12 +256,6 @@ void DAGUniverse::init_cells()
has_graveyard_ = graveyard;
}
void DAGUniverse::init_surfaces()
{
moab::ErrorCode rval;
// determine the next surface id
int32_t next_surf_id = 0;
for (const auto& s : model::surfaces) {
@ -514,14 +505,14 @@ void DAGUniverse::legacy_assign_material(
}
}
void DAGUniverse::init_uwuw()
{
if (uwuw_disabled) return;
uwuw_ = std::make_shared<UWUW>(filename_.c_str());
}
void DAGUniverse::read_uwuw_materials()
{
// If no filename was provided, disable read UWUW materials
uwuw_disabled = (filename_=="");
if (uwuw_disabled) return;
uwuw_ = std::make_shared<UWUW>(filename_.c_str());
if (!uses_uwuw())
return;