From cf066b29bf0cc9d14256453a017b5465c1396f42 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Fri, 3 Nov 2023 11:46:02 +0100
Subject: [PATCH] Philippe 03/11/2023: minor cosmetic changes
---
src/LIB/SURCOUCHE/src/mode_io_read_lfi.f90 | 2 +-
src/MNH/advection_metsv.f90 | 2 +-
src/MNH/aer_wet_dep_kmt_warm.f90 | 18 +++----
src/MNH/ch_aqueous_sedim1mom.f90 | 14 +++---
src/MNH/ch_meteo_trans_kess.f90 | 10 ++--
src/MNH/default_desfmn.f90 | 2 +-
src/MNH/drag_bld.f90 | 10 ++--
src/MNH/endstep.f90 | 2 +-
src/MNH/flash_geom_elec.f90 | 40 ++++++++--------
src/MNH/goto_model_wrapper.f90 | 14 +++---
src/MNH/ground_paramn.f90 | 14 +++---
src/MNH/ice_adjust_bis.f90 | 4 +-
src/MNH/ini_budget.f90 | 4 +-
src/MNH/ini_elecn.f90 | 2 +-
src/MNH/ini_lb.f90 | 2 +-
src/MNH/ini_modeln.f90 | 10 ++--
src/MNH/ini_nsv.f90 | 2 +-
src/MNH/ini_radar.f90 | 8 ++--
src/MNH/ini_segn.f90 | 1 -
src/MNH/ini_tke_eps.f90 | 2 +-
src/MNH/init_mnh.f90 | 6 +--
src/MNH/latlon_to_xy.f90 | 2 +-
src/MNH/lesn.f90 | 10 ++--
src/MNH/mnh2lpdm.f90 | 2 +-
src/MNH/mnh2lpdm_ini.f90 | 2 +-
src/MNH/mnhget_surf_paramn.f90 | 6 +--
src/MNH/modd_budget.f90 | 1 -
src/MNH/modd_elec_param.f90 | 7 +--
src/MNH/mode_sensor.f90 | 4 +-
src/MNH/modeln.f90 | 8 ++--
src/MNH/phys_paramn.f90 | 12 ++---
src/MNH/prep_nest_pgd.f90 | 2 +-
src/MNH/prep_pgd.f90 | 2 +-
src/MNH/prep_real_case.f90 | 4 +-
src/MNH/prep_surfex.f90 | 2 +-
src/MNH/read_desfmn.f90 | 14 +++---
src/MNH/read_exsegn.f90 | 30 ++++++------
src/MNH/read_field.f90 | 2 +-
src/MNH/read_precip_field.f90 | 2 +-
src/MNH/read_surf_mnh.f90 | 1 -
src/MNH/resolved_cloud.f90 | 56 +++++++++++-----------
src/MNH/set_conc_ice_c1r3.f90 | 10 ++--
src/MNH/set_rsou.f90 | 2 +-
src/MNH/sources_neg_correct.f90 | 8 ++--
src/MNH/spawn_model2.f90 | 6 +--
src/MNH/two_wayn.f90 | 2 +-
src/MNH/write_desfmn.f90 | 14 +++---
src/MNH/write_lesn.f90 | 2 -
src/MNH/write_lfifm1_for_diag_supp.f90 | 3 +-
src/MNH/write_lfin.f90 | 6 +--
src/MNH/write_surf_mnh.f90 | 2 +-
src/MNH/xy_to_latlon.f90 | 2 +-
src/MNH/zoom_pgd.f90 | 2 +-
53 files changed, 193 insertions(+), 204 deletions(-)
diff --git a/src/LIB/SURCOUCHE/src/mode_io_read_lfi.f90 b/src/LIB/SURCOUCHE/src/mode_io_read_lfi.f90
index a87f92ae5..7d943fbea 100644
--- a/src/LIB/SURCOUCHE/src/mode_io_read_lfi.f90
+++ b/src/LIB/SURCOUCHE/src/mode_io_read_lfi.f90
@@ -664,7 +664,7 @@ CHARACTER(LEN=12) :: YRECLENGTH_FILE, YRECLENGTH_MEM
CHARACTER(LEN=12) :: YVAL_FILE, YVAL_MEM
CHARACTER(LEN=JPXKRK) :: YCOMMENT
CHARACTER(LEN=12) :: YRESP
-CHARACTER(LEN=MNH_LEN_HREC) :: YRECFM
+CHARACTER(LEN=MNH_LEN_HREC) :: YRECFM
LOGICAL :: GOLDMNH !if old version of MesoNH (<5.4, old files without complete and correct metadata)
!
OGOOD = .TRUE.
diff --git a/src/MNH/advection_metsv.f90 b/src/MNH/advection_metsv.f90
index 9b5ae5140..f6d9d08e7 100644
--- a/src/MNH/advection_metsv.f90
+++ b/src/MNH/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/MNH/aer_wet_dep_kmt_warm.f90 b/src/MNH/aer_wet_dep_kmt_warm.f90
index 441484721..b7af97656 100644
--- a/src/MNH/aer_wet_dep_kmt_warm.f90
+++ b/src/MNH/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/MNH/ch_aqueous_sedim1mom.f90 b/src/MNH/ch_aqueous_sedim1mom.f90
index ba0b6ffd5..2ec98324e 100644
--- a/src/MNH/ch_aqueous_sedim1mom.f90
+++ b/src/MNH/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/MNH/ch_meteo_trans_kess.f90 b/src/MNH/ch_meteo_trans_kess.f90
index debd6ae61..36d216d7d 100644
--- a/src/MNH/ch_meteo_trans_kess.f90
+++ b/src/MNH/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/MNH/default_desfmn.f90 b/src/MNH/default_desfmn.f90
index 6d9fcd891..47d3c118d 100644
--- a/src/MNH/default_desfmn.f90
+++ b/src/MNH/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/MNH/drag_bld.f90 b/src/MNH/drag_bld.f90
index cb94923b9..edec3affd 100644
--- a/src/MNH/drag_bld.f90
+++ b/src/MNH/drag_bld.f90
@@ -67,8 +67,8 @@ SUBROUTINE DRAG_BLD(PTSTEP, PUT, PVT, PTKET, PPABST, PTHT, PRT, &
!! MODIFICATIONS
!! -------------
!! Original 09/2019
- ! P. Wautelet 04/03/2021: budgets: add DRAGB source term
- ! R. Schoetter 12/2021 multi-level coupling between MesoNH and SURFEX
+ ! P. Wautelet 04/03/2021: budgets: add DRAGB source term
+ ! R. Schoetter 12/2021: multi-level coupling between MesoNH and SURFEX
!!---------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -85,9 +85,9 @@ SUBROUTINE DRAG_BLD(PTSTEP, PUT, PVT, PTKET, PPABST, PTHT, PRT, &
USE MODD_GROUND_PAR
USE MODD_NSV
USE MODD_PGDFIELDS
-
+
use mode_budget, only: Budget_store_init, Budget_store_end
- !
+
USE MODI_MNHGET_SURF_PARAM_n
USE MODI_SHUMAN
!
@@ -154,7 +154,7 @@ SUBROUTINE DRAG_BLD(PTSTEP, PUT, PVT, PTKET, PPABST, PTHT, PRT, &
REAL :: ZSUM_LAD_CAN, ZSUM_BLD_DENSITY, ZLEV_K0, ZLEV_K1
REAL :: ZSUM_SFTH_WALL, ZSUM_SFTH_ROOF, ZSUM_SFRV_WALL, ZSUM_SFRV_ROOF
!
- !* 0.3 Initialisation de kelkes variables
+ !* 0.3 Initialization
!
if ( lbudget_u ) call Budget_store_init( tbudgets(NBUDGET_U ), 'DRAGB', prus (:, :, :) )
if ( lbudget_v ) call Budget_store_init( tbudgets(NBUDGET_V ), 'DRAGB', prvs (:, :, :) )
diff --git a/src/MNH/endstep.f90 b/src/MNH/endstep.f90
index cbb2080b5..2ef63e817 100644
--- a/src/MNH/endstep.f90
+++ b/src/MNH/endstep.f90
@@ -208,7 +208,6 @@ use modd_budget, only: lbudget_u, lbudget_v, lbudget_w, lbudget_th, lbudg
nbustep, tbudgets
USE MODD_CH_AEROSOL, ONLY: LORILAM
USE MODD_CONF
-USE MODD_TURB_n, ONLY: XTKEMIN
USE MODD_DUST, ONLY: LDUST
USE MODD_SALT, ONLY: LSALT
USE MODD_DYN
@@ -222,6 +221,7 @@ USE MODD_NSV, ONLY: XSVMIN, NSV_CHEMBEG, NSV_CHEMEND, &
NSV_ELECBEG, NSV_ELECEND
USE MODD_PARAM_C2R2, ONLY: LACTIT
USE MODD_PARAM_LIMA, ONLY: LACTIT_LIMA=>LACTIT
+USE MODD_TURB_n, ONLY: XTKEMIN
use mode_budget, only: Budget_store_end, Budget_store_init
diff --git a/src/MNH/flash_geom_elec.f90 b/src/MNH/flash_geom_elec.f90
index 8c2c0a149..0155cc832 100644
--- a/src/MNH/flash_geom_elec.f90
+++ b/src/MNH/flash_geom_elec.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2010-2020 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2010-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.
@@ -116,36 +116,36 @@ END MODULE MODI_FLASH_GEOM_ELEC_n
!* 0. DECLARATIONS
! ------------
!
-USE MODD_ARGSLIST_ll, ONLY: LIST_ll
-USE MODD_CONF, ONLY: CEXP, LCARTESIAN
-USE MODD_CST, ONLY: XAVOGADRO, XMD
-USE MODD_DYN_n, ONLY: XDXHATM, XDYHATM, NSTOP
+USE MODD_ARGSLIST_ll, ONLY: LIST_ll
+USE MODD_CONF, ONLY: CEXP, LCARTESIAN
+USE MODD_CST, ONLY: XAVOGADRO, XMD
+USE MODD_DYN_n, ONLY: XDXHATM, XDYHATM, NSTOP
USE MODD_ELEC_DESCR
USE MODD_ELEC_FLASH
-USE MODD_ELEC_PARAM, ONLY: XFQLIGHTR, XEXQLIGHTR, &
- XFQLIGHTI, XEXQLIGHTI, &
- XFQLIGHTS, XEXQLIGHTS, &
- XFQLIGHTG, XEXQLIGHTG, &
- XFQLIGHTH, XEXQLIGHTH, &
- XFQLIGHTC
-USE MODD_GRID, ONLY: XLATORI,XLONORI
-USE MODD_GRID_n, ONLY: XXHATM, XYHATM, XZHAT
-USE MODD_IO, ONLY: TFILEDATA
+USE MODD_ELEC_PARAM, ONLY: XFQLIGHTR, XEXQLIGHTR, &
+ XFQLIGHTI, XEXQLIGHTI, &
+ XFQLIGHTS, XEXQLIGHTS, &
+ XFQLIGHTG, XEXQLIGHTG, &
+ XFQLIGHTH, XEXQLIGHTH, &
+ XFQLIGHTC
+USE MODD_GRID, ONLY: XLATORI,XLONORI
+USE MODD_GRID_n, ONLY: XXHATM, XYHATM, XZHAT
+USE MODD_IO, ONLY: TFILEDATA
USE MODD_LMA_SIMULATOR
-USE MODD_METRICS_n, ONLY: XDXX, XDYY, XDZZ ! in linox_production
-USE MODD_NSV, ONLY: NSV_ELECBEG, NSV_ELECEND, NSV_ELEC
-USE MODD_PARAM_LIMA, ONLY: XRTMIN_L=>XRTMIN
+USE MODD_METRICS_n, ONLY: XDXX, XDYY, XDZZ ! in linox_production
+USE MODD_NSV, ONLY: NSV_ELECBEG, NSV_ELECEND, NSV_ELEC
+USE MODD_PARAM_LIMA, ONLY: XRTMIN_L=>XRTMIN
USE MODD_PARAM_LIMA_COLD, ONLY: XLBS_L=>XLBS, XLBEXS_L=>XLBEXS
USE MODD_PARAM_LIMA_MIXED, ONLY: XLBG_L=>XLBG, XLBEXG_L=>XLBEXG, XLBH_L=>XLBH, XLBEXH_L=>XLBEXH
USE MODD_PARAM_LIMA_WARM, ONLY: XLBC, XLBEXC, XLBR_L=>XLBR, XLBEXR_L=>XLBEXR
USE MODD_PARAMETERS, ONLY: JPHEXT, JPVEXT
use MODD_PRECISION, ONLY: MNHINT_MPI, MNHLOG_MPI, MNHREAL_MPI
USE MODD_RAIN_ICE_DESCR_n, ONLY: XLBR_I=>XLBR, XLBEXR_I=>XLBEXR, XLBS_I=>XLBS, XLBEXS_I=>XLBEXS, &
- XLBG_I=>XLBG, XLBEXG_I=>XLBEXG, XLBH_I=>XLBH, XLBEXH_I=>XLBEXH, &
- XRTMIN_I=>XRTMIN
+ XLBG_I=>XLBG, XLBEXG_I=>XLBEXG, XLBH_I=>XLBH, XLBEXH_I=>XLBEXH, &
+ XRTMIN_I=>XRTMIN
USE MODD_SUB_ELEC_n
USE MODD_TIME_n
-USE MODD_VAR_ll, ONLY: NPROC,NMNH_COMM_WORLD
+USE MODD_VAR_ll, ONLY: NPROC,NMNH_COMM_WORLD
!
USE MODE_ELEC_ll
USE MODE_GRIDPROJ
diff --git a/src/MNH/goto_model_wrapper.f90 b/src/MNH/goto_model_wrapper.f90
index e869230e2..84e5c72c6 100644
--- a/src/MNH/goto_model_wrapper.f90
+++ b/src/MNH/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/MNH/ground_paramn.f90 b/src/MNH/ground_paramn.f90
index 7be5296df..e43cd3034 100644
--- a/src/MNH/ground_paramn.f90
+++ b/src/MNH/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
@@ -147,13 +147,13 @@ 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, NVERB
-USE MODD_COUPLING_LEVELS_n
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, &
@@ -801,9 +801,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/MNH/ice_adjust_bis.f90 b/src/MNH/ice_adjust_bis.f90
index e530d5c21..104630429 100644
--- a/src/MNH/ice_adjust_bis.f90
+++ b/src/MNH/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/MNH/ini_budget.f90 b/src/MNH/ini_budget.f90
index 79608c125..a5ed1e2d4 100644
--- a/src/MNH/ini_budget.f90
+++ b/src/MNH/ini_budget.f90
@@ -208,7 +208,7 @@ end subroutine Budget_preallocate
! P. Wautelet 02/03/2021: budgets: add terms for blowing snow
! P. Wautelet 04/03/2021: budgets: add terms for drag due to buildings
! P. Wautelet 17/03/2021: choose source terms for budgets with character strings instead of multiple integer variables
-! R. Schoetter 12/2021 multi-level coupling between MesoNH and SURFEX
+! R. Schoetter 12/2021: multi-level coupling between MesoNH and SURFEX
! C. Barthe 14/03/2022: budgets: add terms for CIBU and RDSF in LIMA
! M. Taufour 01/07/2022: budgets: add concentration for snow, graupel, hail
! C. Barthe 14/03/2023: budgets: add terms for electricity with LIMA
@@ -231,6 +231,7 @@ use modd_dyn_n, only: xtstep, locean
use modd_elec_descr, only: linductive, lrelax2fw_ion
use modd_field, only: TYPEREAL
use modd_fire_n, only: lblaze
+use modd_neb_n, only: lsubg_cond
use modd_nsv, only: nsv_aerbeg, nsv_aerend, nsv_aerdepbeg, nsv_aerdepend, nsv_c2r2beg, nsv_c2r2end, &
nsv_chembeg, nsv_chemend, nsv_chicbeg, nsv_chicend, nsv_csbeg, nsv_csend, &
nsv_dstbeg, nsv_dstend, nsv_dstdepbeg, nsv_dstdepend, nsv_elecbeg, nsv_elecend, &
@@ -257,7 +258,6 @@ use modd_param_lima, only: laero_mass_lima => laero_mass, lacti_lima => lacti,
nmom_c, nmom_r, nmom_i, nmom_s, nmom_g, nmom_h, nmod_ccn, nmod_ifn, nmod_imm
use modd_ref, only: lcouples
use modd_salt, only: lsalt
-use modd_neb_n, only: lsubg_cond
use modd_viscosity, only: lvisc, lvisc_r, lvisc_sv, lvisc_th, lvisc_uvw
USE MODE_ll
diff --git a/src/MNH/ini_elecn.f90 b/src/MNH/ini_elecn.f90
index 25a77068d..339e30c48 100644
--- a/src/MNH/ini_elecn.f90
+++ b/src/MNH/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/MNH/ini_lb.f90 b/src/MNH/ini_lb.f90
index faa09698b..f55708c99 100644
--- a/src/MNH/ini_lb.f90
+++ b/src/MNH/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/MNH/ini_modeln.f90 b/src/MNH/ini_modeln.f90
index c2e9afcee..34a99b7ec 100644
--- a/src/MNH/ini_modeln.f90
+++ b/src/MNH/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/MNH/ini_nsv.f90 b/src/MNH/ini_nsv.f90
index 9c0ad2bd3..df522d18b 100644
--- a/src/MNH/ini_nsv.f90
+++ b/src/MNH/ini_nsv.f90
@@ -126,8 +126,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/MNH/ini_radar.f90 b/src/MNH/ini_radar.f90
index efe222510..671d1f6e9 100644
--- a/src/MNH/ini_radar.f90
+++ b/src/MNH/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/MNH/ini_segn.f90 b/src/MNH/ini_segn.f90
index 9299f713c..9d78f2b66 100644
--- a/src/MNH/ini_segn.f90
+++ b/src/MNH/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/MNH/ini_tke_eps.f90 b/src/MNH/ini_tke_eps.f90
index a07160722..b643f54c3 100644
--- a/src/MNH/ini_tke_eps.f90
+++ b/src/MNH/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/MNH/init_mnh.f90 b/src/MNH/init_mnh.f90
index 4170ca68e..ad6ea75eb 100644
--- a/src/MNH/init_mnh.f90
+++ b/src/MNH/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/MNH/latlon_to_xy.f90 b/src/MNH/latlon_to_xy.f90
index d58793565..6694937f5 100644
--- a/src/MNH/latlon_to_xy.f90
+++ b/src/MNH/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/MNH/lesn.f90 b/src/MNH/lesn.f90
index 6411b6cc5..86b86a3e6 100644
--- a/src/MNH/lesn.f90
+++ b/src/MNH/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/MNH/mnh2lpdm.f90 b/src/MNH/mnh2lpdm.f90
index e5472663f..21d162a5d 100644
--- a/src/MNH/mnh2lpdm.f90
+++ b/src/MNH/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/MNH/mnh2lpdm_ini.f90 b/src/MNH/mnh2lpdm_ini.f90
index a18acfcbe..526bdd08a 100644
--- a/src/MNH/mnh2lpdm_ini.f90
+++ b/src/MNH/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/MNH/mnhget_surf_paramn.f90 b/src/MNH/mnhget_surf_paramn.f90
index 31d8e8820..a44293771 100644
--- a/src/MNH/mnhget_surf_paramn.f90
+++ b/src/MNH/mnhget_surf_paramn.f90
@@ -85,9 +85,9 @@ END MODULE MODI_MNHGET_SURF_PARAM_n
!! S. Donier 06/2015 : bug surface aerosols
!! 06/2016 (G.Delautier) phasage surfex 8
!! 01/2018 (G.Delautier) SURFEX 8.1
-! C. Lac 11/2019: correction in the drag formula and application to building in addition to tree
-! P. Wautelet 11/03/2020: bugfix: add present checks before working on optional arrays
- ! R. Schoetter 12/2021 multi-level coupling between MesoNH and SURFEX
+! C. Lac 11/2019: correction in the drag formula and application to building in addition to tree
+! P. Wautelet 11/03/2020: bugfix: add present checks before working on optional arrays
+! R. Schoetter 12/2021: multi-level coupling between MesoNH and SURFEX
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
diff --git a/src/MNH/modd_budget.f90 b/src/MNH/modd_budget.f90
index 31c97600b..3b413d569 100644
--- a/src/MNH/modd_budget.f90
+++ b/src/MNH/modd_budget.f90
@@ -48,7 +48,6 @@
! P. Wautelet 03/03/2021: add tbudiachrometadata type (useful to pass more information to Write_diachro)
! P. Wautelet 17/03/2021: choose source terms for budgets with character strings instead of multiple integer variables
! P. Wautelet 30/03/2021: budgets: cartesian subdomain limits are defined in the physical domain
- ! R. Schoetter 12/2021 multi-level coupling between MesoNH and SURFEX
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
diff --git a/src/MNH/modd_elec_param.f90 b/src/MNH/modd_elec_param.f90
index c28725b3b..128c292e9 100644
--- a/src/MNH/modd_elec_param.f90
+++ b/src/MNH/modd_elec_param.f90
@@ -1,13 +1,8 @@
-!MNH_LIC Copyright 1994-2014 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2002-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.
!-----------------------------------------------------------------
-!--------------- special set of characters for RCS information
-!-----------------------------------------------------------------
-! $Source$ $Revision$
-! MASDEV4_7 modd 2006/05/18 13:07:25
-!-----------------------------------------------------------------
! #######################
MODULE MODD_ELEC_PARAM
! #######################
diff --git a/src/MNH/mode_sensor.f90 b/src/MNH/mode_sensor.f90
index f744202fd..fed849d4b 100644
--- a/src/MNH/mode_sensor.f90
+++ b/src/MNH/mode_sensor.f90
@@ -66,7 +66,7 @@ CONTAINS
USE MODD_CST, ONLY: XLAM_CRAD, XLIGHTSPEED, XPI, XRHOLW, XTT
USE MODD_NSV, ONLY: NSV_LIMA_NC, NSV_LIMA_NR, NSV_LIMA_NI
USE MODD_PARAMETERS, ONLY: XUNDEF
- USE MODD_PARAM_ICE_n, ONLY: LSNOW_T_I => LSNOW_T
+ USE MODD_PARAM_ICE_n, ONLY: LSNOW_T_I => LSNOW_T
USE MODD_PARAM_LIMA, ONLY: LSNOW_T_L => LSNOW_T, &
XALPHAR_L => XALPHAR, XNUR_L => XNUR, XALPHAS_L => XALPHAS, XNUS_L => XNUS, &
XALPHAG_L => XALPHAG, XNUG_L => XNUG, XALPHAI_L => XALPHAI, XNUI_L => XNUI, &
@@ -78,7 +78,7 @@ CONTAINS
USE MODD_PARAM_LIMA_MIXED, ONLY: XLBEXG_L => XLBEXG, XLBG_L => XLBG, XCCG_L => XCCG, XAG_L => XAG, XBG_L => XBG, XCXG_L => XCXG
USE MODD_PARAM_LIMA_WARM, ONLY: XAC_L => XAC, XAR_L => XAR, XBC_L => XBC, XBR_L => XBR
USE MODD_PARAM_N, ONLY: CCLOUD, CSURF
- USE MODD_RAIN_ICE_DESCR_n, ONLY: XALPHAR_I => XALPHAR, XNUR_I => XNUR, XLBEXR_I => XLBEXR, &
+ USE MODD_RAIN_ICE_DESCR_n, ONLY: XALPHAR_I => XALPHAR, XNUR_I => XNUR, XLBEXR_I => XLBEXR, &
XLBR_I => XLBR, XCCR_I => XCCR, XBR_I => XBR, XAR_I => XAR, &
XALPHAC_I => XALPHAC, XNUC_I => XNUC, XBC_I => XBC, XAC_I => XAC, &
XALPHAC2_I => XALPHAC2, XNUC2_I => XNUC2, &
diff --git a/src/MNH/modeln.f90 b/src/MNH/modeln.f90
index 77b062bf3..cb9783d9b 100644
--- a/src/MNH/modeln.f90
+++ b/src/MNH/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
@@ -354,7 +355,7 @@ USE MODD_PARAMETERS
USE MODD_PARAM_ICE_n, ONLY: LWARM,LSEDIC,LCONVHG,LDEPOSC, CSUBG_AUCV_RC
USE MODD_PARAM_LIMA, ONLY: MSEDC => LSEDC, NMOM_C, NMOM_R, &
MACTIT => LACTIT, LSCAV, NMOM_I, &
- MSEDI => LSEDI, MHHONI => LHHONI, NMOM_S, NMOM_G, NMOM_H, &
+ MSEDI => LSEDI, MHHONI => LHHONI, NMOM_S, NMOM_G, NMOM_H, &
XRTMIN_LIMA=>XRTMIN, MACTTKE=>LACTTKE, LPTSPLIT
USE MODD_PARAM_MFSHALL_n
USE MODD_PARAM_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/MNH/phys_paramn.f90 b/src/MNH/phys_paramn.f90
index bd98dacf0..cc55fe411 100644
--- a/src/MNH/phys_paramn.f90
+++ b/src/MNH/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/MNH/prep_nest_pgd.f90 b/src/MNH/prep_nest_pgd.f90
index 4a2352d77..3a60cde0d 100644
--- a/src/MNH/prep_nest_pgd.f90
+++ b/src/MNH/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/MNH/prep_pgd.f90 b/src/MNH/prep_pgd.f90
index 617389344..172959a98 100644
--- a/src/MNH/prep_pgd.f90
+++ b/src/MNH/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/MNH/prep_real_case.f90 b/src/MNH/prep_real_case.f90
index 8cedd2db6..1384ee513 100644
--- a/src/MNH/prep_real_case.f90
+++ b/src/MNH/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/MNH/prep_surfex.f90 b/src/MNH/prep_surfex.f90
index 6c3c81277..749c59844 100644
--- a/src/MNH/prep_surfex.f90
+++ b/src/MNH/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/MNH/read_desfmn.f90 b/src/MNH/read_desfmn.f90
index 39e599098..3ced113c5 100644
--- a/src/MNH/read_desfmn.f90
+++ b/src/MNH/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/MNH/read_exsegn.f90 b/src/MNH/read_exsegn.f90
index c7c48d839..a5c44aee2 100644
--- a/src/MNH/read_exsegn.f90
+++ b/src/MNH/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, LRED, LSNOW_T
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/MNH/read_field.f90 b/src/MNH/read_field.f90
index d86c67557..877437197 100644
--- a/src/MNH/read_field.f90
+++ b/src/MNH/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/MNH/read_precip_field.f90 b/src/MNH/read_precip_field.f90
index 1267beea7..3fb16bdf4 100644
--- a/src/MNH/read_precip_field.f90
+++ b/src/MNH/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/MNH/read_surf_mnh.f90 b/src/MNH/read_surf_mnh.f90
index 3e1cb2471..6c769c64b 100644
--- a/src/MNH/read_surf_mnh.f90
+++ b/src/MNH/read_surf_mnh.f90
@@ -24,7 +24,6 @@ use modd_parameters, only: NMNHNAMELGTMAX
use mode_field, only: Find_field_id_from_mnhname
!
CHARACTER(LEN=MNH_LEN_HREC),INTENT(IN) :: HREC ! name of the article to write
-!CHARACTER(LEN=*),INTENT(IN) :: HREC ! name of the article to write
CHARACTER(LEN=2), INTENT(IN) :: HDIR ! Expected type of the data field (XX,XY,--...)
INTEGER, INTENT(IN) :: KGRID ! Localization on the model grid
INTEGER, INTENT(IN) :: KTYPE ! Datatype
diff --git a/src/MNH/resolved_cloud.f90 b/src/MNH/resolved_cloud.f90
index 03b6d3493..78b056cf3 100644
--- a/src/MNH/resolved_cloud.f90
+++ b/src/MNH/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
!
@@ -1140,7 +1140,7 @@ SELECT CASE ( HCLOUD )
ZRIS_BEF(:,:,:) = PRS(:,:,:,4)
END IF
!
- ! Performe the saturation ajdustment
+ ! Perform the saturation ajdustment
CALL ICE_ADJUST (YLDIMPHYEX,CST, RAIN_ICE_PARAMN, NEBN, TURBN, &
PARAM_ICEN, TBUCONF, KRR, &
'ADJU', &
@@ -1322,7 +1322,7 @@ SELECT CASE ( HCLOUD )
ZRIS_BEF(:,:,:) = PRS(:,:,:,4)
END IF
!
- ! Performe the saturation ajdustment
+ ! Perform the saturation ajdustment
CALL ICE_ADJUST (YLDIMPHYEX,CST, RAIN_ICE_PARAMN, NEBN, TURBN, &
PARAM_ICEN, TBUCONF, KRR, 'DEPI', &
PTSTEP, ZSIGQSAT2D, &
diff --git a/src/MNH/set_conc_ice_c1r3.f90 b/src/MNH/set_conc_ice_c1r3.f90
index 0dfe34119..c2f747439 100644
--- a/src/MNH/set_conc_ice_c1r3.f90
+++ b/src/MNH/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/MNH/set_rsou.f90 b/src/MNH/set_rsou.f90
index 6c2ea6b2f..452625183 100644
--- a/src/MNH/set_rsou.f90
+++ b/src/MNH/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/MNH/sources_neg_correct.f90 b/src/MNH/sources_neg_correct.f90
index 366fc1daa..1abd41813 100644
--- a/src/MNH/sources_neg_correct.f90
+++ b/src/MNH/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/MNH/spawn_model2.f90 b/src/MNH/spawn_model2.f90
index 3511cd27f..c9c9c5774 100644
--- a/src/MNH/spawn_model2.f90
+++ b/src/MNH/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/MNH/two_wayn.f90 b/src/MNH/two_wayn.f90
index b2299ee4a..7cd52cb86 100644
--- a/src/MNH/two_wayn.f90
+++ b/src/MNH/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/MNH/write_desfmn.f90 b/src/MNH/write_desfmn.f90
index 908c2eff8..50210c832 100644
--- a/src/MNH/write_desfmn.f90
+++ b/src/MNH/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/MNH/write_lesn.f90 b/src/MNH/write_lesn.f90
index 44f915343..c35e3eafa 100644
--- a/src/MNH/write_lesn.f90
+++ b/src/MNH/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/MNH/write_lfifm1_for_diag_supp.f90 b/src/MNH/write_lfifm1_for_diag_supp.f90
index 380dc9fd6..974e78231 100644
--- a/src/MNH/write_lfifm1_for_diag_supp.f90
+++ b/src/MNH/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/MNH/write_lfin.f90 b/src/MNH/write_lfin.f90
index ea18a11d5..f2070f6a0 100644
--- a/src/MNH/write_lfin.f90
+++ b/src/MNH/write_lfin.f90
@@ -178,7 +178,7 @@ END MODULE MODI_WRITE_LFIFM_n
! P. Wautelet 10/03/2021: use scalar variable names for dust and salt
! P. Wautelet 11/03/2021: bugfix: correct name for NSV_LIMA_IMM_NUCL
! J.L. Redelsperger 03/2021: add OCEAN and auto-coupled O-A LES cases
-! R. Schoetter 12/2021: adds humidity and other mean diagnostics
+! R. Schoetter 12/2021: adds humidity and other mean diagnostics
! A. Costes 12/2021: add Blaze fire model
! P. Wautelet 04/02/2022: use TSVLIST to manage metadata of scalar variables
! E. Jezequel 11/2022: add covariances from MEAN fields
@@ -874,14 +874,14 @@ IF (MEAN_COUNT /= 0) THEN
TZFIELD%CUNITS = 'm s-1'
TZFIELD%CCOMMENT = 'X_Y_Z_horizontal maximum wind speed'
CALL IO_Field_write(TPFILE,TZFIELD,XWIFF_MAX)
- XWIFF_MAX(:,:,:)=-XUNDEF
+ XWIFF_MAX(:,:,:)=XNEGUNDEF
!
TZFIELD%CMNHNAME = 'WIDDMAX'
TZFIELD%CLONGNAME = 'WIDDMAX'
TZFIELD%CUNITS = 'm s-1'
TZFIELD%CCOMMENT = 'X_Y_Z_horizontal maximum wind direction'
CALL IO_Field_write(TPFILE,TZFIELD,XWIDD_MAX)
- XWIDD_MAX(:,:,:)=-XUNDEF
+ XWIDD_MAX(:,:,:)=XNEGUNDEF
!
TZFIELD%NGRID = 1
TZFIELD = TFIELDMETADATA( &
diff --git a/src/MNH/write_surf_mnh.f90 b/src/MNH/write_surf_mnh.f90
index 646bf9ed6..4caa1378c 100644
--- a/src/MNH/write_surf_mnh.f90
+++ b/src/MNH/write_surf_mnh.f90
@@ -1361,7 +1361,7 @@ CHARACTER(LEN=100), INTENT(IN) :: HCOMMENT ! Comment string
!* 0.2 Declarations of local variables
!
CHARACTER(LEN=4), PARAMETER :: YSUFFIX = '_SFX'
-CHARACTER(LEN=MNH_LEN_HREC) :: YREC
+CHARACTER(LEN=MNH_LEN_HREC) :: YREC
CHARACTER(LEN=5) :: YMSG
TYPE(TFIELDMETADATA) :: TZFIELD
!
diff --git a/src/MNH/xy_to_latlon.f90 b/src/MNH/xy_to_latlon.f90
index 9effbed46..d544a9607 100644
--- a/src/MNH/xy_to_latlon.f90
+++ b/src/MNH/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/MNH/zoom_pgd.f90 b/src/MNH/zoom_pgd.f90
index 2b50885c8..efd60bdd8 100644
--- a/src/MNH/zoom_pgd.f90
+++ b/src/MNH/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
!
--
GitLab