diff --git a/src/LIB/SURCOUCHE/src/modd_io.f90 b/src/LIB/SURCOUCHE/src/modd_io.f90 index d304f439d4233334e49cbc943a9ab1a36d78b786..eaab4a3f0b6d71382c29e00614d981f6f2d563f4 100644 --- a/src/LIB/SURCOUCHE/src/modd_io.f90 +++ b/src/LIB/SURCOUCHE/src/modd_io.f90 @@ -23,7 +23,7 @@ INTEGER, PARAMETER :: NVERB_NO=0, NVERB_FATAL=1, NVERB_ERROR=2, NVERB_WARNING=3, INTEGER :: NNULLUNIT = -1 ! /dev/null fortran unit, value set in INITIO_ll CHARACTER(LEN=*), PARAMETER :: CNULLFILE = "/dev/null" -INTEGER, SAVE :: ISIOP !! IOproc number +INTEGER, SAVE :: NIO_RANK ! Rank of IO process INTEGER, SAVE :: ISP !! Actual proc number INTEGER, SAVE :: ISNPROC !! Total number of allocated processes LOGICAL, SAVE :: GSMONOPROC = .FALSE. !! True if sequential execution (ISNPROC = 1) diff --git a/src/LIB/SURCOUCHE/src/mode_io.f90 b/src/LIB/SURCOUCHE/src/mode_io.f90 index 912ee2e5122ab8546ad2c129441a7464aa0405be..4ff0f6265bef35da55e8f76c047b19b26321e973 100644 --- a/src/LIB/SURCOUCHE/src/mode_io.f90 +++ b/src/LIB/SURCOUCHE/src/mode_io.f90 @@ -71,7 +71,7 @@ CONTAINS END SUBROUTINE SET_CONFIO_INTERN_ll SUBROUTINE INITIO_ll() - USE MODD_IO_ll, only: CNULLFILE, GSMONOPROC, ISIOP, ISNPROC, ISP, NNULLUNIT + USE MODD_IO_ll, only: CNULLFILE, GSMONOPROC, nio_rank, ISNPROC, ISP, NNULLUNIT USE MODE_MNH_WORLD, ONLY: INIT_NMNH_COMM_WORLD @@ -88,7 +88,7 @@ CONTAINS !! Now MPI is initialized for sure !! Default number for Processor I/O - ISIOP = 1 + nio_rank = 1 !! Get number of allocated processors CALL MPI_COMM_SIZE(NMNH_COMM_WORLD, ISNPROC,IERR) diff --git a/src/LIB/SURCOUCHE/src/mode_io_file.f90 b/src/LIB/SURCOUCHE/src/mode_io_file.f90 index fd980c03c4c1b4b59dbca56ddd19d94b50b32911..9aa4c9a0775a59944d24e8ad6bbf6679b8d1d8bc 100644 --- a/src/LIB/SURCOUCHE/src/mode_io_file.f90 +++ b/src/LIB/SURCOUCHE/src/mode_io_file.f90 @@ -180,7 +180,7 @@ END SUBROUTINE IO_File_open SUBROUTINE OPEN_ll(TPFILE, KRESP, HMODE, HSTATUS, HPOSITION, HDELIM, HPROGRAM_ORIG) - use modd_io_ll, only: ISNPROC, ISP, LVERB_ALLPRC, ISIOP, NNULLUNIT + use modd_io_ll, only: ISNPROC, ISP, LVERB_ALLPRC, nio_rank, NNULLUNIT use modd_var_ll, only : nmnh_comm_world #if defined(MNH_IOCDF4) @@ -290,13 +290,13 @@ SUBROUTINE OPEN_ll(TPFILE, KRESP, HMODE, HSTATUS, HPOSITION, HDELIM, HPROGRAM_OR TPFILE%LMASTER = .TRUE. !Every process may write in the file TPFILE%LMULTIMASTERS = .TRUE. ELSE - TPFILE%NMASTER_RANK = ISIOP - TPFILE%LMASTER = (ISP == ISIOP) + TPFILE%NMASTER_RANK = nio_rank + TPFILE%LMASTER = (ISP == nio_rank) TPFILE%LMULTIMASTERS = .FALSE. END IF ELSE - TPFILE%NMASTER_RANK = ISIOP - TPFILE%LMASTER = (ISP == ISIOP) + TPFILE%NMASTER_RANK = nio_rank + TPFILE%LMASTER = (ISP == nio_rank) TPFILE%LMULTIMASTERS = .FALSE. END IF END IF @@ -422,8 +422,8 @@ SUBROUTINE OPEN_ll(TPFILE, KRESP, HMODE, HSTATUS, HPOSITION, HDELIM, HPROGRAM_OR CASE('IO_ZSPLIT') - TPFILE%NMASTER_RANK = ISIOP - TPFILE%LMASTER = (ISP == ISIOP) + TPFILE%NMASTER_RANK = nio_rank + TPFILE%LMASTER = (ISP == nio_rank) TPFILE%LMULTIMASTERS = .FALSE. IF (TPFILE%NSUBFILES_IOZ > 0) THEN