From 3290c410a8df12e76c7852644dda4e73be7907f6 Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Fri, 20 Apr 2018 14:55:06 -0500
Subject: [PATCH] Fix bugs for MPI/non-PHDF5 runs

---
 src/initialize.h      |  2 ++
 src/message_passing.h |  2 ++
 src/state_point.cpp   | 10 ++++++----
 src/state_point.h     |  4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/initialize.h b/src/initialize.h
index 430987038..d2c4df5d7 100644
--- a/src/initialize.h
+++ b/src/initialize.h
@@ -1,7 +1,9 @@
 #ifndef INITIALIZE_H
 #define INITIALIZE_H
 
+#ifdef OPENMC_MPI
 #include "mpi.h"
+#endif
 
 namespace openmc {
 
diff --git a/src/message_passing.h b/src/message_passing.h
index 67353e23a..14cf3a7cb 100644
--- a/src/message_passing.h
+++ b/src/message_passing.h
@@ -1,7 +1,9 @@
 #ifndef MESSAGE_PASSING_H
 #define MESSAGE_PASSING_H
 
+#ifdef OPENMC_MPI
 #include "mpi.h"
+#endif
 
 namespace openmc {
 namespace mpi {
diff --git a/src/state_point.cpp b/src/state_point.cpp
index cc6aa2a41..2ea9d1c43 100644
--- a/src/state_point.cpp
+++ b/src/state_point.cpp
@@ -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();
 
diff --git a/src/state_point.h b/src/state_point.h
index 34186d0d9..459df1a67 100644
--- a/src/state_point.h
+++ b/src/state_point.h
@@ -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