Merge pull request #1222 from shikhar413/cmfd-added-funcs

Added CMFD Functionality - Tally windows, statepoint write/restart, in-memory functions
This commit is contained in:
Paul Romano 2019-06-13 08:01:47 -05:00 committed by GitHub
commit cb9d0a92b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
43 changed files with 3207 additions and 287 deletions

View file

@ -221,6 +221,16 @@ int openmc_next_batch(int* status)
return 0;
}
bool openmc_is_statepoint_batch() {
using namespace openmc;
using openmc::simulation::current_gen;
if (!simulation::initialized)
return false;
else
return contains(settings::statepoint_batch, simulation::current_batch);
}
namespace openmc {
//==============================================================================
@ -357,8 +367,10 @@ void finalize_batch()
settings::statepoint_batch.insert(simulation::current_batch);
}
// Write out state point if it's been specified for this batch
if (contains(settings::statepoint_batch, simulation::current_batch)) {
// Write out state point if it's been specified for this batch and is not
// a CMFD run instance
if (contains(settings::statepoint_batch, simulation::current_batch)
&& !settings::cmfd_run) {
if (contains(settings::sourcepoint_batch, simulation::current_batch)
&& settings::source_write && !settings::source_separate) {
bool b = true;