crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-27 13:45:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved event buffer initialization to simulation initialization function, rather than allocating and free'ing each power iteration. Also added ifdef for enabling/disabling event-based simulation.

Browse source
This commit is contained in:
John Tramm 2020-01-08 19:27:03 +00:00
parent 3621fddc7e
commit e194dfb1b1
1 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/simulation.cpp
View file

@ -101,11 +101,6 @@ void transport_event_based()
int remaining_work = simulation::work_per_rank;
int source_offset = 0;
int max_n_particles = simulation::max_particles_in_flight;
if( max_n_particles > remaining_work)
max_n_particles = remaining_work;
init_event_queues(max_n_particles);
stop = get_time();
time_init += stop - start;
@ -115,9 +110,7 @@ void transport_event_based()
start = get_time();
// Figure out work for this subiteration
int n_particles = simulation::max_particles_in_flight;
if( n_particles > remaining_work)
n_particles = remaining_work;
int n_particles = std::min(remaining_work, simulation::max_particles_in_flight);
#pragma omp parallel for schedule(runtime)
for (int i = 0; i < n_particles; i++) {
@ -238,9 +231,16 @@ int openmc_simulation_init()
// fission bank
allocate_banks();
init_shared_fission_bank(simulation::work_per_rank * 3);
// If doing an event-based simulatino, intialize the particle buffer
// and event queues
#ifdef EVENT_BASED
int event_buffer_length = std::min(simulation::work_per_rank,
simulation::max_particles_in_flight);
init_event_queues(event_buffer_length);
#endif
// Allocate tally results arrays if they're not allocated yet
for (auto& t : model::tallies) {
t->init_results();
}
@ -323,6 +323,10 @@ int openmc_simulation_finalize()
if (settings::check_overlaps) print_overlap_check();
free_shared_fission_bank();
#ifdef EVENT_BASED
free_event_queues();
#endif
// Reset flags
simulation::need_depletion_rx = false;
@ -353,9 +357,11 @@ int openmc_next_batch(int* status)
// Start timer for transport
simulation::time_transport.start();
#ifdef EVENT_BASED
transport_event_based();
#else
transport_history_based();
//transport_event_based();
#endif
// Accumulate time for transport
simulation::time_transport.stop();