Skip to content

Bank surface source particles in all active cycles #2592

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 8 commits into from
Jul 14, 2023
Merged

Bank surface source particles in all active cycles #2592

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cbad9fc
Bank particles in all active cycles
marquezj Apr 28, 2023
0e32310
Fix check on surface source banking, updating regression test
paulromano Jun 5, 2023
5e500f7
Merge branch 'openmc-dev:develop' into develop
marquezj Jul 3, 2023
802582a
Merge pull request #2 from paulromano/surf-source-banking-fix
marquezj Jul 3, 2023
923f116
Style change
marquezj Jul 5, 2023
7b5abb0
Force one MPI process for surface source write test
paulromano Jul 7, 2023
724825a
Add const on SharedArray::full method
paulromano Jul 14, 2023
3c2e09f
Use clang-format 15
paulromano Jul 14, 2023
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
3 changes: 3 additions & 0 deletions include/openmc/shared_array.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ class SharedArray {
//! \param size The new size of the container
void resize(int64_t size) { size_ = size; }

//! Return whether the array is full
bool full() { return size_ == capacity_; }
Comment thread
paulromano marked this conversation as resolved.
Resolved

//! Return the number of elements that the container has currently allocated
//! space for.
int64_t capacity() { return capacity_; }
Expand Down
3 changes: 2 additions & 1 deletion src/particle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,8 @@ void Particle::cross_surface()
write_message(1, " Crossing surface {}", surf->id_);
}

if (surf->surf_source_ && simulation::current_batch == settings::n_batches) {
if (surf->surf_source_ && simulation::current_batch > settings::n_inactive &&
!simulation::surf_source_bank.full()) {
SourceSite site;

@gridley gridley Jul 11, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice if we had Particle::to_source_site, since this pattern is probably used elsewhere. Again, not necessary.

@paulromano paulromano Jul 14, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good suggestion! I'll look into doing this on a separate PR

site.r = r();
site.u = u();
Expand Down
Binary file modified tests/regression_tests/surface_source/surface_source_true.h5
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions tests/regression_tests/surface_source/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import openmc

from tests.testing_harness import PyAPITestHarness
from tests.regression_tests import config


@pytest.fixture
Expand Down Expand Up @@ -118,10 +119,14 @@ def _cleanup(self):

@pytest.mark.surf_source_op('write')
def test_surface_source_write(model):
# Test result is based on 1 MPI process
np = config['mpi_np']
config['mpi_np'] = '1'
harness = SurfaceSourceTestHarness('statepoint.10.h5',
model,
'inputs_true_write.dat')
harness.main()
config['mpi_np'] = np


@pytest.mark.surf_source_op('read')
Expand Down