Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix vaccum name in materials #971

Open
wants to merge 34 commits into
base: develop
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
89b3b98
Switching to exact match for vacuum and graveyard checks.
pshriwise Apr 20, 2022
01a7fdf
Removing extra print in uwuw test
pshriwise Apr 20, 2022
0731127
Using new member variables for comprision and assignment
pshriwise Apr 20, 2022
26c673f
Adding accessors for material strings and using in mcnp_funcs
pshriwise Apr 20, 2022
cf805d6
turning cout into a logged message
bam241 Dec 11, 2024
d521de4
Add changelog
bam241 Dec 11, 2024
e539b9b
bug fix
bam241 Dec 11, 2024
ebaa4d2
formating
bam241 Dec 11, 2024
425fba7
fixing mcnp bug
bam241 Dec 11, 2024
a170860
fixing mcnp bug
bam241 Dec 11, 2024
00b0d05
fixing mcnp bug
bam241 Dec 11, 2024
0d3d4f5
dagmc_util not dagmc_utils
bam241 Dec 11, 2024
e2e51b4
formating
bam241 Dec 11, 2024
e079784
using DMD to_lower
bam241 Dec 11, 2024
6f3b216
fix
bam241 Dec 11, 2024
e895f55
fix
bam241 Dec 11, 2024
6e8b942
fix typo
bam241 Dec 11, 2024
033a7af
propagating change
bam241 Dec 11, 2024
c205c03
propagating change
bam241 Dec 11, 2024
71bb4e0
removed the wrong import
bam241 Dec 11, 2024
f126a40
moving to_lower in utils
bam241 Dec 11, 2024
052e446
missing import and formating
bam241 Dec 11, 2024
bd5bfe4
mat_num
bam241 Dec 11, 2024
eb7c22d
typo + formating
bam241 Dec 11, 2024
92a7a39
typo + formating
bam241 Dec 11, 2024
2b8ba5d
back to origin
bam241 Dec 11, 2024
bcd0ce4
back to origin
bam241 Dec 11, 2024
aa5f3d9
formating
bam241 Dec 11, 2024
e850f99
Apply suggestions from code review
bam241 Dec 13, 2024
7048bdb
one vacuum mat was not set using vacuum_mat_str method
bam241 Dec 16, 2024
2576dfc
adding setting and tests to check detection of vacuum to avoid regres…
bam241 Dec 16, 2024
a4c164c
syntax and comment
bam241 Dec 16, 2024
06bc32a
syntax
bam241 Dec 16, 2024
b7f322c
syntax
bam241 Dec 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
propagating change
  • Loading branch information
bam241 committed Dec 11, 2024
commit 033a7af0500f0f44ebc75967438b7414cbcf41c1
8 changes: 4 additions & 4 deletions src/mcnp/mcnp_funcs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ void write_cell_cards(std::ostringstream& lcadfile,
} else {
std::string mat_name = DMD->volume_material_property_data_eh[entity];
// if we not vacuum or graveyard
if (mat_name != DMD->vacuum_mat_str() &&
mat_name != DMD->graveyard_mat_str()) {
if (DMD->to_lower(mat_num) != DMD->to_lower(DMD->graveyard_mat_str()) &&
DMD->to_lower(mat_num) != DMD->to_lower(DMD->vacuum_mat_str())) {
if (workflow_data->material_library.count(mat_name) == 0) {
std::cerr << "Material with name " << mat_name << " not found "
<< std::endl;
Expand Down Expand Up @@ -267,10 +267,10 @@ void write_cell_cards(std::ostringstream& lcadfile,
}
double imp = 1.0;
// if we find graveyard always have importance 0.0
if (mat_name == DMD->graveyard_mat_str()) {
if (DMD->to_lower(mat_num) == DMD->to_lower(DMD->graveyard_mat_str()) {
imp = 0.0;
// no splitting can happenin vacuum set to 1
} else if (mat_name == DMD->vacuum_mat_str()) {
} else if (DMD->to_lower(mat_num) != DMD->to_lower(DMD->vacuum_mat_str())) {
imp = 1.0;
// otherwise as the map says
} else {
Expand Down
Loading