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 bugs for MPI/non-PHDF5 runs

Browse source
This commit is contained in:
Paul Romano 2018-04-20 14:55:06 -05:00
parent d8c30b7f62
commit 3290c410a8
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/initialize.h
View file

@ -1,7 +1,9 @@
#ifndef INITIALIZE_H
#define INITIALIZE_H
#ifdef OPENMC_MPI
#include "mpi.h"
#endif
namespace openmc {

2
src/message_passing.h
View file

@ -1,7 +1,9 @@
#ifndef MESSAGE_PASSING_H
#define MESSAGE_PASSING_H
#ifdef OPENMC_MPI
#include "mpi.h"
#endif
namespace openmc {
namespace mpi {

10
src/state_point.cpp
View file

@ -3,7 +3,9 @@
#include <algorithm>
#include <vector>
#ifdef OPENMC_MPI
#include "mpi.h"
#endif
#include "error.h"
#include "message_passing.h"
#include "openmc.h"
@ -30,7 +32,7 @@ hid_t h5banktype() {
void
write_source_bank(hid_t group_id, int64_t* work_index, const Bank* source_bank)
write_source_bank(hid_t group_id, int64_t* work_index, Bank* source_bank)
{
hid_t banktype = h5banktype();
@ -73,7 +75,7 @@ write_source_bank(hid_t group_id, int64_t* work_index, const Bank* source_bank)
// Save source bank sites since the souce_bank array is overwritten below
#ifdef OPENMC_MPI
std::vector<double> temp_source {source_bank, source_bank + openmc_work};
std::vector<Bank> temp_source {source_bank, source_bank + openmc_work};
#endif
for (int i = 0; i < openmc::mpi::n_procs; ++i) {
@ -110,7 +112,7 @@ write_source_bank(hid_t group_id, int64_t* work_index, const Bank* source_bank)
} else {
#ifdef OPENMC_MPI
MPI_Send(source_bank, openmc_work, openmc::mpi::bank, 0, openmc::mpi::rank,
openmc::mpi::mpi_intracomm);
openmc::mpi::intracomm);
#endif
}
#endif
@ -119,7 +121,7 @@ write_source_bank(hid_t group_id, int64_t* work_index, const Bank* source_bank)
}
void read_source_bank(hid_t group_id, int64_t* work_index, struct Bank* source_bank)
void read_source_bank(hid_t group_id, int64_t* work_index, Bank* source_bank)
{
hid_t banktype = h5banktype();

4
src/state_point.h
View file

@ -9,9 +9,9 @@
namespace openmc {
extern "C" void write_source_bank(hid_t group_id, int64_t* work_index,
const struct Bank* source_bank);
Bank* source_bank);
extern "C" void read_source_bank(hid_t group_id, int64_t* work_index,
struct Bank* source_bank);
Bank* source_bank);
} // namespace openmc
#endif // STATE_POINT_H