From 0d6c333ccbd2203b79ab0edf6b92fea7367e9503 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 1 Mar 2019 13:42:58 +0100
Subject: [PATCH] Philippe 01/03/2019: minor: rename ISIOP -> NIO_RANK
---
src/LIB/SURCOUCHE/src/modd_io.f90 | 2 +-
src/LIB/SURCOUCHE/src/mode_io.f90 | 4 ++--
src/LIB/SURCOUCHE/src/mode_io_file.f90 | 14 +++++++-------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/LIB/SURCOUCHE/src/modd_io.f90 b/src/LIB/SURCOUCHE/src/modd_io.f90
index d304f439d..eaab4a3f0 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 912ee2e51..4ff0f6265 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 fd980c03c..9aa4c9a07 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
--
GitLab