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

Fixed to automatic ID generation for DAGMC universes.

Browse source
This commit is contained in:
Patrick Shriwise 2020-10-13 11:40:29 -05:00
parent afaf3b04bf
commit 70ec716c1f
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cell.cpp
View file

@ -1026,6 +1026,8 @@ void read_cells(pugi::xml_node node)
model::cells.push_back(make_unique<CSGCell>(cell_node));
}
read_dagmc_universes(node);
// Fill the cell map.
for (int i = 0; i < model::cells.size(); i++) {
int32_t id = model::cells[i]->id_;
@ -1037,8 +1039,6 @@ void read_cells(pugi::xml_node node)
}
}
read_dagmc_universes(node);
// Populate the Universe vector and map.
for (int i = 0; i < model::cells.size(); i++) {
int32_t uid = model::cells[i]->universe_;

20
src/dagmc.cpp
View file

@ -257,8 +257,6 @@ void DAGUniverse::initialize() {
c->fill_ = C_NONE; // no fill, single universe
model::cells.emplace_back(c);
model::cell_map[c->id_] = model::cells.size() - 1;
cells_.push_back(model::cell_map[c->id_]);
// MATERIALS
@ -330,14 +328,14 @@ void DAGUniverse::initialize() {
// initialize surface objects
int n_surfaces = dagmc_instance_->num_entities(2);
for (int i = 0; i < n_surfaces; i++) {
moab::EntityHandle surf_handle = dagmc_instance_->entity_by_index(2, i+1);
// set cell ids using global IDs
DAGSurface* s = new DAGSurface();
s->dag_index_ = i+1;
s->id_ = dagmc_instance_->id_by_index(2, i+1);
s->id_ = next_surf_id++;
// s->id_ = dagmc_instance_->id_by_index(2, i+1);
s->dagmc_ptr_ = dagmc_instance_;
// set BCs
@ -369,11 +367,21 @@ void DAGUniverse::initialize() {
}
// add to global array and map
auto in_map = model::surface_map.find(s->id_);
if (in_map == model::surface_map.end()) {
model::surface_map[s->id_] = model::surfaces.size();
} else {
fatal_error(fmt::format(
"Two or more surfaces use the same unique ID: {}", s->id_));
}
model::surfaces.emplace_back(s);
model::surface_map[s->id_] = model::surfaces.size() - 1;
}
} // end surface loop
}
int32_t create_dagmc_universe(const std::string& filename) {
if (!model::DAG) {
model::DAG = std::make_shared<moab::DagMC>();