Merge branch 'develop' into xml

src/constants.F90

@@ -8,7 +8,7 @@ module constants
   ! OpenMC major, minor, and release numbers
   integer, parameter :: VERSION_MAJOR   = 0
   integer, parameter :: VERSION_MINOR   = 5
-  integer, parameter :: VERSION_RELEASE = 2
+  integer, parameter :: VERSION_RELEASE = 3
 
   ! Revision numbers for binary files
   integer, parameter :: REVISION_STATEPOINT       = 10

src/output_interface.F90

@@ -1644,6 +1644,12 @@ contains
     call h5dclose_f(dset, hdf5_err)
     if (present(group)) call hdf5_close_group(self % hdf5_grp)
 
+# elif MPI
+
+    ! Write out tally buffer
+    call MPI_FILE_READ(self % unit_fh, buffer, n1*n2, MPI_TALLYRESULT, &
+         MPI_STATUS_IGNORE, mpiio_err)
+
 #else
 
     ! Read tally result

src/state_point.F90

@@ -474,7 +474,7 @@ contains
     call write_message(1)
 
     ! Open file for reading
-    call sp % file_open(path_state_point, 'r')
+    call sp % file_open(path_state_point, 'r', serial = .false.)
 
     ! Read filetype
     call sp % read_data(int_array(1), "filetype")
@@ -705,13 +705,6 @@ contains
 
         end do TALLY_RESULTS
       end if
-
-#ifdef MPI
-      ! If using MPI, file needs to be closed and reopened in parallel
-      ! If serial, we cannot close the file or we will lose our file position
-      call sp % file_close()
-# endif
-
     end if
 
     ! Read source if in eigenvalue mode 
@@ -739,14 +732,6 @@ contains
         ! Open source file 
         call sp % file_open(filename, 'r', serial = .false.)
 
-      else
-
-#ifdef MPI
-      ! Reopen statepoint file in parallel, but only if MPI
-      ! We will compute the position where the source begins
-      call sp % file_open(path_state_point, 'r', serial = .false.)
-#endif
-
       end if
 
       ! Write out source