Skip to content
Snippets Groups Projects
Commit 0d6c333c authored by WAUTELET Philippe's avatar WAUTELET Philippe
Browse files

Philippe 01/03/2019: minor: rename ISIOP -> NIO_RANK

parent ee2805f3
No related branches found
No related tags found
No related merge requests found
...@@ -23,7 +23,7 @@ INTEGER, PARAMETER :: NVERB_NO=0, NVERB_FATAL=1, NVERB_ERROR=2, NVERB_WARNING=3, ...@@ -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 INTEGER :: NNULLUNIT = -1 ! /dev/null fortran unit, value set in INITIO_ll
CHARACTER(LEN=*), PARAMETER :: CNULLFILE = "/dev/null" 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 :: ISP !! Actual proc number
INTEGER, SAVE :: ISNPROC !! Total number of allocated processes INTEGER, SAVE :: ISNPROC !! Total number of allocated processes
LOGICAL, SAVE :: GSMONOPROC = .FALSE. !! True if sequential execution (ISNPROC = 1) LOGICAL, SAVE :: GSMONOPROC = .FALSE. !! True if sequential execution (ISNPROC = 1)
......
...@@ -71,7 +71,7 @@ CONTAINS ...@@ -71,7 +71,7 @@ CONTAINS
END SUBROUTINE SET_CONFIO_INTERN_ll END SUBROUTINE SET_CONFIO_INTERN_ll
SUBROUTINE INITIO_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 USE MODE_MNH_WORLD, ONLY: INIT_NMNH_COMM_WORLD
...@@ -88,7 +88,7 @@ CONTAINS ...@@ -88,7 +88,7 @@ CONTAINS
!! Now MPI is initialized for sure !! Now MPI is initialized for sure
!! Default number for Processor I/O !! Default number for Processor I/O
ISIOP = 1 nio_rank = 1
!! Get number of allocated processors !! Get number of allocated processors
CALL MPI_COMM_SIZE(NMNH_COMM_WORLD, ISNPROC,IERR) CALL MPI_COMM_SIZE(NMNH_COMM_WORLD, ISNPROC,IERR)
......
...@@ -180,7 +180,7 @@ END SUBROUTINE IO_File_open ...@@ -180,7 +180,7 @@ END SUBROUTINE IO_File_open
SUBROUTINE OPEN_ll(TPFILE, KRESP, HMODE, HSTATUS, HPOSITION, HDELIM, HPROGRAM_ORIG) 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 use modd_var_ll, only : nmnh_comm_world
#if defined(MNH_IOCDF4) #if defined(MNH_IOCDF4)
...@@ -290,13 +290,13 @@ SUBROUTINE OPEN_ll(TPFILE, KRESP, HMODE, HSTATUS, HPOSITION, HDELIM, HPROGRAM_OR ...@@ -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%LMASTER = .TRUE. !Every process may write in the file
TPFILE%LMULTIMASTERS = .TRUE. TPFILE%LMULTIMASTERS = .TRUE.
ELSE ELSE
TPFILE%NMASTER_RANK = ISIOP TPFILE%NMASTER_RANK = nio_rank
TPFILE%LMASTER = (ISP == ISIOP) TPFILE%LMASTER = (ISP == nio_rank)
TPFILE%LMULTIMASTERS = .FALSE. TPFILE%LMULTIMASTERS = .FALSE.
END IF END IF
ELSE ELSE
TPFILE%NMASTER_RANK = ISIOP TPFILE%NMASTER_RANK = nio_rank
TPFILE%LMASTER = (ISP == ISIOP) TPFILE%LMASTER = (ISP == nio_rank)
TPFILE%LMULTIMASTERS = .FALSE. TPFILE%LMULTIMASTERS = .FALSE.
END IF END IF
END IF END IF
...@@ -422,8 +422,8 @@ SUBROUTINE OPEN_ll(TPFILE, KRESP, HMODE, HSTATUS, HPOSITION, HDELIM, HPROGRAM_OR ...@@ -422,8 +422,8 @@ SUBROUTINE OPEN_ll(TPFILE, KRESP, HMODE, HSTATUS, HPOSITION, HDELIM, HPROGRAM_OR
CASE('IO_ZSPLIT') CASE('IO_ZSPLIT')
TPFILE%NMASTER_RANK = ISIOP TPFILE%NMASTER_RANK = nio_rank
TPFILE%LMASTER = (ISP == ISIOP) TPFILE%LMASTER = (ISP == nio_rank)
TPFILE%LMULTIMASTERS = .FALSE. TPFILE%LMULTIMASTERS = .FALSE.
IF (TPFILE%NSUBFILES_IOZ > 0) THEN IF (TPFILE%NSUBFILES_IOZ > 0) THEN
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment