Skip to content

Fix distribcell labels for lattices used as fill in multiple cells #2813

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.

Sign up for GitHub

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

Merged
paulromano merged 7 commits into from
Apr 8, 2024
Merged

Fix distribcell labels for lattices used as fill in multiple cells #2813

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a9f0e02
Adding test for tally results in multlattice model with a distributed…
pshriwise Dec 18, 2023
eced252
Account for cell offset for lattice fills
pshriwise Dec 18, 2023
873295b
Fix offset accountancy for distribcell_path_inner
pshriwise Dec 19, 2023
e9c24bb
rm dated comment
pshriwise Dec 19, 2023
132d811
Formatting
pshriwise Dec 19, 2023
c2dbf27
Only call run once from multilattice test
paulromano Apr 7, 2024
e4cb568
Reset IDs for cell instance tests
paulromano Apr 8, 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
Fix offset accountancy for distribcell_path_inner
  • Loading branch information
@pshriwise
pshriwise committed Dec 19, 2023
commit 873295b726722fb5716ca739380f4d72b6c63602
8 changes: 4 additions & 4 deletions src/geometry_aux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ std::string distribcell_path_inner(int32_t target_cell, int32_t map,
if (c.type_ != Fill::MATERIAL) {
int32_t temp_offset;
if (c.type_ == Fill::UNIVERSE) {
temp_offset = offset + c.offset_[map];
temp_offset = offset + c.offset_[map]; // should also apply to lattice fills?
} else {
Lattice& lat = *model::lattices[c.fill_];
int32_t indx = lat.universes_.size() * map + lat.begin().indx_;
Expand All @@ -539,7 +539,7 @@ std::string distribcell_path_inner(int32_t target_cell, int32_t map,

// The desired cell is the first cell that gives an offset smaller or
// equal to the target offset.
if (temp_offset <= target_offset)
if (temp_offset <= target_offset - c.offset_[map])
break;
}
}
Expand All @@ -561,11 +561,11 @@ std::string distribcell_path_inner(int32_t target_cell, int32_t map,
for (ReverseLatticeIter it = lat.rbegin(); it != lat.rend(); ++it) {
int32_t indx = lat.universes_.size() * map + it.indx_;
int32_t temp_offset = offset + lat.offsets_[indx];
if (temp_offset <= target_offset) {
if (temp_offset <= target_offset - c.offset_[map]) {
offset = temp_offset;
path << "(" << lat.index_to_string(it.indx_) << ")->";
path << distribcell_path_inner(
target_cell, map, target_offset, *model::universes[*it], offset);
target_cell, map, target_offset, *model::universes[*it], offset+c.offset_[map]);
return path.str();
}
}
Expand Down
2 changes: 0 additions & 2 deletions tests/unit_tests/test_cell_instance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ def double_lattice_model():
space = openmc.stats.Box(*bbox)
source = openmc.IndependentSource(space=space)
model.settings.source = source
# TODO: fix problem with tally output for multilattice models
model.settings.output = {'tallies': False}

# Add necessary settings and export
model.settings.batches = 10
Expand Down