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

Fix tally reduction

Browse source
This commit is contained in:
Paul Romano 2018-10-11 09:35:51 -05:00
parent 2ccb7e3b58
commit 9c787f988e
7 changed files with 43 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/simulation.cpp
View file

@ -3,10 +3,7 @@
#include "openmc/capi.h"
#include "openmc/message_passing.h"
#include "openmc/settings.h"
#ifdef OPENMC_MPI
#include <mpi.h>
#endif
#include "openmc/tallies/tally.h"
#include <algorithm>
@ -106,29 +103,25 @@ void calculate_work()
#ifdef OPENMC_MPI
void broadcast_results() {
// Broadcast tally results so that each process has access to results
double* buffer;
if (n_tallies > 0) {
for (int i=1; i <= n_tallies; ++i) {
// Create a new datatype that consists of all values for a given filter
// bin and then use that to broadcast. This is done to minimize the
// chance of the 'count' argument of MPI_BCAST exceeding 2**31
int shape[3];
openmc_tally_results(i, &buffer, shape);
// Broadcast tally results so that each process has access to results
for (int i = 1; i <= n_tallies; ++i) {
// Create a new datatype that consists of all values for a given filter
// bin and then use that to broadcast. This is done to minimize the
// chance of the 'count' argument of MPI_BCAST exceeding 2**31
auto results = tally_results(i);
int n = shape[0];
int count_per_filter = shape[1] * shape[2];
MPI_Datatype result_block;
MPI_Type_contiguous(count_per_filter, MPI_DOUBLE, &result_block);
MPI_Type_commit(&result_block);
MPI_Bcast(buffer, n, result_block, 0, mpi::intracomm);
MPI_Type_free(&result_block);
}
auto shape = results.shape();
int count_per_filter = shape[1] * shape[2];
MPI_Datatype result_block;
MPI_Type_contiguous(count_per_filter, MPI_DOUBLE, &result_block);
MPI_Type_commit(&result_block);
MPI_Bcast(results.data(), shape[0], result_block, 0, mpi::intracomm);
MPI_Type_free(&result_block);
}
// Also broadcast global tally results
openmc_global_tallies(&buffer);
MPI_Bcast(buffer, 4, MPI_DOUBLE, 0, mpi::intracomm);
auto gt = global_tallies();
MPI_Bcast(gt.data(), gt.size(), MPI_DOUBLE, 0, mpi::intracomm);
// These guys are needed so that non-master processes can calculate the
// combined estimate of k-effective