diff --git a/LIBTOOLS/tools/lfi2cdf/src/lfi2cdf.f90 b/LIBTOOLS/tools/lfi2cdf/src/lfi2cdf.f90
index 39bb56a69b1e50141bc39db8f2236a956355faac..1068048830601efb23f77363874bc2d493a6f58f 100644
--- a/LIBTOOLS/tools/lfi2cdf/src/lfi2cdf.f90
+++ b/LIBTOOLS/tools/lfi2cdf/src/lfi2cdf.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2021 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.
@@ -91,7 +91,7 @@ program LFI2CDF
CALL IO_Config_set()
END IF
- CALL INI_FIELD_LIST(1)
+ CALL INI_FIELD_LIST()
CALL OPEN_FILES(infiles, outfiles, nfiles_out, hinfile, houtfile, nbvar_infile, options, runmode)
IF (options(OPTLIST)%set) STOP
diff --git a/src/LIB/SURCOUCHE/src/mode_field.f90 b/src/LIB/SURCOUCHE/src/mode_field.f90
index 89d2b8d1653db69d8409aa5e73aa332ac771f0d8..b8674cc39b8594ed1af5755c8d4a3380568195a4 100644
--- a/src/LIB/SURCOUCHE/src/mode_field.f90
+++ b/src/LIB/SURCOUCHE/src/mode_field.f90
@@ -60,42 +60,25 @@ end interface
contains
-SUBROUTINE INI_FIELD_LIST(KMODEL)
+SUBROUTINE INI_FIELD_LIST()
! Modif
! J.Escobar 25/04/2018: missing def of FRC
!------------------------------------------------
USE MODD_CONF, ONLY: NMODEL
-!
-INTEGER,INTENT(IN),OPTIONAL :: KMODEL
-!
-INTEGER :: IMODEL
-CHARACTER(LEN=42) :: YMSG
-!
+
+CHARACTER(LEN=64) :: YMSG
+
CALL PRINT_MSG(NVERB_DEBUG,'GEN','INI_FIELD_LIST','called')
IF (LFIELDLIST_ISINIT) THEN
CALL PRINT_MSG(NVERB_ERROR,'GEN','INI_FIELD_LIST','already called')
RETURN
END IF
+
LFIELDLIST_ISINIT = .TRUE.
+
Allocate( tfieldlist(NMAXFIELDINIT) )
NMAXFIELDS = NMAXFIELDINIT
-!
-IF (PRESENT(KMODEL)) THEN
- IMODEL = KMODEL
-ELSE
- !NMODEL is not necessary known here => allocating for max allowed number of models
- !WARNING: if known, the value could change after this subroutine (ie for a restart
- ! with more models) because READ_DESFM_n is called before READ_EXSEG_n
- IMODEL = JPMODELMAX
-END IF
-!
-IF (IMODEL==0) CALL PRINT_MSG(NVERB_FATAL,'GEN','INI_FIELD_LIST','allocating fields for zero models not allowed')
-if ( imodel > JPMODELMAX ) &
- call Print_msg( NVERB_FATAL, 'GEN', 'INI_FIELD_LIST', 'allocating fields for more than JPMODELMAX models not allowed' )
-!
-WRITE(YMSG,'("allocating fields for up to ",I4," model(s)")') IMODEL
-CALL PRINT_MSG(NVERB_DEBUG,'GEN','INI_FIELD_LIST',YMSG)
-!
+
call Add_field2list( TFIELDDATA( &
CMNHNAME = 'MNHVERSION', &
CSTDNAME = '', &
diff --git a/src/MNH/ini_segn.f90 b/src/MNH/ini_segn.f90
index 660947da453a22788685f112c7baf5421aea038a..7cd8620daab3e129e2190deeb0a89803c89f36b3 100644
--- a/src/MNH/ini_segn.f90
+++ b/src/MNH/ini_segn.f90
@@ -369,13 +369,11 @@ CALL READ_DESFM_n(KMI,TPINIFILE,YCONF,GFLAT,GUSERV,GUSERC, &
! --------------------
!
IF (KMI==1) THEN !Do this only 1 time
- IF (CPROGRAM=='SPAWN ') THEN
- CALL INI_FIELD_LIST(2)
- ELSE IF (CPROGRAM=='DIAG ' .OR. CPROGRAM=='SPEC ') THEN
- CALL INI_FIELD_LIST(1)
- ELSE IF (CPROGRAM/='REAL ' .AND. CPROGRAM/='IDEAL ' ) THEN
+ IF ( CPROGRAM=='SPAWN ' .OR. CPROGRAM=='DIAG ' .OR. CPROGRAM=='SPEC ' &
+ .OR. ( CPROGRAM/='REAL ' .AND. CPROGRAM/='IDEAL ' ) ) THEN
CALL INI_FIELD_LIST()
END IF
+
IF (CPROGRAM=='SPAWN ' .OR. CPROGRAM=='DIAG ' .OR. CPROGRAM=='SPEC ' .OR. CPROGRAM=='MESONH') THEN
CALL INI_FIELD_SCALARS()
END IF
diff --git a/src/MNH/latlon_to_xy.f90 b/src/MNH/latlon_to_xy.f90
index 972999064186796b7d4b1721bdd304e0d51f15c4..98b134a36a1cf7e21a18a8cb4c49a3627e5f8490 100644
--- a/src/MNH/latlon_to_xy.f90
+++ b/src/MNH/latlon_to_xy.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1995-2020 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1995-2021 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.
@@ -137,7 +137,7 @@ CALL IO_Init()
!
CALL INI_CST()
!
-CALL INI_FIELD_LIST(1)
+CALL INI_FIELD_LIST()
!
!* 2. Reading of namelist file
! ------------------------
diff --git a/src/MNH/mnh2lpdm.f90 b/src/MNH/mnh2lpdm.f90
index d7ed74c744552ac516721d92bbf73dd793938b14..deb8dda2312cc5000d28482412cf5e4695292e0d 100644
--- a/src/MNH/mnh2lpdm.f90
+++ b/src/MNH/mnh2lpdm.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2002-2020 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2002-2021 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.
@@ -78,7 +78,7 @@ CALL GOTO_MODEL(1)
CALL VERSION()
CALL IO_Init()
CALL INI_CST()
-CALL INI_FIELD_LIST(1)
+CALL INI_FIELD_LIST()
CALL INI_FIELD_SCALARS()
!
CALL IO_File_add2list(TLUOUT0,'OUTPUT_LISTING1','OUTPUTLISTING','WRITE')
diff --git a/src/MNH/prep_ideal_case.f90 b/src/MNH/prep_ideal_case.f90
index 370e214120d671ca8fd809fd3b69ee93a26c2e6b..0a4aa09b96ec975d9271e3c921f0d9a7ec1b9984 100644
--- a/src/MNH/prep_ideal_case.f90
+++ b/src/MNH/prep_ideal_case.f90
@@ -712,7 +712,7 @@ IF (GFOUND) READ(UNIT=NLUPRE,NML=NAM_AERO_PRE)
CALL POSNAM(NLUPRE,'NAM_IBM_LSF' ,GFOUND,NLUOUT)
IF (GFOUND) READ(UNIT=NLUPRE,NML=NAM_IBM_LSF )
!
-CALL INI_FIELD_LIST(1)
+CALL INI_FIELD_LIST()
!
CALL INI_FIELD_SCALARS()
!
diff --git a/src/MNH/prep_nest_pgd.f90 b/src/MNH/prep_nest_pgd.f90
index 80b493fbcd6bcd3d097efeb2ccc6380bbe6bef6e..e894cd407d2d529ae44e19b2e4145dc68dfa2580 100644
--- a/src/MNH/prep_nest_pgd.f90
+++ b/src/MNH/prep_nest_pgd.f90
@@ -199,7 +199,7 @@ CALL READ_ALL_NAMELISTS(YSURF_CUR,'MESONH','PRE',.FALSE.)
!* 3. READING OF THE GRIDS
! --------------------
!
-CALL INI_FIELD_LIST(NMODEL)
+CALL INI_FIELD_LIST()
!
CALL SET_DAD0_ll()
DO JPGD=1,NMODEL
diff --git a/src/MNH/prep_pgd.f90 b/src/MNH/prep_pgd.f90
index 046ddde7822141fefa4743338cfcb32469bca981..2df254d5ec8aab95ee4ad9713ccf8e65fc7f4af4 100644
--- a/src/MNH/prep_pgd.f90
+++ b/src/MNH/prep_pgd.f90
@@ -217,7 +217,7 @@ CALL SURFEX_ALLOC_LIST(1)
YSURF_CUR => YSURF_LIST(1)
CALL READ_ALL_NAMELISTS(YSURF_CUR,'MESONH','PRE',.FALSE.)
!
-CALL INI_FIELD_LIST(1)
+CALL INI_FIELD_LIST()
!
CALL GOTO_MODEL(1)
CALL GOTO_SURFEX(1)
diff --git a/src/MNH/prep_real_case.f90 b/src/MNH/prep_real_case.f90
index 2796da451deead2db67096d5ba9ddc2c5ffcb954..7014fc3b2d2233902125599097de6e2c5eefcb0f 100644
--- a/src/MNH/prep_real_case.f90
+++ b/src/MNH/prep_real_case.f90
@@ -638,7 +638,7 @@ IF (GFOUND) READ(IPRE_REAL1,NAM_REAL_CONF)
CALL POSNAM(IPRE_REAL1,'NAM_PARAM_LIMA',GFOUND,ILUOUT0)
IF (GFOUND) READ(IPRE_REAL1,NAM_PARAM_LIMA)
!
-CALL INI_FIELD_LIST(1)
+CALL INI_FIELD_LIST()
!
CALL INI_FIELD_SCALARS()
!
diff --git a/src/MNH/prep_surfex.f90 b/src/MNH/prep_surfex.f90
index 68ec7b3a8779d70d45f174ab868a07192b9dc4c5..547f5b1bc96757a740126f0b8ba53b4ab623cbdd 100644
--- a/src/MNH/prep_surfex.f90
+++ b/src/MNH/prep_surfex.f90
@@ -131,7 +131,7 @@ CALL IO_File_close(TZPRE_REAL1FILE)
!
!* 4.2 reading of values of some configuration variables in namelist
!
-CALL INI_FIELD_LIST(1)
+CALL INI_FIELD_LIST()
!
CALL INI_FIELD_SCALARS()
!
diff --git a/src/MNH/xy_to_latlon.f90 b/src/MNH/xy_to_latlon.f90
index f8782a519e3cbe897bd676f5b72d5334b5559ee6..4537388a16dd24a541a507d24512bbaca8c2c4b6 100644
--- a/src/MNH/xy_to_latlon.f90
+++ b/src/MNH/xy_to_latlon.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1996-2020 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1996-2021 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.
@@ -131,7 +131,7 @@ CALL IO_Init()
!
CALL INI_CST()
!
-CALL INI_FIELD_LIST(1)
+CALL INI_FIELD_LIST()
!
!* 2. Reading of namelist file
! ------------------------