diff --git a/src/mesonh/aux/sources_neg_correct.f90 b/src/mesonh/aux/sources_neg_correct.f90
index 366fc1daafcb7e10049ec536a6977ccbe15c88e1..1abd41813466a70337c747a0e4ee19eb1b1cfd63 100644
--- a/src/mesonh/aux/sources_neg_correct.f90
+++ b/src/mesonh/aux/sources_neg_correct.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2020-2021 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2020-2022 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.
@@ -53,12 +53,12 @@ use modd_budget, only: lbudget_th, lbudget_rv, lbudget_rc, lbudget_rr, lbudg
NBUDGET_RS, NBUDGET_RG, NBUDGET_RH, NBUDGET_SV1, &
tbudgets
use modd_cst, only: xci, xcl, xcpd, xcpv, xlstt, xlvtt, xp00, xrd, xtt
-use modd_nsv, only: nsv_c2r2beg, nsv_c2r2end, nsv_lima_beg, nsv_lima_end, nsv_lima_nc, nsv_lima_nr,&
- nsv_lima_ni, nsv_lima_ns, nsv_lima_ng, nsv_lima_nh, &
+use modd_elec_descr, only: xrtmin_elec, xecharge
+use modd_nsv, only: nsv_c2r2beg, nsv_c2r2end, nsv_lima_beg, nsv_lima_end, nsv_lima_nc, nsv_lima_nr, &
+ nsv_lima_ni, nsv_lima_ns, nsv_lima_ng, nsv_lima_nh, &
nsv_elecbeg, nsv_elecend
use modd_param_lima, only: lspro_lima => lspro, &
xctmin_lima => xctmin, xrtmin_lima => xrtmin
-use modd_elec_descr, only: xrtmin_elec, xecharge
use mode_budget, only: Budget_store_init, Budget_store_end
use mode_msg
diff --git a/src/mesonh/ext/advection_metsv.f90 b/src/mesonh/ext/advection_metsv.f90
index 9b5ae514068e386a8fd592e8a7549774048ab10d..f6d9d08e74fe9620e20a506baf9ebc92a5445efb 100644
--- a/src/mesonh/ext/advection_metsv.f90
+++ b/src/mesonh/ext/advection_metsv.f90
@@ -153,7 +153,6 @@ use modd_budget, only: lbudget_th, lbudget_tke, lbudget_rv, lbudget_rc,
NBUDGET_RR, NBUDGET_RI, NBUDGET_RS, NBUDGET_RG, NBUDGET_RH, NBUDGET_SV1, &
tbudgets
USE MODD_CST
-USE MODD_TURB_n, ONLY: XTKEMIN
USE MODD_CONF, ONLY: LNEUTRAL,NHALO,L1D, L2D
use modd_field, only: tfieldmetadata, TYPEREAL
USE MODD_IBM_PARAM_n, ONLY: LIBM,XIBM_LS,XIBM_EPSI
@@ -167,6 +166,7 @@ USE MODD_BLOWSNOW
USE MODD_BLOWSNOW_n
USE MODD_PARAMETERS
USE MODD_REF_n, ONLY: XRHODJ,XRHODREF
+USE MODD_TURB_n, ONLY: XTKEMIN
!
use mode_budget, only: Budget_store_init, Budget_store_end
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
diff --git a/src/mesonh/ext/aer_wet_dep_kmt_warm.f90 b/src/mesonh/ext/aer_wet_dep_kmt_warm.f90
index 441484721eb49a50eede482f07cf7d23bb3c7dd1..b7af9765600152a32db44e639a7542680b591a41 100644
--- a/src/mesonh/ext/aer_wet_dep_kmt_warm.f90
+++ b/src/mesonh/ext/aer_wet_dep_kmt_warm.f90
@@ -121,16 +121,16 @@ END MODULE MODI_AER_WET_DEP_KMT_WARM
! ------------
!
USE MODD_CST
-USE MODD_RAIN_ICE_PARAM_n, ONLY : YEXCACCR=>XEXCACCR, XFSEDC, XFCACCR,&
- XEXSEDR, XCRIAUTC, XFSEDR, XTIMAUTC,&
- YFCACCR => XFCACCR
+USE MODD_RAIN_ICE_PARAM_n, ONLY: YEXCACCR=>XEXCACCR, XFSEDC, XFCACCR, &
+ XEXSEDR, XCRIAUTC, XFSEDR, XTIMAUTC, &
+ YFCACCR => XFCACCR
!++th++ 10/05/17
-USE MODD_RAIN_ICE_DESCR_n, ONLY : YRTMIN => XRTMIN, YCEXVT => XCEXVT, &
- XCONC_LAND, XCONC_SEA, XCONC_URBAN, &
- XNUC2, XALPHAC2, XNUC, XALPHAC, &
- YLBC => XLBC, XLBEXC, &
- XCCR, &
- YLBR => XLBR, YLBEXR => XLBEXR
+USE MODD_RAIN_ICE_DESCR_n, ONLY: YRTMIN => XRTMIN, YCEXVT => XCEXVT, &
+ XCONC_LAND, XCONC_SEA, XCONC_URBAN, &
+ XNUC2, XALPHAC2, XNUC, XALPHAC, &
+ YLBC => XLBC, XLBEXC, &
+ XCCR, &
+ YLBR => XLBR, YLBEXR => XLBEXR
!--th--
USE MODD_PRECIP_n
USE MODI_AER_VELGRAV
diff --git a/src/mesonh/ext/ch_aqueous_sedim1mom.f90 b/src/mesonh/ext/ch_aqueous_sedim1mom.f90
index ba0b6ffd5418befa08bfb5c44cdb761c3856a448..2ec98324e1bb4f2bb53ad9305abf71bc6548f6a1 100644
--- a/src/mesonh/ext/ch_aqueous_sedim1mom.f90
+++ b/src/mesonh/ext/ch_aqueous_sedim1mom.f90
@@ -89,14 +89,14 @@ END MODULE MODI_CH_AQUEOUS_SEDIM1MOM
!* 0. DECLARATIONS
! ------------
!
-USE MODD_PARAMETERS, ONLY : JPHEXT, JPVEXT
+USE MODD_PARAMETERS, ONLY: JPHEXT, JPVEXT
USE MODD_CONF
-USE MODD_CST, ONLY : XRHOLW
-USE MODD_CLOUDPAR, ONLY : VCEXVT=>XCEXVT, XCRS, XCEXRS
-USE MODD_RAIN_ICE_DESCR_n, ONLY : WCEXVT=>XCEXVT, WRTMIN=>XRTMIN
-USE MODD_RAIN_ICE_PARAM_n, ONLY : XFSEDR, XEXSEDR, &
- XFSEDS, XEXSEDS, &
- XFSEDG, XEXSEDG
+USE MODD_CST, ONLY: XRHOLW
+USE MODD_CLOUDPAR, ONLY: VCEXVT=>XCEXVT, XCRS, XCEXRS
+USE MODD_RAIN_ICE_DESCR_n, ONLY: WCEXVT=>XCEXVT, WRTMIN=>XRTMIN
+USE MODD_RAIN_ICE_PARAM_n, ONLY: XFSEDR, XEXSEDR, &
+ XFSEDS, XEXSEDS, &
+ XFSEDG, XEXSEDG
use mode_tools, only: Countjv
use mode_tools_ll, only: GET_INDICE_ll
diff --git a/src/mesonh/ext/ch_meteo_trans_kess.f90 b/src/mesonh/ext/ch_meteo_trans_kess.f90
index debd6ae61a8107d41da8ba5870e267cb73c5a0d1..36d216d7d1a0335fd7dcafc838e1fbf809622ee8 100644
--- a/src/mesonh/ext/ch_meteo_trans_kess.f90
+++ b/src/mesonh/ext/ch_meteo_trans_kess.f90
@@ -117,11 +117,11 @@ USE MODD_CST, ONLY: XP00, & ! Surface pressure
!!
USE MODD_CONF, ONLY: LCARTESIAN ! Logical for cartesian geometry
!!
-USE MODD_RAIN_ICE_DESCR_n, ONLY: XNUC, XALPHAC, & !Cloud droplets distrib. param.
- XRTMIN, & ! min values of the water m. r.
- XLBC, XLBEXC, & !shape param. of the cloud droplets
- XLBR, XLBEXR, & !shape param. of the raindrops
- XCONC_LAND
+USE MODD_RAIN_ICE_DESCR_n, ONLY: XNUC, XALPHAC, & !Cloud droplets distrib. param.
+ XRTMIN, & ! min values of the water m. r.
+ XLBC, XLBEXC, & !shape param. of the cloud droplets
+ XLBR, XLBEXR, & !shape param. of the raindrops
+ XCONC_LAND
!!
use mode_msg
diff --git a/src/mesonh/ext/default_desfmn.f90 b/src/mesonh/ext/default_desfmn.f90
index 33466cf0a528ecca3559fcc0713d498b6249d33e..b373a74ee01218db1dcb940d3bffdadc54cc8e1b 100644
--- a/src/mesonh/ext/default_desfmn.f90
+++ b/src/mesonh/ext/default_desfmn.f90
@@ -219,7 +219,7 @@ END MODULE MODI_DEFAULT_DESFM_n
! Q. Rodier 06/2021: modify default value to LGZ=F (grey-zone corr.), LSEDI and OSEDC=T (LIMA sedimentation)
! F. Couvreux 06/2021: add LRELAX_UVMEAN_FRC
! Q. Rodier 07/2021: modify XPOND=1
-! R. Schoetter 12/2021 multi-level coupling between MesoNH and SURFEX
+! R. Schoetter 12/2021: multi-level coupling between MesoNH and SURFEX
! A. Costes 12/2021: Blaze fire model
! C. Barthe 03/2022: add CIBU and RDSF options in LIMA
! Delbeke/Vie 03/2022: KHKO option in LIMA
diff --git a/src/mesonh/ext/goto_model_wrapper.f90 b/src/mesonh/ext/goto_model_wrapper.f90
index e869230e24429a0a260fcba70bceade88bb9ea62..84e5c72c63e9524a6912e95cff99e24ab3c0ff57 100644
--- a/src/mesonh/ext/goto_model_wrapper.f90
+++ b/src/mesonh/ext/goto_model_wrapper.f90
@@ -18,7 +18,7 @@
! 11/2019 C.Lac correction in the drag formula and application to building in addition to tree
! F. Auguste 02/21: add IBM
! T. Nagel 02/21: add turbulence recycling
-! R. Schoetter 12/2021 multi-level coupling between MesoNH and SURFEX
+! R. Schoetter 12/2021: multi-level coupling between MesoNH and SURFEX
! P. Wautelet 27/04/2022: add namelist for profilers
! P. Wautelet 10/02/2023: add Blaze variables
!-----------------------------------------------------------------
@@ -54,18 +54,14 @@ USE MODD_CH_PRODLOSSTOT_n
USE MODD_CH_ROSENBROCK_n
USE MODD_CH_SOLVER_n
USE MODD_CLOUDPAR_n
-USE MODD_PARAM_ICE_n
-USE MODD_PARAM_LIMA, ONLY: PARAM_LIMA_ASSOCIATE !not yet a '_n' module
-USE MODD_RAIN_ICE_PARAM_n
-USE MODD_RAIN_ICE_DESCR_n
USE MODD_CLOUD_MF_n
USE MODD_CONF_n
+USE MODD_COUPLING_LEVELS_n
USE MODD_CURVCOR_n
USE MODD_DIM_n
USE MODD_DRAG_n
USE MODD_DRAGTREE_n
USE MODD_DRAGBLDG_n
-USE MODD_COUPLING_LEVELS_n
USE MODD_DUMMY_GR_FIELD_n
USE MODD_DYN_n
USE MODD_DYNZD_n
@@ -87,11 +83,14 @@ USE MODD_LSFIELD_n
USE MODD_LUNIT_n
USE MODD_MEAN_FIELD_n
USE MODD_METRICS_n
+USE MODD_NEB_n, ONLY: NEB_GOTO_MODEL
USE MODD_NEST_PGD_n
USE MODD_NUDGING_n
USE MODD_OUT_n
USE MODD_PACK_GR_FIELD_n
+USE MODD_PARAM_ICE_n
USE MODD_PARAM_KAFR_n
+USE MODD_PARAM_LIMA, ONLY: PARAM_LIMA_ASSOCIATE !not yet a '_n' module
USE MODD_PARAM_MFSHALL_n
USE MODD_PARAM_n
USE MODD_PARAM_RAD_n
@@ -101,6 +100,8 @@ USE MODD_PAST_FIELD_n
USE MODD_PRECIP_n
USE MODD_PROFILER_n
USE MODD_RADIATIONS_n
+USE MODD_RAIN_ICE_DESCR_n
+USE MODD_RAIN_ICE_PARAM_n
USE MODD_RBK90_Global_n
USE MODD_RBK90_JacobianSP_n
USE MODD_RBK90_Parameters_n
@@ -119,7 +120,6 @@ USE MODD_SUB_PASPOL_n
USE MODD_SUB_PHYS_PARAM_n
USE MODD_TIMEZ
USE MODD_TURB_n
-USE MODD_NEB_n, ONLY: NEB_GOTO_MODEL
!
!
use mode_field, only: Fieldlist_goto_model
diff --git a/src/mesonh/ext/ground_paramn.f90 b/src/mesonh/ext/ground_paramn.f90
index 598dcdeec67df2619ef469760a903376eaadd98a..8afc481ce2f719f36a222a269b361c58f640b02c 100644
--- a/src/mesonh/ext/ground_paramn.f90
+++ b/src/mesonh/ext/ground_paramn.f90
@@ -126,7 +126,7 @@ END MODULE MODI_GROUND_PARAM_n
!! (V. Vionnet) 18/07/2017 add coupling for blowing snow module
!! (Bielli S.) 02/2019 Sea salt : significant sea wave height influences salt emission; 5 salt modes
! P. Wautelet 20/05/2019: add name argument to ADDnFIELD_ll + new ADD4DFIELD_ll subroutine
-! R. Schoetter 12/2021 multi-level coupling between MesoNH and SURFEX
+! R. Schoetter 12/2021: multi-level coupling between MesoNH and SURFEX
! A. Costes 12/2021: Blaze Fire model
! P. Wautelet 09/02/2022: bugfix: add missing XCURRENT_LEI computation
! P. Wautelet 30/09/2022: bugfix: missing communications for SWDIFF, SWDIR and LEI
@@ -146,14 +146,14 @@ USE MODD_BUDGET, ONLY: LBUDGET_TH, LBUDGET_RV, NBUDGET_RV, NBUDGET_TH
USE MODD_CH_AEROSOL, ONLY: LORILAM
USE MODD_CH_FLX_n, ONLY: XCHFLX
USE MODD_CH_MNHC_n, ONLY: LUSECHEM
-USE MODD_CONF, ONLY: CPROGRAM, LCARTESIAN, NHALO
-USE MODD_COUPLING_LEVELS_n
+USE MODD_CONF, ONLY: CPROGRAM, LCARTESIAN, NHALO, NVERB
USE MODD_CONF_n, ONLY: NRR
+USE MODD_COUPLING_LEVELS_n
USE MODD_CST, ONLY: XP00, XCPD, XRD, XRV, XRHOLW, XDAY, XPI, XMD, XAVOGADRO
USE MODD_CSTS_DUST, ONLY: XMOLARWEIGHT_DUST
USE MODD_CSTS_SALT, ONLY: XMOLARWEIGHT_SALT
USE MODD_DEEP_CONVECTION_n, ONLY: XPRCONV, XPRSCONV
-USE MODD_DRAGBLDG_n, ONLY : LFLUXBLDG
+USE MODD_DRAGBLDG_n, ONLY: LFLUXBLDG
USE MODD_DIAG_FLAG, ONLY: LCHEMDIAG
USE MODD_DIAG_IN_RUN
USE MODD_DIM_n, ONLY: NKMAX
@@ -175,13 +175,13 @@ USE MODD_MNH_SURFEX_n, ONLY: YSURF_CUR
USE MODD_NSV, ONLY: CSV, NSV, NSV_AERBEG, NSV_AEREND, NSV_CHEMBEG, NSV_CHEMEND, NSV_DSTBEG, NSV_DSTEND, &
NSV_SLTBEG, NSV_SLTEND, NSV_SNWBEG, NSV_SNWEND
USE MODD_PARAM_C2R2, ONLY: LSEDC
-USE MODD_PREP_SNOW, ONLY: NIMPUR
USE MODD_PARAMETERS, ONLY: JPVEXT
-USE MODD_PARAM_ICE_n, ONLY: LSEDIC
+USE MODD_PARAM_ICE_n, ONLY: LSEDIC
USE MODD_PARAM_LIMA, ONLY: MSEDC=>LSEDC
USE MODD_PARAM_n, ONLY: CDCONV, CCLOUD, CRAD, CTURB
USE MODD_PRECIP_n, ONLY: XINPRC, XINPRR, XINPRS, XINPRG, XINPRH
USE MODD_PRECISION, ONLY: MNHTIME
+USE MODD_PREP_SNOW, ONLY: NIMPUR
USE MODD_PROFILER_n, ONLY: LPROFILER
USE MODD_RADIATIONS_n, ONLY: XFLALWD, XCCO2, XTSIDER, &
XSW_BANDS, XDIRSRFSWD, XSCAFLASWD, &
@@ -807,9 +807,9 @@ IF ( CPROGRAM == 'DIAG' .OR. GSTATPROF_SURF ) THEN
IF ( CPROGRAM == 'DIAG' ) THEN
CALL MNHGET_SURF_PARAM_n(PZON10M=ZP_ZON10M, PMER10M=ZP_MER10M)
ELSE
- CALL MNHGET_SURF_PARAM_n( PRN=ZP_RN, PH=ZP_H, PLE=ZP_LE, PLEI=ZP_LEI, &
+ CALL MNHGET_SURF_PARAM_n( PRN=ZP_RN, PH=ZP_H, PLE=ZP_LE, PLEI=ZP_LEI, &
PGFLUX=ZP_GFLUX, PT2M=ZP_T2M, PQ2M=ZP_Q2M, PHU2M=ZP_HU2M, &
- PZON10M=ZP_ZON10M, PMER10M=ZP_MER10M)
+ PZON10M=ZP_ZON10M, PMER10M=ZP_MER10M )
END IF
END IF
!
diff --git a/src/mesonh/ext/ice_adjust_bis.f90 b/src/mesonh/ext/ice_adjust_bis.f90
index e530d5c21f91b7e143b2d7240f669e4df7c181bd..1046304293aeb1838a0f7d5a52659ea2282f69d3 100644
--- a/src/mesonh/ext/ice_adjust_bis.f90
+++ b/src/mesonh/ext/ice_adjust_bis.f90
@@ -65,8 +65,8 @@ END MODULE MODI_ICE_ADJUST_BIS
!* 0. DECLARATIONS
! ------------
!
-USE MODD_CST, ONLY : XCPD, XRD, XP00, CST
-USE MODD_NEB_n, ONLY : NEBN
+USE MODD_CST, ONLY: XCPD, XRD, XP00, CST
+USE MODD_NEB_n, ONLY: NEBN
!
USE MODI_COMPUTE_FUNCTION_THERMO
USE MODI_THLRT_FROM_THRVRCRI
diff --git a/src/mesonh/ext/ini_elecn.f90 b/src/mesonh/ext/ini_elecn.f90
index 25a77068dee77613a87024b79cee6c2ee848cb91..339e30c483b7869fc8ff62913a8a165a350d342b 100644
--- a/src/mesonh/ext/ini_elecn.f90
+++ b/src/mesonh/ext/ini_elecn.f90
@@ -84,6 +84,7 @@ END MODULE MODI_INI_ELEC_n
!* 0. DECLARATIONS
! ------------
!
+USE MODD_ARGSLIST_ll, ONLY: LIST_ll
USE MODD_CLOUDPAR_n, ONLY: NSPLITR
USE MODD_CONF, ONLY: CEQNSYS, CCONF, CPROGRAM
USE MODD_CONF_n, ONLY: NRR
@@ -111,7 +112,6 @@ USE MODD_REF
USE MODD_REF_n, ONLY: XRHODJ, XTHVREF
USE MODD_TIME
!
-USE MODD_ARGSLIST_ll, ONLY: LIST_ll
USE MODE_ll
use mode_msg
!
diff --git a/src/mesonh/ext/ini_lb.f90 b/src/mesonh/ext/ini_lb.f90
index faa09698bf58497f08539e7305b5f0fc0d01487c..f55708c99157899111d3fb33e0b2df4aaca35f96 100644
--- a/src/mesonh/ext/ini_lb.f90
+++ b/src/mesonh/ext/ini_lb.f90
@@ -139,7 +139,6 @@ SUBROUTINE INI_LB(TPINIFILE,OLSOURCE,KSV, &
!
!* 0. DECLARATIONS
!
-USE MODD_TURB_n, ONLY: XTKEMIN
USE MODD_CONF, ONLY: LCPL_AROME
use modd_field, only: NMNHDIM_UNKNOWN, tfieldmetadata, TYPELOG, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
@@ -151,6 +150,7 @@ USE MODD_NSV, ONLY: NSV, NSV_CS, NSV_CSBEG, NSV_CSEND, NSV_LIMA_BEG,
NSV_SNWBEG, NSV_SNWEND, NSV_USER, TSVLIST
USE MODD_PARAMETERS, ONLY: JPHEXT, JPSVNAMELGTMAX, NLONGNAMELGTMAX, NMNHNAMELGTMAX
USE MODD_PARAM_LIMA, ONLY: NMOD_CCN, NMOD_IFN
+USE MODD_TURB_n, ONLY: XTKEMIN
!
USE MODE_IO_FIELD_READ, only: IO_Field_read, IO_Field_read_lb
USE MODE_MSG
diff --git a/src/mesonh/ext/ini_modeln.f90 b/src/mesonh/ext/ini_modeln.f90
index 1ac91c3c2b8247c3fc48d6a176358570238f22db..790a248208cddd4b6386ca33a76c2a999e210393 100644
--- a/src/mesonh/ext/ini_modeln.f90
+++ b/src/mesonh/ext/ini_modeln.f90
@@ -335,9 +335,9 @@ USE MODD_DEF_EDDY_FLUX_n ! for VT and WT fluxes
USE MODD_DEF_EDDYUV_FLUX_n ! FOR UV
USE MODD_DIAG_FLAG, only: LCHEMDIAG, CSPEC_BU_DIAG
USE MODD_DIM_n
+USE MODD_DRAGBLDG_n
USE MODD_DRAG_n
USE MODD_DRAGTREE_n
-USE MODD_DRAGBLDG_n
USE MODD_DUST
use MODD_DUST_OPT_LKT, only: NMAX_RADIUS_LKT_DUST=>NMAX_RADIUS_LKT, NMAX_SIGMA_LKT_DUST=>NMAX_SIGMA_LKT, &
NMAX_WVL_SW_DUST=>NMAX_WVL_SW, &
@@ -371,6 +371,7 @@ USE MODD_MEAN_FIELD
USE MODD_MEAN_FIELD_n
USE MODD_METRICS_n
USE MODD_MNH_SURFEX_n
+USE MODD_NEB_n, only: LSUBG_COND, LSTATNW
USE MODD_NESTING, only: CDAD_NAME, NDAD, NDT_2_WAY, NDTRATIO, NDXRATIO_ALL, NDYRATIO_ALL
USE MODD_NSV
USE MODD_NSV
@@ -403,13 +404,15 @@ USE MODD_SURF_PAR, only: XUNDEF_SFX => XUNDEF
USE MODD_TIME
USE MODD_TIME_n
USE MODD_TURB_n
-USE MODD_NEB_n, only: LSUBG_COND, LSTATNW
USE MODD_VAR_ll, only: IP
USE MODE_GATHER_ll
USE MODE_INI_AIRCRAFT_BALLOON, only: INI_AIRCRAFT_BALLOON
use mode_ini_budget, only: Budget_preallocate, Ini_budget
+USE MODE_INI_MFSHALL, ONLY: INI_MFSHALL
USE MODE_INI_ONE_WAY_n
+USE MODE_INIT_AEROSOL_PROPERTIES, ONLY: INIT_AEROSOL_PROPERTIES
+USE MODE_INI_TURB, ONLY: INI_TURB
USE MODE_IO
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_IO_FILE, only: IO_File_open
@@ -448,8 +451,6 @@ USE MODI_INI_LES_N
USE MODI_INI_LG
USE MODI_INI_LW_SETUP
USE MODI_INI_MICRO_n
-USE MODE_INI_TURB, ONLY: INI_TURB
-USE MODE_INI_MFSHALL, ONLY: INI_MFSHALL
USE MODI_INI_POSPROFILER_n
USE MODI_INI_RADIATIONS
USE MODI_INI_RADIATIONS_ECMWF
@@ -459,7 +460,6 @@ USE MODI_INI_SPAWN_LS_n
USE MODI_INI_SURF_RAD
USE MODI_INI_SURFSTATION_n
USE MODI_INI_SW_SETUP
-USE MODE_INIT_AEROSOL_PROPERTIES, ONLY: INIT_AEROSOL_PROPERTIES
#ifdef MNH_FOREFIRE
USE MODI_INIT_FOREFIRE_n
#endif
diff --git a/src/mesonh/ext/ini_nsv.f90 b/src/mesonh/ext/ini_nsv.f90
index 635a885fe9985a2b7cf4db67c722cf3ea62bd0f3..5666ade6a6f912e5718a6566bfe9a70802bfffce 100644
--- a/src/mesonh/ext/ini_nsv.f90
+++ b/src/mesonh/ext/ini_nsv.f90
@@ -125,8 +125,8 @@ USE MODD_RAIN_C2R2_DESCR, ONLY: C2R2NAMES
USE MODD_SALT, ONLY: CSALTNAMES, CDESLTNAMES, JPSALTORDER, &
LRGFIX_SLT, LSALT, LSLTINIT, LSLTPRES, LDEPOS_SLT, LVARSIG_SLT, NMODE_SLT, YPDESLT_INI, YPSALT_INI
-USE MODE_MSG
USE MODE_LIMA_UPDATE_NSV, ONLY: LIMA_UPDATE_NSV
+USE MODE_MSG
USE MODI_CH_AER_INIT_SOA, ONLY: CH_AER_INIT_SOA
USE MODI_CH_INIT_SCHEME_n, ONLY: CH_INIT_SCHEME_n
diff --git a/src/mesonh/ext/ini_radar.f90 b/src/mesonh/ext/ini_radar.f90
index efe222510b6882e595a88afd90253a4ce5a7ec2c..671d1f6e9763ed8a2ee69ed0bab08ce1f3ddd18f 100644
--- a/src/mesonh/ext/ini_radar.f90
+++ b/src/mesonh/ext/ini_radar.f90
@@ -214,10 +214,10 @@ CONTAINS
IMPLICIT NONE
- REAL, INTENT(IN) :: PALPHA ! first shape parameter of the dimensionnal distribution
- REAL, INTENT(IN) :: PNU ! second shape parameter of the dimensionnal distribution
- REAL, INTENT(IN) :: PP ! order of the moment
- REAL :: PMOMG ! result: moment of order ZP
+ REAL, INTENT(IN) :: PALPHA ! first shape parameter of the dimensionnal distribution
+ REAL, INTENT(IN) :: PNU ! second shape parameter of the dimensionnal distribution
+ REAL, INTENT(IN) :: PP ! order of the moment
+ REAL :: PMOMG ! result: moment of order ZP
!------------------------------------------------------------------------------
diff --git a/src/mesonh/ext/ini_segn.f90 b/src/mesonh/ext/ini_segn.f90
index 9299f713c570da1307054de55657bf040c94a415..9d78f2b6649056b60c9f99226747fe2176e984b9 100644
--- a/src/mesonh/ext/ini_segn.f90
+++ b/src/mesonh/ext/ini_segn.f90
@@ -179,7 +179,6 @@ USE MODD_LES, ONLY: LES_ASSOCIATE
USE MODD_LUNIT
USE MODD_LUNIT_n, ONLY: CINIFILE_n=> CINIFILE, TINIFILE_n => TINIFILE, CINIFILEPGD_n=> CINIFILEPGD, TLUOUT, LUNIT_MODEL
USE MODD_PARAM_n, ONLY: CSURF
-USE MODD_PARAM_ICE_n
USE MODD_PARAMETERS
USE MODD_REF, ONLY: LBOUSS
!
diff --git a/src/mesonh/ext/ini_tke_eps.f90 b/src/mesonh/ext/ini_tke_eps.f90
index a07160722558475a37baff36ada0a00739bff061..b643f54c394a0801fbe48f28083f8e50e60deff8 100644
--- a/src/mesonh/ext/ini_tke_eps.f90
+++ b/src/mesonh/ext/ini_tke_eps.f90
@@ -93,9 +93,9 @@ END MODULE MODI_INI_TKE_EPS
USE MODD_ARGSLIST_ll, ONLY: LIST_ll
USE MODD_CST, ONLY: XG, XALPHAOC
USE MODD_CTURB, ONLY: XCMFS
-USE MODD_TURB_n, ONLY: XLINI, XCED, XTKEMIN, XCSHF
USE MODD_DYN_n, ONLY: LOCEAN
USE MODD_PARAMETERS, ONLY: JPVEXT
+USE MODD_TURB_n, ONLY: XLINI, XCED, XTKEMIN, XCSHF
!
USE MODE_ll
!
diff --git a/src/mesonh/ext/init_mnh.f90 b/src/mesonh/ext/init_mnh.f90
index 4170ca68e7ebf89b388aa90fee1d25880fd73edd..ad6ea75eb643f6cfb3bca262b6c3f35feb0c5437 100644
--- a/src/mesonh/ext/init_mnh.f90
+++ b/src/mesonh/ext/init_mnh.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2023 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.
@@ -82,17 +82,17 @@ USE MODD_LBC_n, ONLY: CLBCX,CLBCY ! only for spawning purpose
USE MODD_LUNIT
USE MODD_LUNIT_n
USE MODD_MNH_SURFEX_n
+USE MODD_NSV, ONLY: NSV_ASSOCIATE
USE MODD_PARAMETERS
-USE MODD_NSV, ONLY: NSV_ASSOCIATE
!
use mode_field, only: Alloc_field_scalars, Fieldlist_goto_model
+USE MODE_INI_CST, ONLY: INI_CST
USE MODE_IO_FILE, ONLY: IO_File_open
USE MODE_IO_MANAGE_STRUCT, ONLY: IO_File_add2list
USE MODE_ll
USE MODE_MODELN_HANDLER
USE MODE_SPLITTINGZ_ll
!
-USE MODE_INI_CST, ONLY: INI_CST
USE MODI_INI_MODEL_n
USE MODI_INI_SEG_n
USE MODI_INI_SIZE_n
diff --git a/src/mesonh/ext/latlon_to_xy.f90 b/src/mesonh/ext/latlon_to_xy.f90
index d5879356511d4b00f687923928cb4535ee4289ed..6694937f5dab1b7275beab0c16d28de817393170 100644
--- a/src/mesonh/ext/latlon_to_xy.f90
+++ b/src/mesonh/ext/latlon_to_xy.f90
@@ -75,6 +75,7 @@ USE MODD_LUNIT
!
USE MODE_FIELD, ONLY: INI_FIELD_LIST
USE MODE_GRIDPROJ
+USE MODE_INI_CST, ONLY: INI_CST
USE MODE_IO, only: IO_Config_set, IO_Init
use MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_IO_FILE, only: IO_File_close, IO_File_open
@@ -84,7 +85,6 @@ USE MODE_MODELN_HANDLER, ONLY: GOTO_MODEL
USE MODE_POS, ONLY: POSNAM
use MODE_SPLITTINGZ_ll
!
-USE MODE_INI_CST, ONLY: INI_CST
USE MODI_READ_HGRID
USE MODI_VERSION
!
diff --git a/src/mesonh/ext/lesn.f90 b/src/mesonh/ext/lesn.f90
index 6411b6cc5518e610d79264dfc126b8f9f38c6a79..86b86a3e6e3a0b572e2686f371365d227c0713fb 100644
--- a/src/mesonh/ext/lesn.f90
+++ b/src/mesonh/ext/lesn.f90
@@ -72,6 +72,11 @@ USE MODD_PARAM_ICE_n, ONLY: LDEPOSC,LSEDIC
USE MODD_PARAM_C2R2, ONLY: LDEPOC,LSEDC
USE MODD_PARAM_LIMA, ONLY : MSEDC=>LSEDC
!
+USE MODE_BL_DEPTH_DIAG
+USE MODE_FILL_DIMPHYEX, ONLY: FILL_DIMPHYEX
+USE MODE_ll
+USE MODE_MODELN_HANDLER
+!
USE MODI_SHUMAN
USE MODI_GRADIENT_M
USE MODI_GRADIENT_U
@@ -84,11 +89,6 @@ USE MODI_THL_RT_FROM_TH_R
USE MODI_LES_RES_TR
USE MODI_BUDGET_FLAGS
USE MODI_LES_BUDGET_TEND_n
-USE MODE_BL_DEPTH_DIAG
-!
-USE MODE_ll
-USE MODE_MODELN_HANDLER
-USE MODE_FILL_DIMPHYEX, ONLY: FILL_DIMPHYEX
!
IMPLICIT NONE
!
diff --git a/src/mesonh/ext/mnh2lpdm.f90 b/src/mesonh/ext/mnh2lpdm.f90
index e5472663fb4f3727590afe015482fcab299981f6..21d162a5db272761fd00a2bb44882a4775aa63b5 100644
--- a/src/mesonh/ext/mnh2lpdm.f90
+++ b/src/mesonh/ext/mnh2lpdm.f90
@@ -34,6 +34,7 @@ use modd_lunit_n, only: TLUOUT
USE MODD_MNH2LPDM
!
USE MODE_FIELD, ONLY: INI_FIELD_LIST, INI_FIELD_SCALARS
+USE MODE_INI_CST, ONLY: INI_CST
USE MODE_IO, ONLY: IO_Init, IO_Config_set
USE MODE_IO_FILE, ONLY: IO_File_open, IO_File_close
USE MODE_IO_MANAGE_STRUCT, ONLY: IO_File_add2list
@@ -41,7 +42,6 @@ USE MODE_MODELN_HANDLER
use mode_msg
USE MODE_POS
!
-USE MODE_INI_CST, ONLY: INI_CST
USE MODI_MNH2LPDM_ECH
USE MODI_MNH2LPDM_INI
USE MODI_VERSION
diff --git a/src/mesonh/ext/mnh2lpdm_ini.f90 b/src/mesonh/ext/mnh2lpdm_ini.f90
index a18acfcbec58726cee80ab7c9f92620c6b5c96bd..526bdd08afc6729ad33fab8085ca494e126c0908 100644
--- a/src/mesonh/ext/mnh2lpdm_ini.f90
+++ b/src/mesonh/ext/mnh2lpdm_ini.f90
@@ -46,11 +46,11 @@ USE MODD_TIME_n
!
USE MODE_DATETIME
USE MODE_GRIDPROJ
+USE MODE_INI_CST, ONLY: INI_CST
USE MODE_IO_FILE, only: IO_File_close, IO_File_open
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_MODELN_HANDLER
!
-USE MODE_INI_CST, ONLY: INI_CST
USE MODI_READ_HGRID
USE MODI_XYTOLATLON
!
diff --git a/src/mesonh/ext/modeln.f90 b/src/mesonh/ext/modeln.f90
index 38a8bf768cb281e3a73e98aa0cd99cbe42698fb1..ee03f74b81d589ed3cb6a0646a9b7f3d26e73215 100644
--- a/src/mesonh/ext/modeln.f90
+++ b/src/mesonh/ext/modeln.f90
@@ -277,13 +277,13 @@ END MODULE MODI_MODEL_n
! T. Nagel 01/02/2021: add turbulence recycling
! P. Wautelet 19/02/2021: add NEGA2 term for SV budgets
! J.L. Redelsperger 03/2021: add Call NHOA_COUPLN (coupling O & A LES version)
-! R. Schoetter 12/2021 multi-level coupling between MesoNH and SURFEX
+! R. Schoetter 12/2021: multi-level coupling between MesoNH and SURFEX
! A. Costes 12/2021: add Blaze fire model
! C. Barthe 07/04/2022: deallocation of ZSEA
! P. Wautelet 08/12/2022: bugfix if no TDADFILE
! P. Wautelet 13/01/2023: manage close of backup files outside of MODEL_n
! (useful to close them in reverse model order (child before parent, needed by WRITE_BALLOON_n)
-! J. Wurtz 01/2023 : correction for mean in SURFEX outputs
+! J. Wurtz 01/2023: correction for mean in SURFEX outputs
! C. Barthe 03/02/2022: cloud electrification is now called from resolved_cloud to avoid duplicated routines
!!-------------------------------------------------------------------------------
!
@@ -344,6 +344,7 @@ USE MODD_MEAN_FIELD
USE MODD_MEAN_FIELD_n
USE MODD_METRICS_n
USE MODD_MNH_SURFEX_n
+USE MODD_NEB_n, ONLY: LSIGMAS, LSUBG_COND, VSIGQSAT
USE MODD_NESTING
USE MODD_NSV
USE MODD_NUDGING_n
@@ -376,7 +377,6 @@ USE MODD_TIME
USE MODD_TIME_n
USE MODD_TIMEZ
USE MODD_TURB_n
-USE MODD_NEB_n, ONLY: VSIGQSAT, LSIGMAS, LSUBG_COND
USE MODD_TYPE_DATE, ONLY: DATE_TIME
USE MODD_VISCOSITY
!
diff --git a/src/mesonh/ext/phys_paramn.f90 b/src/mesonh/ext/phys_paramn.f90
index ab607d4fa8b166af860d5b6a86ec352e0f840c6b..e059ad37163b5e80aa6e8468f9646269b7dc73a3 100644
--- a/src/mesonh/ext/phys_paramn.f90
+++ b/src/mesonh/ext/phys_paramn.f90
@@ -247,7 +247,7 @@ END MODULE MODI_PHYS_PARAM_n
!* 0. DECLARATIONS
! ------------
!
-USE MODD_ADV_n, ONLY : XRTKEMS
+USE MODD_ADV_n, ONLY : XRTKEMS
USE MODD_AIRCRAFT_BALLOON, ONLY: LFLYER
USE MODD_ARGSLIST_ll, ONLY : LIST_ll
USE MODD_BLOWSNOW, ONLY : LBLOWSNOW,XRSNOW
@@ -292,6 +292,7 @@ USE MODD_LSFIELD_n
USE MODD_LUNIT_n
USE MODD_METRICS_n
USE MODD_MNH_SURFEX_n
+USE MODD_NEB_n, ONLY: NEBN
USE MODD_NESTING, ONLY : XWAY,NDAD, NDXRATIO_ALL, NDYRATIO_ALL
USE MODD_NSV, ONLY : NSV, NSV_LGBEG, NSV_LGEND, &
NSV_SLTBEG,NSV_SLTEND,NSV_SLT,&
@@ -302,7 +303,7 @@ USE MODD_OCEANH
USE MODD_OUT_n
USE MODD_PARAM_C2R2, ONLY : LSEDC
USE MODD_PARAMETERS
-USE MODD_PARAM_ICE_n, ONLY : LSEDIC
+USE MODD_PARAM_ICE_n, ONLY : LSEDIC
USE MODD_PARAM_KAFR_n
USE MODD_PARAM_LIMA, ONLY : MSEDC => LSEDC, XRTMIN_LIMA=>XRTMIN
USE MODD_PARAM_MFSHALL_n, ONLY: CMF_CLOUD
@@ -314,7 +315,7 @@ USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t
USE MODD_PRECIP_n
use modd_precision, only: MNHTIME
USE MODD_RADIATIONS_n
-USE MODD_RAIN_ICE_DESCR_n, ONLY: XRTMIN
+USE MODD_RAIN_ICE_DESCR_n, ONLY: XRTMIN
USE MODD_REF, ONLY: LCOUPLES
USE MODD_REF_n
USE MODD_SALT
@@ -325,7 +326,6 @@ USE MODD_TIME_n
USE MODD_TIME, ONLY : TDTEXP ! Ajout PP
USE MODD_TURB_FLUX_AIRCRAFT_BALLOON, ONLY : XTHW_FLUX, XRCW_FLUX, XSVW_FLUX
USE MODD_TURB_n
-USE MODD_NEB_n, ONLY: NEBN
USE MODE_AERO_PSD
use mode_budget, only: Budget_store_end, Budget_store_init
@@ -1389,7 +1389,7 @@ XTIME_LES_BU_PROCESS = 0.
!
CALL ADD2DFIELD_ll(TZFIELDS_ll,ZSFTH_WALL, 'PHYS_PARAM_n::ZSFTH_WALL')
CALL ADD2DFIELD_ll(TZFIELDS_ll,ZSFTH_ROOF, 'PHYS_PARAM_n::ZSFTH_ROOF')
-CALL ADD2DFIELD_ll(TZFIELDS_ll,ZCD_ROOF, 'PHYS_PARAM_n::ZCD_ROOF')
+CALL ADD2DFIELD_ll(TZFIELDS_ll,ZCD_ROOF, 'PHYS_PARAM_n::ZCD_ROOF')
CALL ADD2DFIELD_ll(TZFIELDS_ll,ZSFRV_WALL, 'PHYS_PARAM_n::ZSFRV_WALL')
CALL ADD2DFIELD_ll(TZFIELDS_ll,ZSFRV_ROOF, 'PHYS_PARAM_n::ZSFRV_ROOF')
!
@@ -1631,7 +1631,7 @@ IF(LLEONARD) THEN
ZHGRAD(:,:,:,5) = GX_M_M(XRT(:,:,:,1), XDXX,XDZZ,XDZX,1,IKU,1)
ZHGRAD(:,:,:,6) = GY_M_M(XRT(:,:,:,1), XDXX,XDZZ,XDZX,1,IKU,1)
END IF
- CALL TURB( CST,CSTURB, TBUCONF, TURBN, NEBN, YLDIMPHYEX,TLES, &
+ CALL TURB( CST,CSTURB, TBUCONF, TURBN, NEBN, YLDIMPHYEX, TLES, &
NRR, NRRL, NRRI, CLBCX, CLBCY, IGRADIENTS, NHALO, NTURBSPLIT, &
LCLOUDMODIFLM, NSV, NSV_LGBEG, NSV_LGEND, &
NSV_LIMA_NR, NSV_LIMA_NS, NSV_LIMA_NG, NSV_LIMA_NH, &
diff --git a/src/mesonh/ext/prep_nest_pgd.f90 b/src/mesonh/ext/prep_nest_pgd.f90
index 4a2352d7736938047c49746ff2bfb416e4357fb1..3a60cde0d23908e3acc16274fb73dd62ae64a1ae 100644
--- a/src/mesonh/ext/prep_nest_pgd.f90
+++ b/src/mesonh/ext/prep_nest_pgd.f90
@@ -112,6 +112,7 @@ USE MODD_VAR_ll, ONLY: NPROC, IP, NMNH_COMM_WORLD
!
use mode_field, only: Ini_field_list
USE MODE_FINALIZE_MNH, only: FINALIZE_MNH
+USE MODE_INI_CST, ONLY: INI_CST
USE MODE_IO, only: IO_Init, IO_Pack_set
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_IO_FIELD_WRITE, only: IO_Field_write, IO_Header_write
@@ -134,7 +135,6 @@ USE MODI_READ_HGRID
USE MODI_RETRIEVE1_NEST_INFO_n
USE MODI_VERSION
USE MODI_WRITE_PGD_SURF_ATM_N
-USE MODE_INI_CST, ONLY: INI_CST
!
IMPLICIT NONE
!
diff --git a/src/mesonh/ext/prep_pgd.f90 b/src/mesonh/ext/prep_pgd.f90
index 617389344cce3df0e04725dc6174037299dab045..172959a983513db9261d327d47019cbca0189b30 100644
--- a/src/mesonh/ext/prep_pgd.f90
+++ b/src/mesonh/ext/prep_pgd.f90
@@ -96,6 +96,7 @@ USE MODD_SPAWN, ONLY : NDXRATIO,NDYRATIO,NXSIZE,NYSIZE,NXOR,NYOR
!
use mode_field, only: Ini_field_list
USE MODE_FINALIZE_MNH, only: FINALIZE_MNH
+USE MODE_INI_CST, ONLY: INI_CST
USE MODE_IO, only: IO_Config_set, IO_Init
USE MODE_IO_FIELD_WRITE, only: IO_Field_write, IO_Header_write
USE MODE_IO_FILE, only: IO_File_close, IO_File_open
@@ -125,7 +126,6 @@ USE MODE_MPPDB
USE MODI_EXTEND_GRID_ON_HALO
!
USE MODN_CONFIO, ONLY : NAM_CONFIO
-USE MODE_INI_CST, ONLY: INI_CST
!
IMPLICIT NONE
!
diff --git a/src/mesonh/ext/prep_real_case.f90 b/src/mesonh/ext/prep_real_case.f90
index 8cedd2db6306022147be0c79c5aeaa100a8d237d..1384ee51335ecc3041e304e4fe35d2ce1e6f6786 100644
--- a/src/mesonh/ext/prep_real_case.f90
+++ b/src/mesonh/ext/prep_real_case.f90
@@ -430,6 +430,7 @@ USE MODD_MNH_SURFEX_n
USE MODD_NESTING
USE MODD_NSV
USE MODD_PARAMETERS
+USE MODD_PARAM_LIMA, ONLY: PARAM_LIMA_INIT, NMOD_CCN, NMOD_IFN
USE MODD_PARAM_n
USE MODD_PREP_REAL
USE MODD_REF_n
@@ -445,6 +446,7 @@ use mode_field, only: Alloc_field_scalars, Ini_field_list, Ini_field_
USE MODE_FINALIZE_MNH, only: FINALIZE_MNH
USE MODE_GRIDCART
USE MODE_GRIDPROJ
+USE MODE_INI_CST, ONLY: INI_CST
USE MODE_IO, only: IO_Init
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_IO_FIELD_WRITE, only: IO_Header_write
@@ -500,8 +502,6 @@ USE MODI_WRITE_LFIFM_n
!
USE MODN_CONF, ONLY: JPHEXT , NHALO
USE MODN_CONFZ
-USE MODD_PARAM_LIMA, ONLY: PARAM_LIMA_INIT, NMOD_CCN, NMOD_IFN
-USE MODE_INI_CST, ONLY: INI_CST
!
IMPLICIT NONE
!
diff --git a/src/mesonh/ext/prep_surfex.f90 b/src/mesonh/ext/prep_surfex.f90
index 6c3c81277095e0087f0f7d63a998dbade6008a07..749c598448269419aed5db6a646c7839e5296bed 100644
--- a/src/mesonh/ext/prep_surfex.f90
+++ b/src/mesonh/ext/prep_surfex.f90
@@ -45,6 +45,7 @@ USE MODD_TIME_n, ONLY : TDTCUR
!
use mode_field, only: Ini_field_list, Ini_field_scalars
USE MODE_FINALIZE_MNH, only: FINALIZE_MNH
+USE MODE_INI_CST, ONLY: INI_CST
USE MODE_IO, only: IO_Init
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_IO_FIELD_WRITE, only: IO_Field_write, IO_Header_write
@@ -59,7 +60,6 @@ USE MODI_OPEN_PRC_FILES
USE MODI_PREP_SURF_MNH
USE MODI_READ_ALL_NAMELISTS
USE MODI_VERSION
-USE MODE_INI_CST, ONLY: INI_CST
!
IMPLICIT NONE
!
diff --git a/src/mesonh/ext/read_desfmn.f90 b/src/mesonh/ext/read_desfmn.f90
index 39e599098f7401789fea437b2d6539906d08f4f1..3ced113c52d07eb9732f0104037bcaeb7e635934 100644
--- a/src/mesonh/ext/read_desfmn.f90
+++ b/src/mesonh/ext/read_desfmn.f90
@@ -202,9 +202,14 @@ END MODULE MODI_READ_DESFM_n
!
!* 0. DECLARATIONS
! ------------
-USE MODD_IO, ONLY: TFILEDATA
-USE MODD_LUNIT_n, ONLY: TLUOUT
+USE MODD_IO, ONLY: TFILEDATA
+USE MODD_LUNIT_n, ONLY: TLUOUT
+USE MODD_NEB_n, ONLY: NEBN_INIT
USE MODD_PARAMETERS
+USE MODD_PARAM_ICE_n, ONLY : PARAM_ICEN_INIT
+USE MODD_PARAM_LIMA, ONLY: PARAM_LIMA_INIT
+USE MODD_PARAM_MFSHALL_n, ONLY: PARAM_MFSHALLN_INIT
+USE MODD_TURB_n, ONLY: TURBN_INIT, CTOM, LRMC01
!
USE MODN_BACKUP
USE MODN_BUDGET
@@ -220,14 +225,9 @@ USE MODN_PARAM_n
USE MODN_PARAM_RAD_n
USE MODN_PARAM_ECRAD_n
USE MODN_PARAM_KAFR_n
-USE MODD_PARAM_MFSHALL_n, ONLY: PARAM_MFSHALLN_INIT
-USE MODD_PARAM_ICE_n, ONLY : PARAM_ICEN_INIT
-USE MODD_PARAM_LIMA, ONLY: PARAM_LIMA_INIT
USE MODN_LUNIT_n
USE MODN_LBC_n
USE MODN_NUDGING_n
-USE MODD_TURB_n, ONLY: TURBN_INIT, CTOM, LRMC01
-USE MODD_NEB_n, ONLY: NEBN_INIT
USE MODN_FRC
USE MODN_BLANK_n
USE MODN_CH_SOLVER_n
diff --git a/src/mesonh/ext/read_exsegn.f90 b/src/mesonh/ext/read_exsegn.f90
index cefed9cdba5282bc10600c364dee66dfb08ddfd3..a5c44aee26580ff1bcd278192a9f83db8f8c5991 100644
--- a/src/mesonh/ext/read_exsegn.f90
+++ b/src/mesonh/ext/read_exsegn.f90
@@ -302,9 +302,9 @@ END MODULE MODI_READ_EXSEG_n
! P. Wautelet 09/03/2021: move some chemistry initializations to ini_nsv
! P. Wautelet 10/03/2021: move scalar variable name initializations to ini_nsv
! R. Honnert 23/04/2021: add HM21 mixing length and delete HRIO and BOUT from CMF_UPDRAFT
-! S. Riette 11/05/2021 HighLow cloud
+! S. Riette 11/05/2021: HighLow cloud
! A. Costes 12/2021: add Blaze fire model
-! R. Schoetter 12/2021: multi-level coupling between MesoNH and SURFEX
+! R. Schoetter 12/2021: multi-level coupling between MesoNH and SURFEX
! P. Wautelet 27/04/2022: add namelist for profilers
! P. Wautelet 24/06/2022: remove check on CSTORAGE_TYPE for restart of ForeFire variables
! P. Wautelet 13/07/2022: add namelist for flyers and balloons
@@ -321,7 +321,7 @@ USE MODD_CH_AEROSOL
USE MODD_CH_M9_n, ONLY : NEQ
USE MODD_CONDSAMP
USE MODD_CONF
-USE MODD_CONF_n, ONLY: CSTORAGE_TYPE
+USE MODD_CONF_n, ONLY: CSTORAGE_TYPE
USE MODD_CONFZ
! USE MODD_DRAG_n
USE MODD_DUST
@@ -334,10 +334,20 @@ USE MODD_GET_n
USE MODD_GR_FIELD_n
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LUNIT_n, ONLY: TLUOUT
-USE MODD_NSV,NSV_USER_n=>NSV_USER
+USE MODD_NEB_n, ONLY: NEBN_INIT, LSIGMAS, LSUBG_COND, CCONDENS, LSTATNW
+USE MODD_NSV, NSV_USER_n=>NSV_USER
USE MODD_PARAMETERS
+USE MODD_PARAM_ICE_n, ONLY: PARAM_ICEN_INIT, PARAM_ICEN, CSUBG_AUCV_RC, CSUBG_AUCV_RI, LRED, LSNOW_T
+USE MODD_PARAM_LIMA, ONLY: FINI_CCN=>HINI_CCN,PARAM_LIMA_INIT,NMOD_CCN,LSCAV, &
+ CPRISTINE_ICE_LIMA, CHEVRIMED_ICE_LIMA, NMOD_IFN, NMOD_IMM, &
+ LACTI, LNUCL, XALPHAC, XNUC, LMEYERS, &
+ LPTSPLIT, LSPRO, LADJ, LKHKO, &
+ NMOM_C, NMOM_R, NMOM_I, NMOM_S, NMOM_G, NMOM_H
+USE MODD_PARAM_MFSHALL_n, ONLY: PARAM_MFSHALLN_INIT
USE MODD_PASPOL
USE MODD_SALT
+USE MODD_TURB_n, ONLY: TURBN_INIT, CTOM, CTURBDIM, LRMC01, LHARAT, &
+ LCLOUDMODIFLM, CTURBLEN_CLOUD, XCEI_MIN, XCEI_MAX
USE MODD_VAR_ll, ONLY: NPROC
USE MODD_VISCOSITY
@@ -363,8 +373,8 @@ USE MODN_CONDSAMP
USE MODN_CONF
USE MODN_CONF_n
USE MODN_CONFZ
-USE MODN_DRAGBLDG_n
USE MODN_COUPLING_LEVELS_n
+USE MODN_DRAGBLDG_n
USE MODN_DRAG_n
USE MODN_DRAGTREE_n
USE MODN_DUST
@@ -394,14 +404,7 @@ USE MODN_PARAM_C1R3, ONLY : NAM_PARAM_C1R3, CPRISTINE_ICE_C1R3, &
USE MODN_PARAM_C2R2, ONLY : EPARAM_CCN=>HPARAM_CCN, EINI_CCN=>HINI_CCN, &
WNUC=>XNUC, WALPHAC=>XALPHAC, NAM_PARAM_C2R2
USE MODN_PARAM_ECRAD_n
-USE MODD_PARAM_ICE_n, ONLY : PARAM_ICEN_INIT, PARAM_ICEN, CSUBG_AUCV_RC, CSUBG_AUCV_RI
USE MODN_PARAM_KAFR_n
-USE MODD_PARAM_LIMA, ONLY : FINI_CCN=>HINI_CCN,PARAM_LIMA_INIT,NMOD_CCN,LSCAV, &
- CPRISTINE_ICE_LIMA, CHEVRIMED_ICE_LIMA, NMOD_IFN, NMOD_IMM, &
- LACTI, LNUCL, XALPHAC, XNUC, LMEYERS, &
- LPTSPLIT, LSPRO, LADJ, LKHKO, &
- NMOM_C, NMOM_R, NMOM_I, NMOM_S, NMOM_G, NMOM_H
-USE MODD_PARAM_MFSHALL_n, ONLY: PARAM_MFSHALLN_INIT
USE MODN_PARAM_n ! realized in subroutine ini_model n
USE MODN_PARAM_RAD_n
USE MODN_PASPOL
@@ -411,9 +414,6 @@ USE MODN_SALT
USE MODN_SERIES
USE MODN_SERIES_n
USE MODN_STATION_n, LDIAG_SURFRAD_STAT => LDIAG_SURFRAD
-USE MODD_TURB_n, ONLY: TURBN_INIT, CTOM, CTURBDIM, LRMC01, LHARAT, &
- LCLOUDMODIFLM, CTURBLEN_CLOUD, XCEI_MIN, XCEI_MAX
-USE MODD_NEB_n, ONLY: NEBN_INIT, LSIGMAS, LSUBG_COND, CCONDENS, LSTATNW
USE MODN_VISCOSITY
!
IMPLICIT NONE
diff --git a/src/mesonh/ext/read_field.f90 b/src/mesonh/ext/read_field.f90
index d86c67557c62c692ede13db25b29122ca62055f1..8774371974618e33c0592ce46af6d4334355973b 100644
--- a/src/mesonh/ext/read_field.f90
+++ b/src/mesonh/ext/read_field.f90
@@ -283,7 +283,6 @@ USE MODD_BLOWSNOW_n, ONLY: XSNWCANO
USE MODD_CONF, ONLY: CCONF, CPROGRAM, L1D, LFORCING, NVERB
USE MODD_CONF_n, ONLY: IDX_RVT, IDX_RCT, IDX_RRT, IDX_RIT, IDX_RST, IDX_RGT, IDX_RHT
USE MODD_CST, ONLY: XALPW, XBETAW, XCPD, XGAMW, XMD, XMV, XP00, XRD
-USE MODD_TURB_n, ONLY: XTKEMIN
USE MODD_DYN_n, ONLY: LOCEAN
use modd_field, only: tfieldmetadata, tfieldlist, NMNHDIM_NI, NMNHDIM_NJ, NMNHDIM_NOTLISTED, &
TYPEDATE, TYPEREAL, TYPELOG, TYPEINT
@@ -305,6 +304,7 @@ USE MODD_PARAM_n, ONLY: CSCONV
USE MODD_RECYCL_PARAM_n, ONLY: LRECYCLE, LRECYCLN, LRECYCLS, LRECYCLW, NR_COUNT
USE MODD_REF, ONLY: LCOUPLES
USE MODD_TIME, ONLY: DATE_TIME
+USE MODD_TURB_n, ONLY: XTKEMIN
!
use mode_field, only: Find_field_id_from_mnhname
USE MODE_IO_FIELD_READ, only: IO_Field_read
diff --git a/src/mesonh/ext/read_precip_field.f90 b/src/mesonh/ext/read_precip_field.f90
index 1267beea757dd57efdedb88d79264cefd58a738c..3fb16bdf4fe01c6156fcbc158006b1adbe531b65 100644
--- a/src/mesonh/ext/read_precip_field.f90
+++ b/src/mesonh/ext/read_precip_field.f90
@@ -100,7 +100,7 @@ END MODULE MODI_READ_PRECIP_FIELD
use modd_field, only: tfieldmetadata, tfieldlist
USE MODD_IO, ONLY: TFILEDATA
-USE MODD_PARAM_ICE_n, ONLY: LDEPOSC
+USE MODD_PARAM_ICE_n, ONLY: LDEPOSC
USE MODD_PARAM_C2R2, ONLY: LDEPOC
USE MODD_PARAM_LIMA, ONLY: MDEPOC=>LDEPOC
!
diff --git a/src/mesonh/ext/resolved_cloud.f90 b/src/mesonh/ext/resolved_cloud.f90
index 81fb540ce83063485912b334bc6e6b35cff23efb..78b056cf359b9870f8233cc348d1ea6cae86e4d8 100644
--- a/src/mesonh/ext/resolved_cloud.f90
+++ b/src/mesonh/ext/resolved_cloud.f90
@@ -292,40 +292,43 @@ END MODULE MODI_RESOLVED_CLOUD
!
!* 0. DECLARATIONS
! ------------
-USE MODD_BUDGET, ONLY: TBUDGETS, TBUCONF
-USE MODD_CH_AEROSOL, ONLY: LORILAM
-USE MODD_DUST, ONLY: LDUST
-USE MODD_CST, ONLY: CST
-USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t
-USE MODD_DUST , ONLY: LDUST
-USE MODD_ELEC_n, ONLY: XEFIELDU, XEFIELDV, XEFIELDW
-USE MODD_ELEC_DESCR, ONLY: ELEC_DESCR, LSEDIM_BEARD, LIAGGS_LATHAM
-USE MODD_ELEC_PARAM, ONLY: ELEC_PARAM
-USE MODD_IO, ONLY: TFILEDATA
-USE MODD_NEB_n, ONLY: NEBN, CCONDENS, CLAMBDA3
-USE MODD_NSV, ONLY: NSV, NSV_C1R3END, NSV_C2R2BEG, NSV_C2R2END, &
- NSV_LIMA_BEG, NSV_LIMA_END, NSV_LIMA_CCN_FREE, NSV_LIMA_IFN_FREE, &
- NSV_LIMA_NC, NSV_LIMA_NI, NSV_LIMA_NR, &
- NSV_AEREND, NSV_DSTEND, NSV_SLTEND, &
- NSV_ELECBEG, NSV_ELECEND
-USE MODD_PARAM_C2R2, ONLY: LSUPSAT
-USE MODD_PARAMETERS, ONLY: JPHEXT, JPVEXT
-USE MODD_PARAM_ICE_n, ONLY: CSEDIM, LADJ_BEFORE, LADJ_AFTER, LRED, PARAM_ICEN
-USE MODD_PARAM_LIMA, ONLY: LADJ, LPTSPLIT, LSPRO, NMOD_CCN, NMOD_IFN, NMOD_IMM, NMOM_I
+USE MODD_BUDGET, ONLY: TBUDGETS, TBUCONF
+USE MODD_CH_AEROSOL, ONLY: LORILAM
+USE MODD_DUST, ONLY: LDUST
+USE MODD_CST, ONLY: CST
+USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t
+USE MODD_DUST, ONLY: LDUST
+USE MODD_ELEC_DESCR, ONLY: ELEC_DESCR, LSEDIM_BEARD, LIAGGS_LATHAM
+USE MODD_ELEC_n, ONLY: XEFIELDU, XEFIELDV, XEFIELDW
+USE MODD_ELEC_PARAM, ONLY: ELEC_PARAM
+USE MODD_IO, ONLY: TFILEDATA
+USE MODD_NEB_n, ONLY: NEBN, CCONDENS, CLAMBDA3
+USE MODD_NSV, ONLY: NSV, NSV_C1R3END, NSV_C2R2BEG, NSV_C2R2END, &
+ NSV_LIMA_BEG, NSV_LIMA_END, NSV_LIMA_CCN_FREE, NSV_LIMA_IFN_FREE, &
+ NSV_LIMA_NC, NSV_LIMA_NI, NSV_LIMA_NR, &
+ NSV_AEREND, NSV_DSTEND, NSV_SLTEND, &
+ NSV_ELECBEG, NSV_ELECEND
+USE MODD_PARAM_C2R2, ONLY: LSUPSAT
+USE MODD_PARAMETERS, ONLY: JPHEXT, JPVEXT
+USE MODD_PARAM_ICE_n, ONLY: CSEDIM, LADJ_BEFORE, LADJ_AFTER, LRED, PARAM_ICEN
+USE MODD_PARAM_LIMA, ONLY: LADJ, LPTSPLIT, LSPRO, NMOD_CCN, NMOD_IFN, NMOD_IMM, NMOM_I
USE MODD_RAIN_ICE_DESCR_n, ONLY: XRTMIN, RAIN_ICE_DESCRN
USE MODD_RAIN_ICE_PARAM_n, ONLY: RAIN_ICE_PARAMN
-USE MODD_SALT, ONLY: LSALT
-USE MODD_TURB_n, ONLY: TURBN
+USE MODD_SALT, ONLY: LSALT
+USE MODD_TURB_n, ONLY: TURBN
!
USE MODE_ll
USE MODE_FILL_DIMPHYEX, ONLY: FILL_DIMPHYEX
use mode_sources_neg_correct, only: Sources_neg_correct
!
+USE MODI_AER2LIMA
USE MODI_C2R2_ADJUST
+USE MODI_ELEC_ADJUST
USE MODI_FAST_TERMS
USE MODI_GET_HALO
USE MODI_ICE_ADJUST
USE MODI_ICE_ADJUST_ELEC
+USE MODI_ION_SOURCE_ELEC
USE MODI_KHKO_NOTADJUST
USE MODI_LIMA
USE MODI_LIMA_ADJUST
@@ -336,13 +339,10 @@ USE MODI_LIMA_NOTADJUST
USE MODI_LIMA_WARM
USE MODI_RAIN_C2R2_KHKO
USE MODI_RAIN_ICE
-USE MODI_RAIN_ICE_OLD
USE MODI_RAIN_ICE_ELEC
+USE MODI_RAIN_ICE_OLD
USE MODI_SHUMAN
USE MODI_SLOW_TERMS
-USE MODI_AER2LIMA
-USE MODI_ION_SOURCE_ELEC
-USE MODI_ELEC_ADJUST
!
IMPLICIT NONE
!
diff --git a/src/mesonh/ext/set_conc_ice_c1r3.f90 b/src/mesonh/ext/set_conc_ice_c1r3.f90
index 0dfe34119bcd614b71adf0c7c6e3e9d8a8e006b4..c2f74743969e573f2ff3fead077f94503bd12897 100644
--- a/src/mesonh/ext/set_conc_ice_c1r3.f90
+++ b/src/mesonh/ext/set_conc_ice_c1r3.f90
@@ -75,11 +75,11 @@ END MODULE MODI_SET_CONC_ICE_C1R3
!* 0. DECLARATIONS
! ------------
!
-USE MODD_CST, ONLY : XRHOLI
-USE MODD_CONF, ONLY : NVERB
-USE MODD_ICE_C1R3_DESCR, ONLY : XRTMIN, XCTMIN
-USE MODD_ICE_C1R3_PARAM, ONLY : XCONCI_MAX, XNUC_CON, XEXTT_CON, XEX_CON
-USE MODD_LUNIT_n, ONLY : TLUOUT
+USE MODD_CST, ONLY : XRHOLI
+USE MODD_CONF, ONLY : NVERB
+USE MODD_ICE_C1R3_DESCR, ONLY : XRTMIN, XCTMIN
+USE MODD_ICE_C1R3_PARAM, ONLY : XCONCI_MAX, XNUC_CON, XEXTT_CON, XEX_CON
+USE MODD_LUNIT_n, ONLY : TLUOUT
USE MODD_RAIN_ICE_DESCR_n, ONLY : XAI, XBI
!
IMPLICIT NONE
diff --git a/src/mesonh/ext/set_rsou.f90 b/src/mesonh/ext/set_rsou.f90
index 6c2ea6b2f9203cc2eca4d01697a0975155c40f95..4526251833db633bf65d0808d8f86cf6ad973943 100644
--- a/src/mesonh/ext/set_rsou.f90
+++ b/src/mesonh/ext/set_rsou.f90
@@ -261,7 +261,7 @@ END MODULE MODI_SET_RSOU
USE MODD_CONF
USE MODD_CONF_n
USE MODD_CST
-USE MODD_NEB_n, ONLY: NEBN
+USE MODD_NEB_n, ONLY: NEBN
USE MODD_DYN_n, ONLY: LOCEAN
USE MODD_FIELD_n
USE MODD_GRID
diff --git a/src/mesonh/ext/spawn_model2.f90 b/src/mesonh/ext/spawn_model2.f90
index 3511cd27f32930b19e51dac080c7feeb5469d991..c9c9c5774cfc9584037f3a450e06934da32d5ceb 100644
--- a/src/mesonh/ext/spawn_model2.f90
+++ b/src/mesonh/ext/spawn_model2.f90
@@ -290,9 +290,9 @@ USE MODI_GET_SIZEX_LB
USE MODI_GET_SIZEY_LB
!
USE MODD_LIMA_PRECIP_SCAVENGING_n
-USE MODD_PARAM_LIMA, ONLY : MDEPOC=>LDEPOC, LSCAV
-USE MODD_PARAM_ICE_n, ONLY : LDEPOSC
-USE MODD_PARAM_C2R2, ONLY : LDEPOC
+USE MODD_PARAM_LIMA, ONLY : MDEPOC=>LDEPOC, LSCAV
+USE MODD_PARAM_ICE_n, ONLY : LDEPOSC
+USE MODD_PARAM_C2R2, ONLY : LDEPOC
USE MODD_PASPOL, ONLY : LPASPOL
!
USE MODD_MPIF
diff --git a/src/mesonh/ext/two_wayn.f90 b/src/mesonh/ext/two_wayn.f90
index b2299ee4ac537dace171013da289b8b8f0fc0b5b..7cd52cb869c5a0674e567649824cd16c7801c17c 100644
--- a/src/mesonh/ext/two_wayn.f90
+++ b/src/mesonh/ext/two_wayn.f90
@@ -123,7 +123,7 @@ USE MODD_PARAMETERS ! Declarative modules
USE MODD_NESTING
USE MODD_CONF
USE MODD_NSV
-USE MODD_PARAM_ICE_n, ONLY : LSEDIC
+USE MODD_PARAM_ICE_n, ONLY : LSEDIC
USE MODD_PARAM_C2R2, ONLY : LSEDC
USE MODD_PARAM_LIMA, ONLY : NSEDC => LSEDC
!
diff --git a/src/mesonh/ext/write_desfmn.f90 b/src/mesonh/ext/write_desfmn.f90
index 908c2eff83a767d24cddf6d5c7b1aebdb7f589ea..50210c832df24a366f4c738aeebce932e7c8f49d 100644
--- a/src/mesonh/ext/write_desfmn.f90
+++ b/src/mesonh/ext/write_desfmn.f90
@@ -162,9 +162,14 @@ USE MODD_FOREFIRE, ONLY: LFOREFIRE
USE MODD_IBM_LSF, ONLY: LIBM_LSF
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LUNIT_n, ONLY: TLUOUT
+USE MODD_NEB_n, ONLY: NEBN_INIT
USE MODD_PARAMETERS
+USE MODD_PARAM_ICE_n, ONLY: PARAM_ICEN_INIT
+USE MODD_PARAM_LIMA, ONLY: PARAM_LIMA_INIT
+USE MODD_PARAM_MFSHALL_n, ONLY: PARAM_MFSHALLN_INIT
USE MODD_PROFILER_n, ONLY: LPROFILER
USE MODD_STATION_n, ONLY: LSTATION
+USE MODD_TURB_n, ONLY: TURBN_INIT
!
USE MODE_MSG
!
@@ -179,19 +184,14 @@ USE MODN_BUDGET
USE MODN_LES
USE MODN_DYN_n
USE MODN_ADV_n
-USE MODN_PARAM_n
-USE MODN_PARAM_RAD_n
USE MODN_PARAM_ECRAD_n
USE MODN_PARAM_KAFR_n
-USE MODD_PARAM_MFSHALL_n, ONLY: PARAM_MFSHALLN_INIT
-USE MODD_PARAM_ICE_n, ONLY: PARAM_ICEN_INIT
-USE MODD_PARAM_LIMA, ONLY: PARAM_LIMA_INIT
+USE MODN_PARAM_n
+USE MODN_PARAM_RAD_n
USE MODN_CONF_n
USE MODN_LUNIT_n
USE MODN_LBC_n
USE MODN_NUDGING_n
-USE MODD_TURB_n, ONLY: TURBN_INIT
-USE MODD_NEB_n, ONLY: NEBN_INIT
USE MODN_BLANK_n
USE MODN_FRC
USE MODN_CH_MNHC_n
diff --git a/src/mesonh/ext/write_lesn.f90 b/src/mesonh/ext/write_lesn.f90
index 44f915343d63daec3f7f285412ab3fdb75b6fd2d..c35e3eafa6d7cd382b62dc002e08b1bafbf87a6e 100644
--- a/src/mesonh/ext/write_lesn.f90
+++ b/src/mesonh/ext/write_lesn.f90
@@ -1150,14 +1150,12 @@ if ( nspectra_k > 0 ) then
call Les_diachro_2pt_write( tpdiafile, XCORRi_WRi, XCORRj_WRi, 'WRI', 'W*ri 2 points correlations', 'm kg s-1 kg-1' )
end if
-!PW: TODO: ameliorer le ygroup (tenir compte de ce qu'est la variable scalaire et pas juste son jsv!)
do jsv = 1, nsv
Write( ygroup, fmt = "( a2, i3.3 )" ) "SS", jsv
call Les_diachro_2pt_write( tpdiafile, XCORRi_SvSv(:,:,:,JSV), XCORRj_SvSv(:,:,:,JSV), ygroup, &
'Sv*Sv 2 points correlations','kg2 kg-2' )
end do
-!PW: TODO: ameliorer le ygroup (tenir compte de ce qu'est la variable scalaire et pas juste son jsv!)
do jsv = 1, nsv
Write( ygroup, fmt = "( a2, i3.3 )" ) "WS", jsv
call Les_diachro_2pt_write( tpdiafile, XCORRi_WSv(:,:,:,JSV), XCORRj_WSv(:,:,:,JSV), ygroup, &
diff --git a/src/mesonh/ext/write_lfifm1_for_diag_supp.f90 b/src/mesonh/ext/write_lfifm1_for_diag_supp.f90
index 380dc9fd629a10d16c344098535ea0a109226bd3..974e78231d39c46ec70973c62476ca5fb54998d5 100644
--- a/src/mesonh/ext/write_lfifm1_for_diag_supp.f90
+++ b/src/mesonh/ext/write_lfifm1_for_diag_supp.f90
@@ -122,7 +122,7 @@ USE MODD_DIAG_FLAG, ONLY: CRAD_SAT, LCHEMDIAG, LCLD_COV, LCOARSE, LISOAL
USE MODD_FIELD_n, ONLY: XCLDFR, XICEFR, XPABST, XSIGS, XTHT, XTKET, XRT, XUT, XVT, XWT
USE MODD_GRID_n, ONLY: XZHAT, XZZ
USE MODD_METRICS_n, ONLY: XDXX, XDYY, XDZX, XDZY, XDZZ
-USE MODD_NEB_n, ONLY: LSIGMAS, LSUBG_COND, VSIGQSAT
+USE MODD_NEB_n, ONLY: LSIGMAS, LSUBG_COND, VSIGQSAT
USE MODD_NSV, ONLY: NSV, NSV_CHEMBEG, NSV_CHEMEND, TSVLIST
USE MODD_PARAMETERS, ONLY: JPVEXT, NUNDEF, XUNDEF
USE MODD_PARAM_KAFR_n, ONLY: LCHTRANS
@@ -135,7 +135,6 @@ USE MODD_RAD_TRANSF, ONLY: JPGEOST
USE MODD_REF_n, ONLY: XRHODREF
USE MODD_SALT, ONLY: LSALT
USE MODD_TIME_n, ONLY: TDTCUR
-USE MODD_NEB_n, ONLY: LSIGMAS, LSUBG_COND, VSIGQSAT
use mode_field, only: Find_field_id_from_mnhname
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
diff --git a/src/mesonh/ext/xy_to_latlon.f90 b/src/mesonh/ext/xy_to_latlon.f90
index 9effbed461cfe363dbffd7da68038ce37bd3763e..d544a960751ac2ebbafdc763ddaeee0b2adfe1f0 100644
--- a/src/mesonh/ext/xy_to_latlon.f90
+++ b/src/mesonh/ext/xy_to_latlon.f90
@@ -73,6 +73,7 @@ USE MODD_LUNIT
!
USE MODE_FIELD, ONLY: INI_FIELD_LIST
USE MODE_GRIDPROJ
+USE MODE_INI_CST, ONLY: INI_CST
USE MODE_INIT_ll, only: SET_DIM_ll, SET_JP_ll
USE MODE_IO, only: IO_Config_set, IO_Init
use MODE_IO_FIELD_READ, only: IO_Field_read
@@ -81,7 +82,6 @@ USE MODE_IO_MANAGE_STRUCT, only: IO_File_add2list
USE MODE_MODELN_HANDLER, ONLY: GOTO_MODEL
use MODE_SPLITTINGZ_ll
!
-USE MODE_INI_CST, ONLY: INI_CST
USE MODI_READ_HGRID
!
USE MODN_CONFIO, ONLY: NAM_CONFIO
diff --git a/src/mesonh/ext/zoom_pgd.f90 b/src/mesonh/ext/zoom_pgd.f90
index 2b50885c8b679b3940c28ef06825170ef5a02326..efd60bdd8b7ff10aab35bd512983979ae82eb07b 100644
--- a/src/mesonh/ext/zoom_pgd.f90
+++ b/src/mesonh/ext/zoom_pgd.f90
@@ -59,6 +59,7 @@ use modd_precision, only: LFIINT
!
USE MODE_FINALIZE_MNH, only: FINALIZE_MNH
USE MODE_POS
+USE MODE_INI_CST, ONLY: INI_CST
USE MODE_IO, only: IO_Config_set, IO_Init
USE MODE_IO_FIELD_READ, only: IO_Field_read
USE MODE_IO_FIELD_WRITE, only: IO_Field_write, IO_Header_write
@@ -82,7 +83,6 @@ USE MODI_WRITE_PGD_SURF_ATM_N
USE MODD_MNH_SURFEX_n
!
USE MODN_CONFIO, ONLY : NAM_CONFIO
-USE MODE_INI_CST, ONLY: INI_CST
!
IMPLICIT NONE
!