[cig-commits] [commit] devel: removed my patch to Matthieu's MPI-IO routines: it was a false positive on our side, MPI had been installed without MPI-IO support on our machine (31aed1a)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/specfem3d

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/2f281008845e767e0fac82a7a11351e1fa0171ce...31aed1a29e5095bec020152713eee000fd905e45

>---------------------------------------------------------------

commit 31aed1a29e5095bec020152713eee000fd905e45
Author: Dimitri Komatitsch <komatitsch at lma.cnrs-mrs.fr>
Date:   Fri Oct 3 17:53:29 2014 +0200

    removed my patch to Matthieu's MPI-IO routines: it was a false positive on our side, MPI had been installed without MPI-IO support on our machine


>---------------------------------------------------------------

31aed1a29e5095bec020152713eee000fd905e45
 src/generate_databases/model_sep.f90 | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/generate_databases/model_sep.f90 b/src/generate_databases/model_sep.f90
index 0799a5b..b220c9d 100644
--- a/src/generate_databases/model_sep.f90
+++ b/src/generate_databases/model_sep.f90
@@ -182,22 +182,17 @@ subroutine read_sep_binary_mpiio(filename, NX, NY, NZ, ni, nj, nk, &
                                 MPI_ORDER_FORTRAN, MPI_REAL, subarray_type, ier)
   call MPI_Type_commit(subarray_type, ier)
 
-!! DK DK comments this out because it breaks the code
-!!DK DK  call MPI_File_open(MPI_COMM_WORLD, trim(adjustl(filename)), &
-!!DK DK                     MPI_MODE_RDONLY, MPI_INFO_NULL, fh, ier)
-!! DK DK adds this temporarily to force the code to compile without a warning,
-!! DK DK otherwise BuildBot rejects it
-  print *,filename, var, fh, mpi_status, 'added this because the code is broken'
+  call MPI_File_open(MPI_COMM_WORLD, trim(adjustl(filename)), &
+                     MPI_MODE_RDONLY, MPI_INFO_NULL, fh, ier)
 
   ! View is set to match the stencil
   displ = 0
-!! DK DK comments this out because it breaks the code when the code tries to link
-!!DK DK  call MPI_File_set_view(fh, displ, MPI_REAL, subarray_type, "native", &
-!!DK DK                         MPI_INFO_NULL, ier)
-  ! Number of element is equal to the local size
-!!DK DK  call MPI_File_read_all(fh, var, ni * nj * nk, &
-!!DK DK                         MPI_REAL, mpi_status, ier)
-!!DK DK  call MPI_File_close(fh, ier)
+  call MPI_File_set_view(fh, displ, MPI_REAL, subarray_type, "native", &
+                         MPI_INFO_NULL, ier)
+  ! Number of elements is equal to the local size
+  call MPI_File_read_all(fh, var, ni * nj * nk, &
+                         MPI_REAL, mpi_status, ier)
+  call MPI_File_close(fh, ier)
 end subroutine read_sep_binary_mpiio
 
 !==============================================================================