From 546df2d761ffdd659199453ba80866819977df13 Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr> Date: Mon, 15 Jan 2018 09:38:22 +0100 Subject: [PATCH] Philippe 12/01/2018: renamed dimension variables in modd_dim_ll to prevent mix-up with modd_dimn --- src/LIB/SURCOUCHE/src/modd_dim_ll.f90 | 2 +- src/LIB/SURCOUCHE/src/mode_exchange_ll.f90 | 14 +++---- src/LIB/SURCOUCHE/src/mode_init_ll.f90 | 16 +++---- src/LIB/SURCOUCHE/src/mode_lb_ll.f90 | 8 +--- src/LIB/SURCOUCHE/src/mode_nest_ll.f90 | 11 ++--- src/LIB/SURCOUCHE/src/mode_splittingz_ll.f90 | 44 ++++++++++---------- src/MNH/mode_type_zdiffu.f90 | 4 +- src/MNH/retrieve2_nest_infon.f90 | 8 ++-- 8 files changed, 50 insertions(+), 57 deletions(-) diff --git a/src/LIB/SURCOUCHE/src/modd_dim_ll.f90 b/src/LIB/SURCOUCHE/src/modd_dim_ll.f90 index 07e7f122a..f4f7453d6 100644 --- a/src/LIB/SURCOUCHE/src/modd_dim_ll.f90 +++ b/src/LIB/SURCOUCHE/src/modd_dim_ll.f90 @@ -49,7 +49,7 @@ ! ! Dimensions respectively in x and y directions of the physical domain ! - INTEGER :: NIMAX_ll,NJMAX_ll, NKMAX_ll + INTEGER :: NIMAX_TMP_ll,NJMAX_TMP_ll, NKMAX_TMP_ll ! ! Lower bound and upper bound of the arrays in x direction ! diff --git a/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90 b/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90 index ca137a380..fb8a029a8 100644 --- a/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90 +++ b/src/LIB/SURCOUCHE/src/mode_exchange_ll.f90 @@ -53,7 +53,7 @@ ! Module MODD_DIM_ll ! CLBCX - X-direction LBC type at left(1) and right(2) boundaries ! CLBCY - Y-direction LBC type at left(1) and right(2) boundaries -! NKMAX_ll - maximum vertical dimension +! NKMAX_TMP_ll - maximum vertical dimension ! ! Module MODD_PARAMETERS_ll ! JPVEXT - vertical halo size @@ -1911,7 +1911,7 @@ INTEGER :: NB_REQ ! JPVEXT - vertical halo size ! ! Module MODD_DIM_ll -! NKMAX_ll - maximum vertical dimension +! NKMAX_TMP_ll - maximum vertical dimension ! !! Reference !! --------- @@ -1930,7 +1930,7 @@ INTEGER :: NB_REQ USE MODD_VAR_ll, ONLY : NCOMBUFFSIZE1, IP, NTRANS_COM, MPI_PRECISION, & NNEXTTAG, NMAXTAG USE MODD_PARAMETERS_ll, ONLY : JPVEXT - USE MODD_DIM_ll, ONLY : NKMAX_ll + USE MODD_DIM_ll, ONLY : NKMAX_TMP_ll ! USE MODE_TOOLS_ll, ONLY : GET_MAX_SIZE ! @@ -2018,7 +2018,7 @@ INTEGER :: NB_REQ,NFIRST_REQ_RECV IBUFFSIZE = IMAXSIZESEND IF (IMAXSIZERECV > IBUFFSIZE) IBUFFSIZE = IMAXSIZERECV ! - IBUFFSIZE = IBUFFSIZE * (NKMAX_ll + 2 * JPVEXT) + IBUFFSIZE = IBUFFSIZE * (NKMAX_TMP_ll + 2 * JPVEXT) ! ! JUAN !if defined (MNH_MPI_ISEND) @@ -2301,7 +2301,7 @@ INTEGER :: NB_REQ,NFIRST_REQ_RECV ! JPVEXT - vertical halo size ! ! Module MODD_DIM_ll -! NKMAX_ll - maximum vertical dimension +! NKMAX_TMP_ll - maximum vertical dimension ! !! Reference !! --------- @@ -2315,7 +2315,7 @@ INTEGER :: NB_REQ,NFIRST_REQ_RECV USE MODD_ARGSLIST_ll, ONLY : LIST_ll USE MODD_STRUCTURE_ll, ONLY : CRSPD_ll, ZONE_ll USE MODD_VAR_ll, ONLY : NCOMBUFFSIZE1, IP, MPI_PRECISION, NNEXTTAG, NMAXTAG - USE MODD_DIM_ll, ONLY : NKMAX_ll + USE MODD_DIM_ll, ONLY : NKMAX_TMP_ll USE MODD_PARAMETERS_ll, ONLY : JPVEXT ! USE MODE_TOOLS_ll, ONLY : GET_MAX_SIZE @@ -2402,7 +2402,7 @@ INTEGER :: NB_REQ,NFIRST_REQ_RECV IBUFFSIZE = IMAXSIZESEND IF (IMAXSIZERECV > IBUFFSIZE) IBUFFSIZE = IMAXSIZERECV ! - IBUFFSIZE = IBUFFSIZE * (NKMAX_ll + 2 * JPVEXT) + IBUFFSIZE = IBUFFSIZE * (NKMAX_TMP_ll + 2 * JPVEXT) ! JUAN !if defined (MNH_MPI_ISEND) IF ( .NOT. LMNH_MPI_BSEND) THEN diff --git a/src/LIB/SURCOUCHE/src/mode_init_ll.f90 b/src/LIB/SURCOUCHE/src/mode_init_ll.f90 index 20b94bbef..37d65552d 100644 --- a/src/LIB/SURCOUCHE/src/mode_init_ll.f90 +++ b/src/LIB/SURCOUCHE/src/mode_init_ll.f90 @@ -171,7 +171,7 @@ ! !------------------------------------------------------------------------------- ! - USE MODD_DIM_ll, ONLY : NIMAX_ll, NJMAX_ll, NKMAX_ll + USE MODD_DIM_ll, ONLY : NIMAX_TMP_ll, NJMAX_TMP_ll, NKMAX_TMP_ll ! IMPLICIT NONE ! @@ -179,9 +179,9 @@ ! !------------------------------------------------------------------------------- ! - NIMAX_ll = KX - NJMAX_ll = KY - NKMAX_ll = KZ + NIMAX_TMP_ll = KX + NJMAX_TMP_ll = KY + NKMAX_TMP_ll = KZ ! !------------------------------------------------------------------------------- ! @@ -610,13 +610,13 @@ !* 4. SPLITTING OF THE DOMAIN : ! ----------------------- ! - DIMX = NIMAX_ll + 2*JPHEXT - DIMY = NJMAX_ll + 2*JPHEXT - DIMZ = NKMAX_ll + 2*JPVEXT + DIMX = NIMAX_TMP_ll + 2*JPHEXT + DIMY = NJMAX_TMP_ll + 2*JPHEXT + DIMZ = NKMAX_TMP_ll + 2*JPVEXT ! TCRRT_PROCONF%NUMBER = 1 ! - CALL SPLIT2(NIMAX_ll,NJMAX_ll,NKMAX_ll,NPROC,TZDZP,YSPLITTING) + CALL SPLIT2(NIMAX_TMP_ll,NJMAX_TMP_ll,NKMAX_TMP_ll,NPROC,TZDZP,YSPLITTING) ! !------------------------------------------------------------------------------- ! diff --git a/src/LIB/SURCOUCHE/src/mode_lb_ll.f90 b/src/LIB/SURCOUCHE/src/mode_lb_ll.f90 index 3a239a05c..3e59e81b5 100644 --- a/src/LIB/SURCOUCHE/src/mode_lb_ll.f90 +++ b/src/LIB/SURCOUCHE/src/mode_lb_ll.f90 @@ -853,9 +853,7 @@ ! USE MODD_DIM_ll, ONLY : NDXRATIO_ALL, NXOR_ALL, NXEND_ALL, & NDYRATIO_ALL, NYOR_ALL, NYEND_ALL, NDAD,& -!JUAN - NKMAX_ll -!JUAN + NKMAX_TMP_ll USE MODD_PARAMETERS_ll, ONLY : JPHEXT, JPMODELMAX, NMAXRIM USE MODD_STRUCTURE_ll, ONLY : PROC_COM_DATA_ll, PROCONF_ll, LPROCONF_ll, & PARENT2CHILD_DATA_ll, LPARENT2CHILD_DATA_ll, & @@ -978,9 +976,7 @@ ALLOCATE(TZCOARSE(NPROC)) CALL SPLIT2(NXEND_ALL(KMODEL)-NXOR_ALL(KMODEL)-1, & NYEND_ALL(KMODEL)-NYOR_ALL(KMODEL)-1, & -!JUAN - NKMAX_ll,& -!JUAN + NKMAX_TMP_ll, & NPROC,TZCOARSE, YSPLITTING) ! ! WRITE(NIOUNIT,*) 'TZCOARSE',NPROC,KMODEL diff --git a/src/LIB/SURCOUCHE/src/mode_nest_ll.f90 b/src/LIB/SURCOUCHE/src/mode_nest_ll.f90 index 74ea5bfc1..a36485094 100644 --- a/src/LIB/SURCOUCHE/src/mode_nest_ll.f90 +++ b/src/LIB/SURCOUCHE/src/mode_nest_ll.f90 @@ -1127,10 +1127,7 @@ ! USE MODD_DIM_ll, ONLY : NDXRATIO_ALL, NXOR_ALL, NXEND_ALL, & NDYRATIO_ALL, NYOR_ALL, NYEND_ALL, NDAD, & -!JUAN -!JUAN NZOR_ALL, NZEND_ALL - NIMAX_ll, NJMAX_ll, NKMAX_ll -!JUAN + NKMAX_TMP_ll ! USE MODD_PARAMETERS_ll, ONLY : JPHEXT, JPVEXT, JPMODELMAX ! @@ -1254,7 +1251,7 @@ DIMX = IXSIZE + 2*JPHEXT DIMY = IYSIZE + 2*JPHEXT !JUAN Z_SPLITTING - DIMZ = NKMAX_ll + 2*JPVEXT + DIMZ = NKMAX_TMP_ll + 2*JPVEXT !JUAN Z_SPLITTING ! !* 2. CONSTRUCTION OF USEFUL SPLITTINGS : @@ -1266,7 +1263,7 @@ ALLOCATE(TZCOARSE(NPROC)) !!$ CALL SPLIT2(NXEND_ALL(K)-NXOR_ALL(K)-1, NYEND_ALL(K)-NYOR_ALL(K)-1, & !!$!JUAN -!!$ NKMAX_ll,& +!!$ NKMAX_TMP_ll,& !!$!JUAN !!$ NPROC,TZCOARSE, YSPLITTING) ! @@ -1294,7 +1291,7 @@ ! ! find Z splitting wihout halo in X&Y , with halo in Z ! - CALL SPLIT2(IXSIZE_COARSE,IYSIZE_COARSE, NKMAX_ll, NPROC,TZCOARSE, YSPLITTING,P1,P2) + CALL SPLIT2(IXSIZE_COARSE,IYSIZE_COARSE, NKMAX_TMP_ll, NPROC,TZCOARSE, YSPLITTING,P1,P2) CALL SPLITZ(IXSIZE_COARSE,IYSIZE_COARSE,DIMZ,NPROC,TZDZP_SXP1_YP2_Z,'P1P2SPLITT', 1 ,P1,P2) CALL SPLITZ(IXSIZE_COARSE,IYSIZE_COARSE,DIMZ,NPROC,TZDZP_SX_YP2_ZP1,'YSPLITTING', P1,P1,P2) diff --git a/src/LIB/SURCOUCHE/src/mode_splittingz_ll.f90 b/src/LIB/SURCOUCHE/src/mode_splittingz_ll.f90 index 9e8fcd46b..11566b632 100644 --- a/src/LIB/SURCOUCHE/src/mode_splittingz_ll.f90 +++ b/src/LIB/SURCOUCHE/src/mode_splittingz_ll.f90 @@ -255,17 +255,17 @@ CONTAINS !* 4. SPLITTING OF THE DOMAIN : ! ----------------------- ! - DIMX = NIMAX_ll + 2*JPHEXT - DIMY = NJMAX_ll + 2*JPHEXT - DIMZ = NKMAX_ll + 2*JPVEXT + DIMX = NIMAX_TMP_ll + 2*JPHEXT + DIMY = NJMAX_TMP_ll + 2*JPHEXT + DIMZ = NKMAX_TMP_ll + 2*JPVEXT ! TCRRT_PROCONF%NUMBER = 1 ! - !JUAN CALL SPLITZ(NIMAX_ll,NJMAX_ll,NKMAX_ll,NPROC,TZDZP_SXP2_YP1_Z,'BSPLITTING',NZ_PROC) -!!$ CALL SPLITZ(NIMAX_ll,NJMAX_ll,NKMAX_ll,NPROC,TZDZP_SXP2_YP1_Z,'BSPLITTING',1) -!!$ CALL SPLITZ(NIMAX_ll,NJMAX_ll,NKMAX_ll,NPROC,TZDZP_SX_YP2_ZP1,'YSPLITTING',NZ_PROC) -!!$ CALL SPLITZ(NIMAX_ll,NJMAX_ll,NKMAX_ll,NPROC,TZDZP_SXP2_Y_ZP1,'XSPLITTING',NZ_PROC) + !JUAN CALL SPLITZ(NIMAX_TMP_ll,NJMAX_TMP_ll,NKMAX_TMP_ll,NPROC,TZDZP_SXP2_YP1_Z,'BSPLITTING',NZ_PROC) +!!$ CALL SPLITZ(NIMAX_TMP_ll,NJMAX_TMP_ll,NKMAX_TMP_ll,NPROC,TZDZP_SXP2_YP1_Z,'BSPLITTING',1) +!!$ CALL SPLITZ(NIMAX_TMP_ll,NJMAX_TMP_ll,NKMAX_TMP_ll,NPROC,TZDZP_SX_YP2_ZP1,'YSPLITTING',NZ_PROC) +!!$ CALL SPLITZ(NIMAX_TMP_ll,NJMAX_TMP_ll,NKMAX_TMP_ll,NPROC,TZDZP_SXP2_Y_ZP1,'XSPLITTING',NZ_PROC) ! Add halo directly in Z direction @@ -273,7 +273,7 @@ CONTAINS ! ! find the B spltting ! - CALL DEF_SPLITTING2(JX_DOMAINS,JY_DOMAINS,NIMAX_ll,NJMAX_ll,NPROC,LPREM) + CALL DEF_SPLITTING2(JX_DOMAINS,JY_DOMAINS,NIMAX_TMP_ll,NJMAX_TMP_ll,NPROC,LPREM) ! P1 = JX_DOMAINS IF (DIMZ .NE. 3 ) P1 = MIN(DIMZ,JX_DOMAINS) @@ -322,15 +322,15 @@ CONTAINS CALL MPI_COMM_SIZE(NMNH_COL_WORLD, NCOL, KINFO_ll) !JUANZ - CALL SPLIT2(NIMAX_ll,NJMAX_ll,NKMAX_ll,NPROC,TZDZP,YSPLITTING,P1,P2) + CALL SPLIT2(NIMAX_TMP_ll,NJMAX_TMP_ll,NKMAX_TMP_ll,NPROC,TZDZP,YSPLITTING,P1,P2) - CALL SPLITZ(NIMAX_ll,NJMAX_ll,DIMZ,NPROC,TZDZP_SXP1_YP2_Z,'P1P2SPLITT', 1 ,P1,P2) - CALL SPLITZ(NIMAX_ll,NJMAX_ll,DIMZ,NPROC,TZDZP_SX_YP2_ZP1,'YSPLITTING', P1,P1,P2) - CALL SPLITZ(NIMAX_ll,NJMAX_ll,DIMZ,NPROC,TZDZP_SXP2_Y_ZP1,'XSPLITTING', P1,P1,P2) - CALL SPLITZ(NIMAX_ll,NJMAX_ll,DIMZ,NPROC,TZDZP_SXP2_YP1_Z,'P2P1SPLITT', 1 ,P1,P2) + CALL SPLITZ(NIMAX_TMP_ll,NJMAX_TMP_ll,DIMZ,NPROC,TZDZP_SXP1_YP2_Z,'P1P2SPLITT', 1 ,P1,P2) + CALL SPLITZ(NIMAX_TMP_ll,NJMAX_TMP_ll,DIMZ,NPROC,TZDZP_SX_YP2_ZP1,'YSPLITTING', P1,P1,P2) + CALL SPLITZ(NIMAX_TMP_ll,NJMAX_TMP_ll,DIMZ,NPROC,TZDZP_SXP2_Y_ZP1,'XSPLITTING', P1,P1,P2) + CALL SPLITZ(NIMAX_TMP_ll,NJMAX_TMP_ll,DIMZ,NPROC,TZDZP_SXP2_YP1_Z,'P2P1SPLITT', 1 ,P1,P2) - !JUAN CALL SPLIT2(NIMAX_ll,NJMAX_ll,NKMAX_ll,NPROC,TZDZP,YSPLITTING) + !JUAN CALL SPLIT2(NIMAX_TMP_ll,NJMAX_TMP_ll,NKMAX_TMP_ll,NPROC,TZDZP,YSPLITTING) ! @@ -644,19 +644,19 @@ CONTAINS !* 4. SPLITTING OF THE DOMAIN : ! ----------------------- ! - IXSIZE_ll = NIMAX_ll/NDXRATIO_ALL(1) - IYSIZE_ll = NJMAX_ll/NDYRATIO_ALL(1) + IXSIZE_ll = NIMAX_TMP_ll/NDXRATIO_ALL(1) + IYSIZE_ll = NJMAX_TMP_ll/NDYRATIO_ALL(1) DIMX = IXSIZE_ll*NDXRATIO_ALL(1) + 2*JPHEXT DIMY = IYSIZE_ll*NDYRATIO_ALL(1) + 2*JPHEXT - DIMZ = NKMAX_ll + 2*JPVEXT + DIMZ = NKMAX_TMP_ll + 2*JPVEXT ! TCRRT_PROCONF%NUMBER = 1 ! - !JUAN CALL SPLITZ(NIMAX_ll,NJMAX_ll,NKMAX_ll,NPROC,TZDZP_SXP2_YP1_Z,'BSPLITTING',NZ_PROC) -!!$ CALL SPLITZ(NIMAX_ll,NJMAX_ll,NKMAX_ll,NPROC,TZDZP_SXP2_YP1_Z,'BSPLITTING',1) -!!$ CALL SPLITZ(NIMAX_ll,NJMAX_ll,NKMAX_ll,NPROC,TZDZP_SX_YP2_ZP1,'YSPLITTING',NZ_PROC) -!!$ CALL SPLITZ(NIMAX_ll,NJMAX_ll,NKMAX_ll,NPROC,TZDZP_SXP2_Y_ZP1,'XSPLITTING',NZ_PROC) + !JUAN CALL SPLITZ(NIMAX_TMP_ll,NJMAX_TMP_ll,NKMAX_TMP_ll,NPROC,TZDZP_SXP2_YP1_Z,'BSPLITTING',NZ_PROC) +!!$ CALL SPLITZ(NIMAX_TMP_ll,NJMAX_TMP_ll,NKMAX_TMP_ll,NPROC,TZDZP_SXP2_YP1_Z,'BSPLITTING',1) +!!$ CALL SPLITZ(NIMAX_TMP_ll,NJMAX_TMP_ll,NKMAX_TMP_ll,NPROC,TZDZP_SX_YP2_ZP1,'YSPLITTING',NZ_PROC) +!!$ CALL SPLITZ(NIMAX_TMP_ll,NJMAX_TMP_ll,NKMAX_TMP_ll,NPROC,TZDZP_SXP2_Y_ZP1,'XSPLITTING',NZ_PROC) ! Add halo directly in Z direction @@ -715,7 +715,7 @@ CONTAINS ! split the child model according to the father grid elements (coarse) - CALL SPLIT2(IXSIZE_ll,IYSIZE_ll,NKMAX_ll,NPROC,TZDZP,YSPLITTING,P1,P2) + CALL SPLIT2(IXSIZE_ll,IYSIZE_ll,NKMAX_TMP_ll,NPROC,TZDZP,YSPLITTING,P1,P2) CALL SPLITZ(IXSIZE_ll,IYSIZE_ll,DIMZ,NPROC,TZDZP_SXP1_YP2_Z,'P1P2SPLITT', 1 ,P1,P2) CALL SPLITZ(IXSIZE_ll,IYSIZE_ll,DIMZ,NPROC,TZDZP_SX_YP2_ZP1,'YSPLITTING', P1,P1,P2) CALL SPLITZ(IXSIZE_ll,IYSIZE_ll,DIMZ,NPROC,TZDZP_SXP2_Y_ZP1,'XSPLITTING', P1,P1,P2) diff --git a/src/MNH/mode_type_zdiffu.f90 b/src/MNH/mode_type_zdiffu.f90 index 8aa408a8c..9b0b7e507 100644 --- a/src/MNH/mode_type_zdiffu.f90 +++ b/src/MNH/mode_type_zdiffu.f90 @@ -18,7 +18,7 @@ SUBROUTINE INIT_TYPE_ZDIFFU_HALO2(PTYPE_ZDIFFU_HALO2,KSIZE_ZERO) !* 0. DECLARATIONS ! ------------ USE MODD_PARAMETERS , ONLY : JPVEXT -USE MODD_DIM_ll , ONLY : NKMAX_ll +USE MODD_DIM_ll , ONLY : NKMAX_TMP_ll ! IMPLICIT NONE ! @@ -43,7 +43,7 @@ IF (.NOT.PRESENT(KSIZE_ZERO)) THEN ! Init all array with halo2 size CALL GET_INDICE_ll(IIB,IJB,IIE,IJE) CALL GET_DIM_EXT_ll('B',IIU,IJU) -IKU = NKMAX_ll + 2*JPVEXT +IKU = NKMAX_TMP_ll + 2*JPVEXT ! ! initialisation of data array ! diff --git a/src/MNH/retrieve2_nest_infon.f90 b/src/MNH/retrieve2_nest_infon.f90 index 4f3a0a3f7..c6321f788 100644 --- a/src/MNH/retrieve2_nest_infon.f90 +++ b/src/MNH/retrieve2_nest_infon.f90 @@ -99,7 +99,7 @@ END MODULE MODI_RETRIEVE2_NEST_INFO_n !* 0. DECLARATIONS ! USE MODD_CONF -USE MODD_DIM_ll, ONLY: NXOR_ALL, NXEND_ALL, NYOR_ALL, NYEND_ALL, NIMAX_ll, NJMAX_ll +USE MODD_DIM_ll, ONLY: NXOR_ALL, NXEND_ALL, NYOR_ALL, NYEND_ALL, NIMAX_TMP_ll, NJMAX_TMP_ll USE MODD_DIM_n, ONLY: NIMAX, NJMAX USE MODD_GRID USE MODD_GRID_n @@ -201,7 +201,7 @@ INTEGER, DIMENSION(2) :: IOR_C ! position of pgd model origin points accordi ! ! get splitting of father model ALLOCATE(TZSPLITTING(ISNPROC)) -CALL SPLIT2 ( NIMAX_ll, NJMAX_ll, 1, ISNPROC, TZSPLITTING, YSPLITTING ) +CALL SPLIT2 ( NIMAX_TMP_ll, NJMAX_TMP_ll, 1, ISNPROC, TZSPLITTING, YSPLITTING ) IXOR_F = TZSPLITTING(ISP)%NXOR-JPHEXT IYOR_F = TZSPLITTING(ISP)%NYOR-JPHEXT IXEND_F = TZSPLITTING(ISP)%NXEND-JPHEXT @@ -234,8 +234,8 @@ IF ( CPROGRAM == 'REAL ' ) THEN XPGDYHAT(:)=XYHAT(:) ELSE !JUAN correction pour PREP_NEST_PGD 4/04/2014 -!!$NPGDIMAX =NIMAX_ll -!!$NPGDJMAX =NJMAX_ll +!!$NPGDIMAX =NIMAX_TMP_ll +!!$NPGDJMAX =NJMAX_TMP_ll ENDIF ! !20131008 : now compute IIU & IJU -- GitLab