From c62851d8fa3cda53ff2848a2d41bc2f2fee54264 Mon Sep 17 00:00:00 2001 From: Gaelle Tanguy <gaelle.tanguy@meteo.fr> Date: Thu, 1 Oct 2015 09:40:51 +0000 Subject: [PATCH] Gaelle 01/10/2015 : adaptation pour JPHEXT=3 --- tools/lfi2cdf/src/mode_util.f90 | 5 +++-- tools/lfiz/src/lfiz.f90 | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/lfi2cdf/src/mode_util.f90 b/tools/lfi2cdf/src/mode_util.f90 index 122395ae7..70c902b31 100644 --- a/tools/lfi2cdf/src/mode_util.f90 +++ b/tools/lfi2cdf/src/mode_util.f90 @@ -79,8 +79,9 @@ CONTAINS INTEGER(KIND=8),DIMENSION(:),ALLOCATABLE :: iwork #endif !JUAN CYCCL3 - INTEGER,PARAMETER :: JPHEXT=1 ! 3 - + INTEGER :: JPHEXT + CALL FMREADLFIN1(klu,'JPHEXT',JPHEXT,iresp) + IF (iresp /= 0) JPHEXT=1 ! First check if IMAX,JMAX,KMAX exist in LFI file ! to handle 3D, 2D variables -> update IDIMX,IDIMY,IDIMZ CALL FMREADLFIN1(klu,'IMAX',IDIMX,iresp) diff --git a/tools/lfiz/src/lfiz.f90 b/tools/lfiz/src/lfiz.f90 index f169ef204..de9b42b53 100644 --- a/tools/lfiz/src/lfiz.f90 +++ b/tools/lfiz/src/lfiz.f90 @@ -18,6 +18,7 @@ CHARACTER(LEN=50) :: yexe INTEGER, PARAMETER :: FM_FIELD_SIZE = 16 INTEGER, PARAMETER :: ISRCLU = 11 INTEGER, PARAMETER :: IDESTLU = 12 +INTEGER :: JPHEXT INTEGER :: iverb INTEGER :: inap ! nb d'articles prevus (utile a la creation) INTEGER :: inaf ! nb d'articles presents dans un fichier existant @@ -107,15 +108,16 @@ IF (iresp == 0) THEN STOP 9 END IF - +CALL FMREADLFIN1(ISRCLU,'JPHEXT',JPHEXT,iresp) +IF (iresp /= 0) JPHEXT = 1 ! First check if IMAX,JMAX,KMAX exist in LFI file ! to handle 3D, 2D variables -> update IDIMX,IDIMY,IDIMZ CALL FMREADLFIN1(ISRCLU,'IMAX',IDIMX,iresp) -IF (iresp == 0) IDIMX = IDIMX+2 ! IMAX + 2*JPHEXT +IF (iresp == 0) IDIMX = IDIMX+2*JPHEXT ! IMAX + 2*JPHEXT ! CALL FMREADLFIN1(ISRCLU,'JMAX',IDIMY,iresp) -IF (iresp == 0) IDIMY = IDIMY+2 ! JMAX + 2*JPHEXT +IF (iresp == 0) IDIMY = IDIMY+2*JPHEXT ! JMAX + 2*JPHEXT ! CALL FMREADLFIN1(ISRCLU,'KMAX',IDIMZ,iresp) IF (iresp == 0) IDIMZ = IDIMZ+2 ! KMAX + 2*JPVEXT -- GitLab