Skip to content

Commit

Permalink
mat_num
Browse files Browse the repository at this point in the history
  • Loading branch information
bam241 committed Dec 11, 2024
1 parent 052e446 commit bd5bfe4
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
13 changes: 6 additions & 7 deletions src/dagmc/dagmcmetadata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,9 @@ void dagmcMetaData::parse_material_data() {
// set the material value
volume_material_property_data_eh[eh] = grp_name;
logger.message("Group name -- " + grp_name);
bool is_graveyard = dagmc_util::to_lower(grp_name) ==
bool is_graveyard = dagmc_util::to_lower(grp_name) ==
dagmc_util::to_lower(graveyard_mat_str());
bool is_vacuum = dagmc_util::to_lower(grp_name) ==
bool is_vacuum = dagmc_util::to_lower(grp_name) ==
dagmc_util::to_lower(vacuum_mat_str());

// not graveyard or vacuum or implicit compliment
Expand Down Expand Up @@ -378,17 +378,16 @@ void dagmcMetaData::parse_boundary_data() {

std::string bc_string = dagmc_util::to_lower(boundary_assignment[0]);

if (bc_string.find(dagmc_util::to_lower(reflecting_str())) !=
if (bc_string.find(dagmc_util::to_lower(reflecting_str())) !=
std::string::npos)
surface_boundary_data_eh[eh] = reflecting_str();
if (bc_string.find(dagmc_util::to_lower(white_str())) !=
if (bc_string.find(dagmc_util::to_lower(white_str())) !=
std::string::npos)
surface_boundary_data_eh[eh] = white_str();
if (bc_string.find(dagmc_util::to_lower(periodic_str())) !=
if (bc_string.find(dagmc_util::to_lower(periodic_str())) !=
std::string::npos)
surface_boundary_data_eh[eh] = periodic_str();
if (bc_string.find(dagmc_util::to_lower(vacuum_str())) !=
std::string::npos)
if (bc_string.find(dagmc_util::to_lower(vacuum_str())) != std::string::npos)
surface_boundary_data_eh[eh] = vacuum_str();
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/mcnp/mcnp_funcs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,9 @@ void write_cell_cards(std::ostringstream& lcadfile,
// that material numbers are assigned
mat_num = DMD->volume_material_data_eh[entity];
// if we cant make an int from the mat_num
if (dagmc_util::to_lower(mat_num) !=
if (dagmc_util::to_lower(mat_num) !=
dagmc_util::to_lower(DMD->graveyard_mat_str()) &&
dagmc_util::to_lower(mat_num) !=
dagmc_util::to_lower(mat_num) !=
dagmc_util::to_lower(DMD->vacuum_mat_str())) {
if (!DMD->try_to_make_int(mat_num)) {
std::cerr << "Failed to cast material number to an integer"
Expand Down Expand Up @@ -272,10 +272,10 @@ void write_cell_cards(std::ostringstream& lcadfile,
}
double imp = 1.0;
// if we find graveyard always have importance 0.0
if (dagmc_util::to_lower(mat_nanme) == dagmc_util::to_lower(DMD->graveyard_mat_str()) {
if (dagmc_util::to_lower(mat_num) == dagmc_util::to_lower(DMD->graveyard_mat_str()) {
imp = 0.0;
// no splitting can happenin vacuum set to 1
} else if (dagmc_util::to_lower(mat_nanme) == dagmc_util::to_lower(DMD->vacuum_mat_str())) {
} else if (dagmc_util::to_lower(mat_num) == dagmc_util::to_lower(DMD->vacuum_mat_str())) {
imp = 1.0;
// otherwise as the map says
} else {
Expand All @@ -285,15 +285,15 @@ void write_cell_cards(std::ostringstream& lcadfile,
}
// its possible no importances were assigned
if (set.size() == 0) {
if (dagmc_util::to_lower(mat_nanme) != dagmc_util::to_lower(DMD->graveyard_mat_str()) {
if (dagmc_util::to_lower(mat_num) != dagmc_util::to_lower(DMD->graveyard_mat_str()) {
importances = "imp:n=1";
} else {
importances = "imp:n=0";
}
}

// add descriptive comments for special volumes
if (dagmc_util::to_lower(mat_nanme) == dagmc_util::to_lower(DMD->graveyard_mat_str()) {
if (dagmc_util::to_lower(mat_num) == dagmc_util::to_lower(DMD->graveyard_mat_str()) {
importances += " $ graveyard";
} else if (DAG->is_implicit_complement(entity)) {
importances += " $ implicit complement";
Expand Down

0 comments on commit bd5bfe4

Please sign in to comment.