From 6d03ea9dcc2a0e45678b9aa8208a04496eeb222d Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr> Date: Mon, 28 Jun 2021 15:35:01 +0200 Subject: [PATCH] Philippe 28/06/2021: open_prc_files: remove unnecessary treatment on filenames --- src/MNH/open_prc_files.f90 | 41 +++----------------------------------- 1 file changed, 3 insertions(+), 38 deletions(-) diff --git a/src/MNH/open_prc_files.f90 b/src/MNH/open_prc_files.f90 index 9bc8fd683..52124869b 100644 --- a/src/MNH/open_prc_files.f90 +++ b/src/MNH/open_prc_files.f90 @@ -220,23 +220,9 @@ CALL POSNAM(IPRE_REAL1,'NAM_FILE_NAMES',GFOUND,ILUOUT0) IF (GFOUND) READ(UNIT=IPRE_REAL1,NML=NAM_FILE_NAMES) CINIFILE_n = CINIFILE ! -ILEN = LEN_TRIM(HATMFILE) -IF (ILEN>0) THEN - YFILE=' ' - YFILE(1:ILEN) = HATMFILE(1:ILEN) - HATMFILE = ' ' - HATMFILE(1:ILEN) = YFILE(1:ILEN) -END IF WRITE(ILUOUT0,*) 'HATMFILE= ', HATMFILE ! -ILEN = LEN_TRIM(HCHEMFILE) -IF (ILEN>0) THEN - YFILE=' ' - YFILE(1:ILEN) = HCHEMFILE(1:ILEN) - HCHEMFILE = ' ' - HCHEMFILE(1:ILEN) = YFILE(1:ILEN) - IF (HCHEMFILE==HATMFILE) HCHEMFILE='' -END IF +IF (HCHEMFILE==HATMFILE) HCHEMFILE='' IF (LEN_TRIM(HCHEMFILE)>0 .AND. HATMFILETYPE/='GRIBEX') THEN !callabortstop CALL PRINT_MSG(NVERB_FATAL,'GEN','OPEN_PRC_FILES',& @@ -244,35 +230,14 @@ IF (LEN_TRIM(HCHEMFILE)>0 .AND. HATMFILETYPE/='GRIBEX') THEN END IF WRITE(ILUOUT0,*) 'HCHEMFILE=', HCHEMFILE ! -ILEN = LEN_TRIM(HCAMSFILE) -IF (ILEN>0) THEN - YFILE=' ' - YFILE(1:ILEN) = HCAMSFILE(1:ILEN) - HCAMSFILE = ' ' - HCAMSFILE(1:ILEN) = YFILE(1:ILEN) -END IF WRITE(ILUOUT0,*) 'HCAMSFILE=', HCAMSFILE ! -ILEN = LEN_TRIM(HSURFFILE) -IF (ILEN>0) THEN - YFILE=' ' - YFILE(1:ILEN) = HSURFFILE(1:ILEN) - HSURFFILE = ' ' - HSURFFILE(1:ILEN) = YFILE(1:ILEN) -ELSE - HSURFFILE = HATMFILE +IF ( LEN_TRIM( HSURFFILE ) == 0 ) THEN + HSURFFILE = HATMFILE HSURFFILETYPE = HATMFILETYPE END IF WRITE(ILUOUT0,*) 'HSURFFILE=', HSURFFILE ! -ILEN = LEN_TRIM(HPGDFILE) -IF (ILEN>0) THEN - YFILE=' ' - YFILE(1:ILEN) = HPGDFILE(1:ILEN) - HPGDFILE = ' ' - HPGDFILE(1:ILEN) = YFILE(1:ILEN) -END IF -! CINIFILEPGD_n = HPGDFILE IF (LEN_TRIM(HPGDFILE)==0) THEN ! IF (HATMFILETYPE=='MESONH') THEN -- GitLab