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

Cleaning up error checking in bounding_box. Updating expected exceptions in the capi tests.

Browse source
This commit is contained in:
Patrick Shriwise 2019-07-19 09:46:47 -05:00
parent 694bd0cf15
commit f2199af0eb
2 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/geometry.cpp
View file

@ -484,18 +484,27 @@ openmc_bounding_box(const char* geom_type, const int32_t id, double* llc, double
std::string gtype(geom_type);
to_lower(gtype);
// negative ids only for surfaces
if (id < 0 && gtype != "surface") {
std::stringstream msg;
msg << "Negative ID " << id << " passed to bounding box for "
<< "non-surface geom type '" << geom_type << "'" << std::endl;
set_errmsg(msg);
return OPENMC_E_INVALID_ID;
}
// id should never be zero
if (id == 0) {
set_errmsg("Invalid ID 0 for surface bounding box.");
return OPENMC_E_INVALID_ID;
}
if (gtype == "universe") {
// negative ids only apply to surfaces
if (id <= 0) { return OPENMC_E_INVALID_ID; }
const auto& u = model::universes[model::universe_map.at(id)];
bbox = u->bounding_box();
} else if (gtype == "cell") {
// negative ids only apply to surfaces
if (id <= 0) { return OPENMC_E_INVALID_ID; }
const auto& c = model::cells[model::cell_map.at(id)];
bbox = c->bounding_box();
} else if (gtype == "surface") {
if (id == 0) { return OPENMC_E_INVALID_ID; }
const auto& s = model::surfaces[model::surface_map.at(abs(id))];
bbox = s->bounding_box(id > 0);
} else {