[cig-commits] [commit] devel: fixes compilation error on cray for mpi status in read_sep_binary_mpiio; removes trailing spaces and warning about unused function (bc64b62)

[cig_noreply at geodynamics.org]

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

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/878e8bdf633e734f094de4d6668e91642aed2659...bc64b621279b3c6217beb0dc4260269179e694c1

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

commit bc64b621279b3c6217beb0dc4260269179e694c1
Author: daniel peter <peterda at ethz.ch>
Date:   Thu Oct 9 16:45:46 2014 +0200

    fixes compilation error on cray for mpi status in read_sep_binary_mpiio; removes trailing spaces and warning about unused function


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

bc64b621279b3c6217beb0dc4260269179e694c1
 src/generate_databases/model_default.f90        | 0
 src/generate_databases/model_sep.f90            | 7 ++++---
 src/generate_databases/parse_sep.c              | 0
 src/generate_databases/read_partition_files.f90 | 0
 src/meshfem3D/save_databases.f90                | 0
 src/meshfem3D/save_databases_adios.F90          | 0
 src/shared/adios_helpers_writers.f90            | 4 ++--
 7 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/generate_databases/model_sep.f90 b/src/generate_databases/model_sep.f90
index f91694a..77f297f 100644
--- a/src/generate_databases/model_sep.f90
+++ b/src/generate_databases/model_sep.f90
@@ -202,7 +202,8 @@ subroutine read_sep_binary_mpiio(filename, NX, NY, NZ, ni, nj, nk, &
   integer, dimension(3) :: global_sizes, local_sizes, starting_idx
   integer(kind=MPI_OFFSET_KIND) :: displ
   integer :: subarray_type
-  integer :: mpi_status, ier
+  integer :: ier
+  integer :: status(MPI_STATUS_SIZE)
 
   ! Sizes for the subarrays
   global_sizes = (/ NX, NY, NZ /)
@@ -224,9 +225,9 @@ subroutine read_sep_binary_mpiio(filename, NX, NY, NZ, ni, nj, nk, &
   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_read_all(fh, var, ni * nj * nk, MPI_REAL, status, ier)
   call MPI_File_close(fh, ier)
+
 end subroutine read_sep_binary_mpiio
 
 !==============================================================================
diff --git a/src/shared/adios_helpers_writers.f90 b/src/shared/adios_helpers_writers.f90
index b245609..10f0bc4 100644
--- a/src/shared/adios_helpers_writers.f90
+++ b/src/shared/adios_helpers_writers.f90
@@ -1014,8 +1014,8 @@ subroutine write_adios_global_1d_string_1d(adios_handle, myrank, sizeprocs, loca
 
   print *,"tag1: ",trim(array_name)," local_dim/global_dim/offset: ",local_dim,global_dim,offset
 
-!  call write_1D_string_array_adios_dims(adios_handle, myrank, local_dim, global_dim, offset, sizeprocs, array_name)
-  call write_1D_global_array_adios_dims(adios_handle, myrank, local_dim, sizeprocs, array_name)
+  call write_1D_string_array_adios_dims(adios_handle, myrank, local_dim, global_dim, offset, sizeprocs, array_name)
+  !call write_1D_global_array_adios_dims(adios_handle, myrank, local_dim, sizeprocs, array_name)
   print *,"tag2: ",trim(array)
 
   call adios_write(adios_handle, trim(array_name)// "/array", array(1:local_dim), adios_err)