From bdfaa10dd1eb74d6f89e037f1f2a98a98df6faaf Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@cnrs.fr>
Date: Tue, 24 Sep 2024 10:16:43 +0200
Subject: [PATCH] Philippe 24/09/2024: IO: remove NLFITYPE field of TFILEDATA
(not used anymore)
---
src/LIB/SURCOUCHE/src/modd_io.f90 | 1 -
src/LIB/SURCOUCHE/src/mode_io_file.f90 | 14 +++++++-------
.../SURCOUCHE/src/mode_io_manage_struct.f90 | 19 +++++--------------
src/MNH/compare_dad.f90 | 6 +++---
src/MNH/compute_r00.f90 | 2 +-
src/MNH/diag.f90 | 2 +-
src/MNH/firemodel.f90 | 6 +++---
src/MNH/ini_cpl.f90 | 2 +-
src/MNH/ini_modeln.f90 | 12 ++++++------
src/MNH/ini_prog_var.f90 | 2 +-
src/MNH/ini_segn.f90 | 6 +++---
src/MNH/ini_size_spawn.f90 | 4 ++--
src/MNH/latlon_to_xy.f90 | 4 ++--
src/MNH/mnh2lpdm.f90 | 4 ++--
src/MNH/mnhopen_aux_io_surf.f90 | 2 +-
src/MNH/open_nestpgd_files.f90 | 10 +++++-----
src/MNH/open_prc_files.f90 | 4 ++--
src/MNH/prep_ideal_case.f90 | 6 +++---
src/MNH/prep_pgd.f90 | 4 ++--
src/MNH/prep_real_case.f90 | 2 +-
src/MNH/prep_surfex.f90 | 6 +++---
src/MNH/spawn_model2.f90 | 4 ++--
src/MNH/xy_to_latlon.f90 | 4 ++--
src/MNH/zoom_pgd.f90 | 6 +++---
24 files changed, 61 insertions(+), 71 deletions(-)
diff --git a/src/LIB/SURCOUCHE/src/modd_io.f90 b/src/LIB/SURCOUCHE/src/modd_io.f90
index 30e10a476..eea17563d 100644
--- a/src/LIB/SURCOUCHE/src/modd_io.f90
+++ b/src/LIB/SURCOUCHE/src/modd_io.f90
@@ -118,7 +118,6 @@ TYPE TFILEDATA
! Fields for LFI files
INTEGER(KIND=LFIINT) :: NLFININAR = 0 !Number of articles of the LFI file (only accurate if file opened in read mode)
INTEGER(KIND=LFIINT) :: NLFINPRAR = 0 !Number of predicted articles of the LFI file (non crucial)
- INTEGER :: NLFITYPE = -1 !Type of the file (used to generate list of files to transfers)
INTEGER :: NLFIVERB = 1 !LFI verbosity level
INTEGER(KIND=LFIINT) :: NLFIFLU = -1 !File identifier
#endif
diff --git a/src/LIB/SURCOUCHE/src/mode_io_file.f90 b/src/LIB/SURCOUCHE/src/mode_io_file.f90
index 3196588b8..b26569dfa 100644
--- a/src/LIB/SURCOUCHE/src/mode_io_file.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io_file.f90
@@ -191,15 +191,15 @@ SELECT CASE(TPFILE%CTYPE)
IF (IRESP/=0) THEN !File not yet in filelist => add it (nothing to do if already in list)
IF (ALLOCATED(TPFILE%CDIRNAME)) THEN
- call IO_File_add2list( tzfile_split, trim(tpfile%cname)//trim(yfile), tpfile%ctype, tpfile%cmode, &
- hdirname = tpfile%cdirname, &
- klfinprar = tpfile%nlfinprar, klfitype = tpfile%nlfitype, klfiverb = tpfile%nlfiverb, &
- hformat = tpfile%cformat, &
+ call IO_File_add2list( tzfile_split, trim(tpfile%cname)//trim(yfile), tpfile%ctype, tpfile%cmode, &
+ hdirname = tpfile%cdirname, &
+ klfinprar = tpfile%nlfinprar, klfiverb = tpfile%nlfiverb, &
+ hformat = tpfile%cformat, &
tpmainfile = tpfile, osplit_ioz=.false. )
ELSE
- call IO_File_add2list( tzfile_split, trim(tpfile%cname)//trim(yfile), tpfile%ctype, tpfile%cmode, &
- klfinprar = tpfile%nlfinprar, klfitype = tpfile%nlfitype, klfiverb = tpfile%nlfiverb, &
- hformat = tpfile%cformat, &
+ call IO_File_add2list( tzfile_split, trim(tpfile%cname)//trim(yfile), tpfile%ctype, tpfile%cmode, &
+ klfinprar = tpfile%nlfinprar, klfiverb = tpfile%nlfiverb, &
+ hformat = tpfile%cformat, &
tpmainfile = tpfile, osplit_ioz=.false. )
END IF
END IF
diff --git a/src/LIB/SURCOUCHE/src/mode_io_manage_struct.f90 b/src/LIB/SURCOUCHE/src/mode_io_manage_struct.f90
index 535d72c33..d475d5e2b 100644
--- a/src/LIB/SURCOUCHE/src/mode_io_manage_struct.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io_manage_struct.f90
@@ -1154,15 +1154,15 @@ SUBROUTINE IO_BakOut_file_create( TPFILE, HTYPE, KMI, KSTEP, KNUMBAK )
ENDIF
CALL IO_File_add2list( TPFILE, HNAME=YNAME, HTYPE=HTYPE, HMODE='WRITE', HFORMAT=YFORMAT, HDIRNAME=YDIRNAME, &
- KLFINPRAR=ILFINPRAR, KLFITYPE=1, KLFIVERB=NVERB, KMODEL=KMI, KSTEP=KSTEP )
+ KLFINPRAR=ILFINPRAR, KLFIVERB=NVERB, KMODEL=KMI, KSTEP=KSTEP )
END SUBROUTINE IO_BakOut_file_create
-SUBROUTINE IO_File_add2list( TPFILE, HNAME, HTYPE, HMODE, &
- HFORM, HACCESS, HFORMAT, HDIRNAME, &
- KLFINPRAR, KLFITYPE, KLFIVERB, KRECL, KMODEL, KSTEP, &
- TPDADFILE, TPDATAFILE, TPMAINFILE, OOLD, OSPLIT_IOZ )
+SUBROUTINE IO_File_add2list( TPFILE, HNAME, HTYPE, HMODE, &
+ HFORM, HACCESS, HFORMAT, HDIRNAME, &
+ KLFINPRAR, KLFIVERB, KRECL, KMODEL, KSTEP, &
+ TPDADFILE, TPDATAFILE, TPMAINFILE, OOLD, OSPLIT_IOZ )
!
#ifdef MNH_IOCDF4
USE NETCDF, ONLY: NF90_QUANTIZE_BITGROOM, NF90_QUANTIZE_BITROUND, NF90_QUANTIZE_GRANULARBR
@@ -1192,7 +1192,6 @@ CHARACTER(LEN=*), OPTIONAL,INTENT(IN) :: HACCESS !Direct/sequential/s
CHARACTER(LEN=*), OPTIONAL,INTENT(IN) :: HFORMAT !Fileformat (NETCDF4, LFI, LFICDF4...)
CHARACTER(LEN=*), OPTIONAL,INTENT(IN) :: HDIRNAME !File directory
INTEGER(KIND=LFIINT), OPTIONAL,INTENT(IN) :: KLFINPRAR !Number of predicted articles of the LFI file (non crucial)
-INTEGER, OPTIONAL,INTENT(IN) :: KLFITYPE !Type of the file (used to generate list of files to transfers)
INTEGER, OPTIONAL,INTENT(IN) :: KLFIVERB !LFI verbosity level
INTEGER, OPTIONAL,INTENT(IN) :: KRECL !Record length
INTEGER, OPTIONAL,INTENT(IN) :: KMODEL !Model number
@@ -1207,7 +1206,6 @@ logical, optional,intent(in) :: osplit_ioz !Is the file split
!
INTEGER :: IMI
INTEGER :: IRESP
-INTEGER :: ILFITYPE
INTEGER :: ILFIVERB
INTEGER :: IMULT
INTEGER(KIND=LFIINT) :: ILFINPRAR
@@ -1286,12 +1284,6 @@ ELSE
ILFINPRAR = 0
END IF
!
-IF(PRESENT(KLFITYPE)) THEN
- ILFITYPE = KLFITYPE
-ELSE
- ILFITYPE = -1
-END IF
-!
IF(PRESENT(KLFIVERB)) THEN
ILFIVERB = KLFIVERB
ELSE
@@ -1508,7 +1500,6 @@ SELECT CASE(TPFILE%CTYPE)
END IF
END IF
!
- TPFILE%NLFITYPE = ILFITYPE
TPFILE%NLFIVERB = ILFIVERB
!
! Apply compression to all HTYPE='MNH*' files (if asked)
diff --git a/src/MNH/compare_dad.f90 b/src/MNH/compare_dad.f90
index 37692798d..f83b52d49 100644
--- a/src/MNH/compare_dad.f90
+++ b/src/MNH/compare_dad.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2004-2021 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2004-2024 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
@@ -140,7 +140,7 @@ ZLATORI_2=0.
!* 2. Read DAD of initial file
! ------------------------
!
-CALL IO_File_add2list(TZDADINIFILE,TRIM(HDADINIFILE),'MNH','READ',KLFITYPE=2,KLFIVERB=NVERB)
+CALL IO_File_add2list( TZDADINIFILE, TRIM(HDADINIFILE), 'MNH', 'READ', KLFIVERB=NVERB )
CALL IO_File_open(TZDADINIFILE)
!
CALL IO_Field_read(TZDADINIFILE,'IMAX',IIMAX_1)
@@ -196,7 +196,7 @@ CALL IO_File_close(TZDADINIFILE)
!* 3. Read DAD of spawning file
! ------------------------
!
-CALL IO_File_add2list(TZDADSPAFILE,TRIM(HDADSPAFILE),'MNH','READ',KLFITYPE=2,KLFIVERB=NVERB)
+CALL IO_File_add2list( TZDADSPAFILE, TRIM(HDADSPAFILE), 'MNH', 'READ', KLFIVERB=NVERB )
CALL IO_File_open(TZDADSPAFILE)
!
CALL IO_Field_read(TZDADSPAFILE,'IMAX',IIMAX_2)
diff --git a/src/MNH/compute_r00.f90 b/src/MNH/compute_r00.f90
index 4952460f7..f8e0d87c2 100644
--- a/src/MNH/compute_r00.f90
+++ b/src/MNH/compute_r00.f90
@@ -471,7 +471,7 @@ DO JFILECUR=1,NFILES
TZTRACFILE => LUNIT_MODEL(1)%TINIFILE
ELSE
TZTRACFILE => NULL()
- CALL IO_File_add2list(TZTRACFILE,CFILES(NBRFILES(JFILECUR)),'MNH','READ',KLFITYPE=2,KLFIVERB=NVERB)
+ CALL IO_File_add2list( TZTRACFILE, CFILES(NBRFILES(JFILECUR)), 'MNH', 'READ', KLFIVERB=NVERB )
CALL IO_File_open(TZTRACFILE)
END IF
!
diff --git a/src/MNH/diag.f90 b/src/MNH/diag.f90
index 3b97b1046..40f498211 100644
--- a/src/MNH/diag.f90
+++ b/src/MNH/diag.f90
@@ -419,7 +419,7 @@ ENDIF
!
INPRAR = 24 +2*(4+NRR+NSV)
!
-CALL IO_File_add2list(TOUTDATAFILE,TRIM(CINIFILE)//TRIM(YSUFFIX),'MNHDIAG','WRITE',KLFINPRAR=INPRAR,KLFITYPE=1,KLFIVERB=NVERB)
+CALL IO_File_add2list( TOUTDATAFILE, TRIM(CINIFILE)//TRIM(YSUFFIX), 'MNHDIAG', 'WRITE', KLFINPRAR=INPRAR, KLFIVERB=NVERB )
!
CALL SECOND_MNH2(ZTIME2)
ZSTART=ZTIME2-ZTIME1
diff --git a/src/MNH/firemodel.f90 b/src/MNH/firemodel.f90
index dd61edc79..e81b5c9f0 100644
--- a/src/MNH/firemodel.f90
+++ b/src/MNH/firemodel.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2019-2023 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2019-2024 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
@@ -1550,7 +1550,7 @@ SUBROUTINE FIRE_READFUEL( TPFILE, PFIREFUELMAP, PFMIGNITION, PFMWALKIG )
!* 2. Open file
- CALL IO_FILE_ADD2LIST( TFUELFILE, 'FuelMap', 'MNH', 'READ', HFORMAT = 'NETCDF4', KLFITYPE = 2 )
+ CALL IO_FILE_ADD2LIST( TFUELFILE, 'FuelMap', 'MNH', 'READ', HFORMAT = 'NETCDF4' )
CALL IO_File_open( TFUELFILE )
!* 3. Read fuels properties
@@ -1686,7 +1686,7 @@ SUBROUTINE FIRE_READBMAP(TPFILE, PBMAP)
!* 2. Open file
- CALL IO_FILE_ADD2LIST( TFUELFILE, CBMAPFILE, 'MNH', 'READ', HFORMAT = 'NETCDF4', KLFITYPE = 2 )
+ CALL IO_FILE_ADD2LIST( TFUELFILE, CBMAPFILE, 'MNH', 'READ', HFORMAT = 'NETCDF4' )
CALL IO_File_open( TFUELFILE )
!* 4. read Burning map file
diff --git a/src/MNH/ini_cpl.f90 b/src/MNH/ini_cpl.f90
index f2635d5cd..2c3553312 100644
--- a/src/MNH/ini_cpl.f90
+++ b/src/MNH/ini_cpl.f90
@@ -347,7 +347,7 @@ IF ( .NOT.ASSOCIATED( TCPLFILE ) ) ALLOCATE( TCPLFILE(NCPL_NBR) )
DO JCI=1,NCPL_NBR
WRITE(YCI,'(I0)') JCI
- CALL IO_File_add2list(TCPLFILE(JCI)%TZFILE,CCPLFILE(JCI),'MNH','READ',KLFITYPE=2,KLFIVERB=NVERB)
+ CALL IO_File_add2list( TCPLFILE(JCI)%TZFILE, CCPLFILE(JCI), 'MNH', 'READ', KLFIVERB=NVERB )
CALL IO_File_open(TCPLFILE(JCI)%TZFILE,KRESP=IRESP)
IF (IRESP /= 0) THEN
WRITE( CMNHMSG(1), '( "problem when opening coupling file ", I0 )' ) JCI
diff --git a/src/MNH/ini_modeln.f90 b/src/MNH/ini_modeln.f90
index 0ad3212f5..93133ea3d 100644
--- a/src/MNH/ini_modeln.f90
+++ b/src/MNH/ini_modeln.f90
@@ -1956,10 +1956,10 @@ IF (KMI == 1) THEN
ELSE
CALL PRINT_MSG( NVERB_FATAL, 'GEN', 'INI_MODEL_n', 'NMODELNUMLGTMAX>2 not implemented' )
END IF
- CALL IO_File_add2list(LUNIT_MODEL(IMI)%TDIAFILE,YNAME,'MNHDIACHRONIC','WRITE', &
- HDIRNAME=CIO_DIR, &
- KLFINPRAR=INT(50,KIND=LFIINT),KLFITYPE=1,KLFIVERB=NVERB, &
- TPDADFILE=LUNIT_MODEL(NDAD(IMI))%TDIAFILE )
+ CALL IO_File_add2list( LUNIT_MODEL(IMI)%TDIAFILE, YNAME, 'MNHDIACHRONIC', 'WRITE', &
+ HDIRNAME=CIO_DIR, &
+ KLFINPRAR=INT(50,KIND=LFIINT), KLFIVERB=NVERB, &
+ TPDADFILE=LUNIT_MODEL(NDAD(IMI))%TDIAFILE )
END DO
!
TDIAFILE => LUNIT_MODEL(KMI)%TDIAFILE !Necessary because no call to GOTO_MODEL before needing it
@@ -2692,7 +2692,7 @@ END IF
IF (CSURF=='EXTE' .AND. (CPROGRAM=='MESONH' .OR. CPROGRAM=='DIAG ')) THEN
! ouverture du fichier PGD
IF ( LEN_TRIM(CINIFILEPGD) > 0 ) THEN
- CALL IO_File_add2list(TINIFILEPGD,TRIM(CINIFILEPGD),'PGD','READ',KLFITYPE=2,KLFIVERB=NVERB)
+ CALL IO_File_add2list( TINIFILEPGD, TRIM(CINIFILEPGD), 'PGD', 'READ', KLFIVERB=NVERB )
CALL IO_File_open(TINIFILEPGD,KRESP=IRESP)
LUNIT_MODEL(KMI)%TINIFILEPGD => TINIFILEPGD
IF (IRESP/=0) THEN
@@ -2735,7 +2735,7 @@ ELSE
END IF
IF (CSURF=='EXTE' .AND. (CPROGRAM=='SPAWN ')) THEN
! ouverture du fichier PGD
- CALL IO_File_add2list(TINIFILEPGD,TRIM(CINIFILEPGD),'PGD','READ',KLFITYPE=2,KLFIVERB=NVERB)
+ CALL IO_File_add2list( TINIFILEPGD, TRIM(CINIFILEPGD), 'PGD', 'READ', KLFIVERB=NVERB )
CALL IO_File_open(TINIFILEPGD,KRESP=IRESP)
LUNIT_MODEL(KMI)%TINIFILEPGD => TINIFILEPGD
IF (IRESP/=0) THEN
diff --git a/src/MNH/ini_prog_var.f90 b/src/MNH/ini_prog_var.f90
index 882a62a2d..028c7714c 100644
--- a/src/MNH/ini_prog_var.f90
+++ b/src/MNH/ini_prog_var.f90
@@ -212,7 +212,7 @@ END IF
IF(PRESENT(HCHEMFILE)) THEN
WRITE(ILUOUT,*) 'Routine INI_PROG_VAR: CHEMical species read in ',TRIM(HCHEMFILE)
! Read dimensions in chem file and checks with output file
- CALL IO_File_add2list(TZCHEMFILE,TRIM(HCHEMFILE),'MNH','READ',KLFITYPE=2,KLFIVERB=NVERB)
+ CALL IO_File_add2list( TZCHEMFILE, TRIM(HCHEMFILE), 'MNH', 'READ', KLFIVERB=NVERB )
CALL IO_File_open(TZCHEMFILE)
!If TZCHEMFILE file was written with a MesoNH version < 5.6, some variables had different names (or were not available)
diff --git a/src/MNH/ini_segn.f90 b/src/MNH/ini_segn.f90
index fe38350ef..c55301f8b 100644
--- a/src/MNH/ini_segn.f90
+++ b/src/MNH/ini_segn.f90
@@ -286,7 +286,7 @@ IF (CPROGRAM=='MESONH') THEN
ELSE IF (CPROGRAM=='SPAWN ' .OR. CPROGRAM=='REAL '.OR. CPROGRAM=='SPEC ') THEN
YINIFILE = CINIFILE_n
HINIFILEPGD = CINIFILEPGD_n
- CALL IO_File_add2list(TPINIFILE,TRIM(YINIFILE),'MNH','READ',KLFITYPE=2,KLFIVERB=NVERB)
+ CALL IO_File_add2list( TPINIFILE, TRIM(YINIFILE), 'MNH', 'READ', KLFIVERB=NVERB )
CALL IO_File_open(TPINIFILE)
TZFILE_DES => TPINIFILE%TDESFILE
!
@@ -295,7 +295,7 @@ ELSE IF (CPROGRAM=='SPAWN ' .OR. CPROGRAM=='REAL '.OR. CPROGRAM=='SPEC ') THEN
ELSE IF (CPROGRAM=='DIAG ') THEN
YINIFILE = CINIFILE_n
HINIFILEPGD = CINIFILEPGD_n
- CALL IO_File_add2list(TINIFILE_n,TRIM(YINIFILE),'MNH','READ',KLFITYPE=2,KLFIVERB=NVERB)
+ CALL IO_File_add2list( TINIFILE_n, TRIM(YINIFILE), 'MNH', 'READ', KLFIVERB=NVERB )
CALL IO_File_open(TINIFILE_n)
TPINIFILE => TINIFILE_n
TZFILE_DES => TPINIFILE%TDESFILE
@@ -345,7 +345,7 @@ IF (CPROGRAM=='MESONH') THEN
HINIFILEPGD=CINIFILEPGD_n
YINIFILE=CINIFILE_n
- CALL IO_File_add2list(TPINIFILE,TRIM(YINIFILE),'MNH','READ',KLFITYPE=2,KLFIVERB=NVERB)
+ CALL IO_File_add2list( TPINIFILE, TRIM(YINIFILE), 'MNH', 'READ', KLFIVERB=NVERB )
TINIFILE_n => TPINIFILE !Necessary because TINIFILE was initially pointing to NULL
CALL IO_File_open(TPINIFILE)
END IF
diff --git a/src/MNH/ini_size_spawn.f90 b/src/MNH/ini_size_spawn.f90
index eecc496a5..94e4420cc 100644
--- a/src/MNH/ini_size_spawn.f90
+++ b/src/MNH/ini_size_spawn.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1999-2023 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1999-2024 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
@@ -218,7 +218,7 @@ IF (LEN_TRIM(CDOMAIN)>0) THEN
! initialize grid2 dims, xor, xend and ratio so to initialize in INI_CHILD
! structures TCRRT_COMDATA%T_CHILDREN%T_SPLITB and TCRRT_PROCONF%T_CHILDREN
!$20140602 add condition on npproc
- CALL IO_File_add2list(TZDOMAIN,TRIM(CDOMAIN),'PGD','READ',KLFITYPE=2,KLFIVERB=NVERB)
+ CALL IO_File_add2list( TZDOMAIN, TRIM(CDOMAIN), 'PGD', 'READ', KLFIVERB=NVERB )
CALL IO_File_open(TZDOMAIN)
!
CALL IO_Field_read(TZDOMAIN,'DXRATIO',NDXRATIO)
diff --git a/src/MNH/latlon_to_xy.f90 b/src/MNH/latlon_to_xy.f90
index a6eed5e59..3f3063175 100644
--- a/src/MNH/latlon_to_xy.f90
+++ b/src/MNH/latlon_to_xy.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1995-2023 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
@@ -163,7 +163,7 @@ CALL IO_File_close(TZNMLFILE)
!* 1. Opening of MESONH file
! ----------------------
!
-CALL IO_File_add2list(TZINIFILE,TRIM(YINIFILE),'MNH','READ',KLFITYPE=2,KLFIVERB=2)
+CALL IO_File_add2list( TZINIFILE, TRIM(YINIFILE), 'MNH', 'READ', KLFIVERB=2 )
CALL IO_File_open(TZINIFILE)
!
CALL IO_Field_read(TZINIFILE,'IMAX', NIMAX)
diff --git a/src/MNH/mnh2lpdm.f90 b/src/MNH/mnh2lpdm.f90
index 3918b994b..aa0262b3a 100644
--- a/src/MNH/mnh2lpdm.f90
+++ b/src/MNH/mnh2lpdm.f90
@@ -128,10 +128,10 @@ CALL IO_File_close(TZNMLFILE)
!
IF (LEN_TRIM(CFMNH(1))>0) THEN
NBMNH=1
- CALL IO_File_add2list(TZFMNH(1)%TZFILE,TRIM(CFMNH(1)),'MNH','READ',KLFITYPE=2,KLFIVERB=IVERB)
+ CALL IO_File_add2list( TZFMNH(1)%TZFILE, TRIM(CFMNH(1)), 'MNH', 'READ', KLFIVERB=IVERB )
DO WHILE (CFMNH(NBMNH+1).NE.'VIDE')
NBMNH=NBMNH+1
- CALL IO_File_add2list(TZFMNH(NBMNH)%TZFILE,TRIM(CFMNH(NBMNH)),'MNH','READ',KLFITYPE=2,KLFIVERB=IVERB)
+ CALL IO_File_add2list( TZFMNH(NBMNH)%TZFILE, TRIM(CFMNH(NBMNH)), 'MNH', 'READ', KLFIVERB=IVERB )
END DO
print *,NBMNH,' fichiers a traiter.'
ELSE
diff --git a/src/MNH/mnhopen_aux_io_surf.f90 b/src/MNH/mnhopen_aux_io_surf.f90
index dbb560a08..8d873a399 100644
--- a/src/MNH/mnhopen_aux_io_surf.f90
+++ b/src/MNH/mnhopen_aux_io_surf.f90
@@ -144,7 +144,7 @@ ELSE
END IF
!
IF (HFILE/=YFILE .AND. HFILE/=YPGDFILE) THEN
- CALL IO_File_add2list(TPINFILE,TRIM(HFILE),'PGD','READ',KLFITYPE=2,KLFIVERB=5,OOLD=.TRUE.)
+ CALL IO_File_add2list( TPINFILE, TRIM(HFILE), 'PGD', 'READ', KLFIVERB=5, OOLD=.TRUE. )
CALL IO_File_open(TPINFILE,KRESP=IRESP)
!
if ( iresp /= 0 ) then
diff --git a/src/MNH/open_nestpgd_files.f90 b/src/MNH/open_nestpgd_files.f90
index d1d26690c..9aac9ded2 100644
--- a/src/MNH/open_nestpgd_files.f90
+++ b/src/MNH/open_nestpgd_files.f90
@@ -300,16 +300,16 @@ ALLOCATE(TPFILEPGD (NMODEL))
ALLOCATE(TPFILENESTPGD(NMODEL))
!
DO JPGD=1,NMODEL
- CALL IO_File_add2list(TPFILEPGD(JPGD)%TZFILE,TRIM(YPGD(JPGD)),'PGD','READ',KLFITYPE=2,KLFIVERB=NVERB)
+ CALL IO_File_add2list( TPFILEPGD(JPGD)%TZFILE, TRIM(YPGD(JPGD)), 'PGD', 'READ', KLFIVERB=NVERB )
!
IF (NDAD(JPGD)>=1) THEN
TZDADFILE => TPFILENESTPGD(NDAD(JPGD))%TZFILE
- CALL IO_File_add2list(TPFILENESTPGD(JPGD)%TZFILE,TRIM(YPGD(JPGD))//'.nest'//ADJUSTL(YNEST),'PGD', &
- 'WRITE',KLFITYPE=1,KLFIVERB=NVERB,KMODEL=JPGD,TPDADFILE=TZDADFILE)
+ CALL IO_File_add2list( TPFILENESTPGD(JPGD)%TZFILE, TRIM(YPGD(JPGD))//'.nest'//ADJUSTL(YNEST), 'PGD', &
+ 'WRITE', KLFIVERB=NVERB, KMODEL=JPGD, TPDADFILE=TZDADFILE )
ELSE
NULLIFY(TZDADFILE)
- CALL IO_File_add2list(TPFILENESTPGD(JPGD)%TZFILE,TRIM(YPGD(JPGD))//'.nest'//ADJUSTL(YNEST),'PGD', &
- 'WRITE',KLFITYPE=1,KLFIVERB=NVERB,KMODEL=JPGD)
+ CALL IO_File_add2list( TPFILENESTPGD(JPGD)%TZFILE,TRIM(YPGD(JPGD))//'.nest'//ADJUSTL(YNEST), 'PGD', &
+ 'WRITE', KLFIVERB=NVERB, KMODEL=JPGD )
END IF
END DO
!
diff --git a/src/MNH/open_prc_files.f90 b/src/MNH/open_prc_files.f90
index d388a6088..480581e46 100644
--- a/src/MNH/open_prc_files.f90
+++ b/src/MNH/open_prc_files.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2023 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2024 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
@@ -256,7 +256,7 @@ ELSE
! -----------------------------------
!
TPPGDFILE => NULL()
- CALL IO_File_add2list(TPPGDFILE,TRIM(HPGDFILE),'PGD','READ',KLFITYPE=2,KLFIVERB=NVERB)
+ CALL IO_File_add2list( TPPGDFILE, TRIM(HPGDFILE), 'PGD', 'READ', KLFIVERB=NVERB )
CALL IO_File_open(TPPGDFILE,IRESP)
IF (IRESP/=0) THEN
!callabortstop
diff --git a/src/MNH/prep_ideal_case.f90 b/src/MNH/prep_ideal_case.f90
index e9debe845..dad424c4f 100644
--- a/src/MNH/prep_ideal_case.f90
+++ b/src/MNH/prep_ideal_case.f90
@@ -728,7 +728,7 @@ CALL INIT_SALT
!
IF( LEN_TRIM(CPGD_FILE) /= 0 ) THEN
! open the PGD_FILE
- CALL IO_File_add2list(TPGDFILE,TRIM(CPGD_FILE),'PGD','READ',KLFINPRAR=NNPRAR,KLFITYPE=2,KLFIVERB=NVERB)
+ CALL IO_File_add2list( TPGDFILE, TRIM(CPGD_FILE), 'PGD', 'READ', KLFINPRAR=NNPRAR, KLFIVERB=NVERB )
CALL IO_File_open(TPGDFILE)
! read the grid in the PGD file
@@ -1781,7 +1781,7 @@ NNPRAR = 22 + 2*(NRR+NSV) & ! 22 = number of grid variables + reference
! variables at time t and t-dt
NTYPE=1
!
-CALL IO_File_add2list(TINIFILE,TRIM(CINIFILE),'MNH','WRITE',KLFINPRAR=NNPRAR,KLFITYPE=NTYPE,KLFIVERB=NVERB)
+CALL IO_File_add2list( TINIFILE, TRIM(CINIFILE), 'MNH', 'WRITE', KLFINPRAR=NNPRAR, KLFIVERB=NVERB )
!
CALL IO_File_open(TINIFILE)
!
@@ -1821,7 +1821,7 @@ IF (CSURF =='EXTE') THEN
TPGDFILE => TINIFILE
CALL PGD_GRID_SURF_ATM(YSURF_CUR%UG, YSURF_CUR%U,YSURF_CUR%GCP,'MESONH',TINIFILE%CNAME,'MESONH',.TRUE.,HDIR='-')
CALL PGD_SURF_ATM (YSURF_CUR,'MESONH',TINIFILE%CNAME,'MESONH',.TRUE.)
- CALL IO_File_add2list(TINIFILEPGD,TRIM(CINIFILEPGD),'PGD','WRITE',KLFINPRAR=NNPRAR,KLFITYPE=NTYPE,KLFIVERB=NVERB)
+ CALL IO_File_add2list( TINIFILEPGD, TRIM(CINIFILEPGD), 'PGD', 'WRITE', KLFINPRAR=NNPRAR, KLFIVERB=NVERB )
CALL IO_File_open (TINIFILEPGD)
TPGDFILE => TINIFILEPGD
ELSE
diff --git a/src/MNH/prep_pgd.f90 b/src/MNH/prep_pgd.f90
index d4fcc6dcb..81de83ad3 100644
--- a/src/MNH/prep_pgd.f90
+++ b/src/MNH/prep_pgd.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1995-2023 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2024 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
@@ -252,7 +252,7 @@ CALL PGD_SURF_ATM( YSURF_CUR, 'MESONH', YFILE, YFILETYPE, .FALSE. )
!* 3. Writes the physiographic fields
! -------------------------------
!
-CALL IO_File_add2list(TZFILE,CPGDFILE,'PGD','WRITE',KLFINPRAR=INT(1,KIND=LFIINT),KLFITYPE=1,KLFIVERB=5)
+CALL IO_File_add2list( TZFILE, CPGDFILE, 'PGD', 'WRITE', KLFINPRAR=INT(1,KIND=LFIINT), KLFIVERB=5 )
!
CALL IO_File_open(TZFILE)
!
diff --git a/src/MNH/prep_real_case.f90 b/src/MNH/prep_real_case.f90
index 67ca4cd85..0327f5d9b 100644
--- a/src/MNH/prep_real_case.f90
+++ b/src/MNH/prep_real_case.f90
@@ -860,7 +860,7 @@ CALL SECOND_MNH(ZTIME2)
ZREAD = ZTIME2 - ZTIME1 - ZHORI
!-------------------------------------------------------------------------------
!
-CALL IO_File_add2list(TINIFILE,CINIFILE,'MNH','WRITE',KLFITYPE=1,KLFIVERB=NVERB)
+CALL IO_File_add2list( TINIFILE, CINIFILE, 'MNH', 'WRITE', KLFIVERB=NVERB )
CALL IO_File_open(TINIFILE)
!
ZTIME1=ZTIME2
diff --git a/src/MNH/prep_surfex.f90 b/src/MNH/prep_surfex.f90
index 922d5d3da..74f14ec1c 100644
--- a/src/MNH/prep_surfex.f90
+++ b/src/MNH/prep_surfex.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2004-2023 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2004-2024 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
@@ -161,7 +161,7 @@ CALL INI_PARAZ_ll(IINFO_ll)
!* reading of date
!
IF (YATMFILETYPE=='MESONH') THEN
- CALL IO_File_add2list(TZATMFILE,TRIM(YATMFILE),'MNH','READ',KLFITYPE=1,KLFIVERB=1)
+ CALL IO_File_add2list( TZATMFILE, TRIM(YATMFILE), 'MNH', 'READ', KLFIVERB=1 )
CALL IO_File_open(TZATMFILE)
CALL IO_Field_read(TZATMFILE,'DTCUR',TDTCUR)
CALL IO_File_close(TZATMFILE)
@@ -177,7 +177,7 @@ YSURF_CUR => YSURF_LIST(1)
CALL READ_ALL_NAMELISTS(YSURF_CUR,'MESONH','PRE',.FALSE.)
CALL GOTO_SURFEX(1)
!
-CALL IO_File_add2list(TINIFILE,TRIM(CINIFILE),'PGD','WRITE',KLFITYPE=1,KLFIVERB=1)
+CALL IO_File_add2list( TINIFILE, TRIM(CINIFILE), 'PGD', 'WRITE', KLFIVERB=1 )
!The open is done later in PREP_SURF_MNH when domain dimensions are known
!
TFILE_SURFEX => TINIFILE
diff --git a/src/MNH/spawn_model2.f90 b/src/MNH/spawn_model2.f90
index 2ca1a0171..19e86755c 100644
--- a/src/MNH/spawn_model2.f90
+++ b/src/MNH/spawn_model2.f90
@@ -503,7 +503,7 @@ IF (LEN_TRIM(HSONFILE) /= 0 ) THEN
! 3.3.1 Opening the son input file and reading the grid
!
WRITE(ILUOUT,*) 'SPAWN_MODEL2: spawning with a SON input file :',TRIM(HSONFILE)
- CALL IO_File_add2list(TZSONFILE,TRIM(HSONFILE),'MNH','READ',KLFITYPE=2,KLFIVERB=NVERB)
+ CALL IO_File_add2list( TZSONFILE, TRIM(HSONFILE), 'MNH', 'READ', KLFIVERB=NVERB )
CALL IO_File_open(TZSONFILE)
CALL IO_Field_read(TZSONFILE,'DAD_NAME',YDAD_SON)
CALL IO_Field_read(TZSONFILE,'IMAX', IIMAXSON)
@@ -1463,7 +1463,7 @@ ELSE
CMY_NAME(2)=ADJUSTL(ADJUSTR(CINIFILE)//'.spr'//ADJUSTL(HSPANBR))
END IF
!
-CALL IO_File_add2list(TZFILE,CMY_NAME(2),'MNH','WRITE',KLFINPRAR=INPRAR,KLFITYPE=1,KLFIVERB=NVERB)
+CALL IO_File_add2list( TZFILE, CMY_NAME(2), 'MNH', 'WRITE', KLFINPRAR=INPRAR, KLFIVERB=NVERB )
!
CALL IO_File_open(TZFILE)
!
diff --git a/src/MNH/xy_to_latlon.f90 b/src/MNH/xy_to_latlon.f90
index 82a431d88..eb7003303 100644
--- a/src/MNH/xy_to_latlon.f90
+++ b/src/MNH/xy_to_latlon.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1996-2023 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2024 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
@@ -149,7 +149,7 @@ CALL IO_File_close(TZNMLFILE)
!* 1. Opening of MESONH file
! ----------------------
!
-CALL IO_File_add2list(TZINIFILE,TRIM(YINIFILE),'MNH','READ',KLFITYPE=2,KLFIVERB=2)
+CALL IO_File_add2list( TZINIFILE, TRIM(YINIFILE), 'MNH', 'READ', KLFIVERB=2 )
CALL IO_File_open(TZINIFILE)
!
CALL IO_Field_read(TZINIFILE,'IMAX', NIMAX)
diff --git a/src/MNH/zoom_pgd.f90 b/src/MNH/zoom_pgd.f90
index bc1dca1d2..ad21b9e8f 100644
--- a/src/MNH/zoom_pgd.f90
+++ b/src/MNH/zoom_pgd.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2005-2023 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2005-2024 CNRS, Meteo-France and Universite Paul Sabatier
!MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
!MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
!MNH_LIC for details. version 1.
@@ -152,7 +152,7 @@ CALL IO_Config_set()
!* 2.1 Open PGD file
! -------------
!
-CALL IO_File_add2list(TZPGDFILE,TRIM(CPGDFILE),'PGD','READ',KLFINPRAR=INT(1,KIND=LFIINT),KLFITYPE=2,KLFIVERB=5)
+CALL IO_File_add2list( TZPGDFILE, TRIM(CPGDFILE), 'PGD', 'READ', KLFINPRAR=INT(1,KIND=LFIINT), KLFIVERB=5 )
CALL IO_File_open(TZPGDFILE)
!
!* 2.2 Reading of initial grid
@@ -198,7 +198,7 @@ IF ( (LEN_TRIM(YZOOMFILE) == 0) .OR. (ADJUSTL(YZOOMFILE) == ADJUSTL(CPGDFILE)) )
YZOOMFILE=ADJUSTL(ADJUSTR(CPGDFILE)//'.z'//ADJUSTL(YZOOMNBR))
END IF
!
-CALL IO_File_add2list(TZZOOMFILE,TRIM(YZOOMFILE),'PGD','WRITE',KLFINPRAR=INT(1,KIND=LFIINT),KLFITYPE=1,KLFIVERB=5)
+CALL IO_File_add2list( TZZOOMFILE, TRIM(YZOOMFILE), 'PGD', 'WRITE', KLFINPRAR=INT(1,KIND=LFIINT), KLFIVERB=5 )
!
CALL IO_File_open(TZZOOMFILE)
CALL WRITE_HGRID(1,TZZOOMFILE)
--
GitLab