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

src/SURFEX/interpol_npts.F90

-!SFX_LIC Copyright 2004-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 2004-2019 CNRS, Meteo-France and Universite Paul Sabatier
 !SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
-!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
 !SFX_LIC for details. version 1.
 !     #########
       SUBROUTINE INTERPOL_NPTS (UG, U, HPROGRAM,KLUOUT,KNPTS,KCODE,PX,PY,PFIELD,KNEAR_NBR)
@@ -69,7 +69,7 @@ USE YOMHOOK   ,ONLY : LHOOK,   DR_HOOK
 USE PARKIND1  ,ONLY : JPRB
 !
 #ifdef SFX_MNH
-USE MODD_IO_ll, ONLY : ISIOP, ISP, ISNPROC
+USE MODD_IO, ONLY : ISP, ISNPROC, NIO_RANK
 USE MODD_VAR_ll, ONLY : NMNH_COMM_WORLD
 USE MODE_GATHER_ll
 USE MODE_TOOLS_ll,     ONLY : GET_GLOBALDIMS_ll
@@ -178,7 +178,7 @@ IF (IOLD==2) THEN
   ! on met les infos de mésonh
   NRANK = ISP-1
   NPROC = ISNPROC
-  NPIO  = ISIOP-1
+  NPIO  = NIO_RANK-1
   NCOMM = NMNH_COMM_WORLD
   ! 
   !KCODE to 2D
@@ -187,7 +187,7 @@ IF (IOLD==2) THEN
   ISIZE_2D(1+JPHEXT:IIU+JPHEXT,1+JPHEXT:IJU+JPHEXT) = RESHAPE(KCODE, (/ IIU,IJU /) )
   ! tasks to whole domaine
   ALLOCATE(ISIZE_2D_ALL(IIMAX+2*JPHEXT,IJMAX+2*JPHEXT))
-  CALL GATHER_XYFIELD(ISIZE_2D,ISIZE_2D_ALL,ISIOP,NMNH_COMM_WORLD)
+  CALL GATHER_XYFIELD(ISIZE_2D,ISIZE_2D_ALL,NIO_RANK,NMNH_COMM_WORLD)
   DEALLOCATE(ISIZE_2D)
   ALLOCATE(ISIZE_TOT(IDIM_FULL))
   ISIZE_TOT = RESHAPE(ISIZE_2D_ALL(1+JPHEXT:IIMAX+JPHEXT,1+JPHEXT:IJMAX+JPHEXT),(/IDIM_FULL/))
@@ -247,7 +247,7 @@ IF (IOLD==2) THEN
   DEALLOCATE(INUM_1D)
   ! tasks to whole domaine
   ALLOCATE(INUM_2D_ALL(IIMAX+2*JPHEXT,IJMAX+2*JPHEXT))
-  CALL GATHER_XYFIELD(INUM_2D,INUM_2D_ALL,ISIOP,NMNH_COMM_WORLD)
+  CALL GATHER_XYFIELD(INUM_2D,INUM_2D_ALL,NIO_RANK,NMNH_COMM_WORLD)
   DEALLOCATE(INUM_2D)
   ALLOCATE(INUM_TOT(IDIM_FULL))
   INUM_TOT = RESHAPE(INUM_2D_ALL(1+JPHEXT:IIMAX+JPHEXT,1+JPHEXT:IJMAX+JPHEXT),(/IDIM_FULL/))
@@ -263,7 +263,7 @@ IF (IOLD==2) THEN
   DEALLOCATE(IINDEX_1D)
   ! tasks to whole domaine
   ALLOCATE(IINDEX_2D_ALL(IIMAX+2*JPHEXT,IJMAX+2*JPHEXT))
-  CALL GATHER_XYFIELD(IINDEX_2D,IINDEX_2D_ALL,ISIOP,NMNH_COMM_WORLD)
+  CALL GATHER_XYFIELD(IINDEX_2D,IINDEX_2D_ALL,NIO_RANK,NMNH_COMM_WORLD)
   DEALLOCATE(IINDEX_2D)
   ALLOCATE(IINDEX_TOT(IDIM_FULL))
   IINDEX_TOT = RESHAPE(IINDEX_2D_ALL(1+JPHEXT:IIMAX+JPHEXT,1+JPHEXT:IJMAX+JPHEXT),(/IDIM_FULL/))
@@ -276,13 +276,13 @@ IF (IOLD==2) THEN
   !
   ZCOORD_2D = 0.
   ZCOORD_2D(1+JPHEXT:IIU+JPHEXT,1+JPHEXT:IJU+JPHEXT) = RESHAPE(PX, (/ IIU,IJU /) )
-  CALL GATHER_XYFIELD(ZCOORD_2D,ZCOORD_2D_ALL,ISIOP,NMNH_COMM_WORLD)
+  CALL GATHER_XYFIELD(ZCOORD_2D,ZCOORD_2D_ALL,NIO_RANK,NMNH_COMM_WORLD)
   ALLOCATE(ZX(IDIM_FULL))
   ZX = RESHAPE(ZCOORD_2D_ALL(1+JPHEXT:IIMAX+JPHEXT,1+JPHEXT:IJMAX+JPHEXT),(/IDIM_FULL/))
   !
   ZCOORD_2D = 0.
   ZCOORD_2D(1+JPHEXT:IIU+JPHEXT,1+JPHEXT:IJU+JPHEXT) = RESHAPE(PY, (/ IIU,IJU  /) )
-  CALL GATHER_XYFIELD(ZCOORD_2D,ZCOORD_2D_ALL,ISIOP,NMNH_COMM_WORLD)
+  CALL GATHER_XYFIELD(ZCOORD_2D,ZCOORD_2D_ALL,NIO_RANK,NMNH_COMM_WORLD)
   ALLOCATE(ZY(IDIM_FULL))
   ZY = RESHAPE(ZCOORD_2D_ALL(1+JPHEXT:IIMAX+JPHEXT,1+JPHEXT:IJMAX+JPHEXT),(/IDIM_FULL/))
   !

src/SURFEX/make_lcover.F90

-!SFX_LIC Copyright 1997-2018 CNRS, Meteo-France and Universite Paul Sabatier
+!SFX_LIC Copyright 1997-2019 CNRS, Meteo-France and Universite Paul Sabatier
 !SFX_LIC This is part of the SURFEX software governed by the CeCILL-C licence
-!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt  
+!SFX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
 !SFX_LIC for details. version 1.
 
 !     #########
@@ -46,7 +46,7 @@ USE YOMHOOK   ,ONLY : LHOOK,   DR_HOOK
 USE PARKIND1  ,ONLY : JPRB
 !
 #ifdef SFX_MNH
-USE MODD_IO_ll, ONLY : ISIOP, ISP, ISNPROC
+USE MODD_IO, ONLY : ISP, ISNPROC, NIO_RANK
 USE MODD_VAR_ll, ONLY : NMNH_COMM_WORLD
 #endif
 !
@@ -88,7 +88,7 @@ ICOMM_SAVE = NCOMM
 ! on met les infos de mésonh
 NRANK = ISP-1
 NPROC = ISNPROC
-NPIO = ISIOP-1
+NPIO  = NIO_RANK-1
 NCOMM = NMNH_COMM_WORLD
 #endif
 !