crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-26 05:05:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'develop' into cpp-init-finalize

Browse source
This commit is contained in:
Paul Romano 2018-10-25 16:34:01 -04:00
commit b2eba58946
99 changed files with 3420 additions and 3137 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/simulation.cpp
View file

@ -12,6 +12,7 @@
#include "openmc/source.h"
#include "openmc/state_point.h"
#include "openmc/timer.h"
#include "openmc/tallies/filter.h"
#include "openmc/tallies/tally.h"
#include <algorithm>
@ -53,7 +54,8 @@ extern "C" void write_tallies();
// over the batches, generations, and histories in a fixed source or k-eigenvalue
// calculation.
int openmc_run() {
int openmc_run()
{
openmc_simulation_init();
int err = 0;
@ -76,6 +78,12 @@ int openmc_simulation_init()
// Determine how much work each process should do
calculate_work();
// Allocate array for matching filter bins
#pragma omp parallel
{
filter_matches.resize(n_filters);
}
// Set up tally procedure pointers
init_tally_routines();
@ -134,6 +142,11 @@ int openmc_simulation_finalize()
time_active.stop();
time_finalize.start();
#pragma omp parallel
{
filter_matches.clear();
}
// Deallocate Fortran variables, set tallies to inactive
simulation_finalize_f();