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

Addressing some change requests from @promano.

Browse source
This commit is contained in:
Patrick Shriwise 2019-03-18 09:23:14 -05:00
parent f6b251145f
commit 4048a47fc4
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/dagmc.cpp
View file

@ -89,8 +89,7 @@ bool write_uwuw_materials_xml() {
return found_uwuw_mats;
}
void legacy_assign_material(const std::string& mat_string,
DAGCell* c)
void legacy_assign_material(const std::string& mat_string, DAGCell* c)
{
bool mat_found_by_name = false;
// attempt to find a material with a matching name
@ -116,7 +115,7 @@ void legacy_assign_material(const std::string& mat_string,
try {
auto id = std::stoi(mat_string);
c->material_.emplace_back(id);
} catch (...) {
} catch (const std::invalid_argument&) {
std::stringstream err_msg;
err_msg << "No material " << mat_string
<< " found for volume (cell) " << c->id_;
@ -128,11 +127,11 @@ void legacy_assign_material(const std::string& mat_string,
Material* m = model::materials[model::material_map[c->material_[0]]].get();
std::stringstream msg;
msg << "DAGMC material " << mat_string << " was assigned";
if (mat_found_by_name) {
msg << " using material name: " << m->name_;
} else {
msg << " using material id: " << m->id_;
}
if (mat_found_by_name) {
msg << " using material name: " << m->name_;
} else {
msg << " using material id: " << m->id_;
}
write_message(msg.str(), 10);
}
}