From 1f5aec2aea1318cc169eeaa254a5b9a01203aec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Riette?= <sebastien.riette@meteo.fr> Date: Wed, 7 Sep 2022 16:36:52 +0200 Subject: [PATCH] S. Riette 7 sept 2022 merge mpa/conv/internals from 48t3 --- src/arome/conv/convect_chem_transport.F90 | 4 ++-- src/arome/conv/convect_closure_adjust_shal.F90 | 2 +- src/arome/conv/convect_closure_shal.F90 | 6 +++--- src/arome/conv/convect_closure_thrvlcl.F90 | 5 ++--- src/arome/conv/convect_condens.F90 | 4 ++-- src/arome/conv/convect_satmixratio.F90 | 2 +- src/arome/conv/convect_trigger_shal.F90 | 6 +++--- src/arome/conv/convect_updraft_shal.F90 | 6 +++--- src/arome/conv/ini_convpar.F90 | 4 +++- src/arome/conv/shallow_convection.F90 | 6 +++--- 10 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/arome/conv/convect_chem_transport.F90 b/src/arome/conv/convect_chem_transport.F90 index 85b33c8c1..b5030c5b7 100644 --- a/src/arome/conv/convect_chem_transport.F90 +++ b/src/arome/conv/convect_chem_transport.F90 @@ -49,8 +49,8 @@ !* 0. DECLARATIONS ! ------------ ! -USE MODD_CST -USE MODD_CONVPAREXT +USE MODD_CST, ONLY : XG +USE MODD_CONVPAREXT, ONLY : JCVEXB, JCVEXT USE MODD_NSV, ONLY : NSV_LGBEG,NSV_LGEND ! IMPLICIT NONE diff --git a/src/arome/conv/convect_closure_adjust_shal.F90 b/src/arome/conv/convect_closure_adjust_shal.F90 index e66a38775..4b5447ab1 100644 --- a/src/arome/conv/convect_closure_adjust_shal.F90 +++ b/src/arome/conv/convect_closure_adjust_shal.F90 @@ -52,7 +52,7 @@ !* 0. DECLARATIONS ! ------------ ! -USE MODD_CONVPAREXT +USE MODD_CONVPAREXT, ONLY : JCVEXB, JCVEXT ! IMPLICIT NONE ! diff --git a/src/arome/conv/convect_closure_shal.F90 b/src/arome/conv/convect_closure_shal.F90 index d45e04aa7..cfae7f684 100644 --- a/src/arome/conv/convect_closure_shal.F90 +++ b/src/arome/conv/convect_closure_shal.F90 @@ -76,9 +76,9 @@ !* 0. DECLARATIONS ! ------------ ! -USE MODD_CST -USE MODD_CONVPAR_SHAL -USE MODD_CONVPAREXT +USE MODD_CST, ONLY : XCPD, XRD, XG, XP00, XCPV, XLVTT, XCL, XTT, XCI +USE MODD_CONVPAR_SHAL, ONLY : XSTABT, XSTABC +USE MODD_CONVPAREXT, ONLY : JCVEXB, JCVEXT ! ! IMPLICIT NONE diff --git a/src/arome/conv/convect_closure_thrvlcl.F90 b/src/arome/conv/convect_closure_thrvlcl.F90 index 54e69ad15..1ad35ec7c 100644 --- a/src/arome/conv/convect_closure_thrvlcl.F90 +++ b/src/arome/conv/convect_closure_thrvlcl.F90 @@ -67,9 +67,8 @@ !* 0. DECLARATIONS ! ------------ ! -USE MODD_CST -USE MODD_CONVPAR -USE MODD_CONVPAREXT +USE MODD_CST, ONLY : XRD, XRV, XCPD, XP00, XTT, XBETAW, XGAMW +USE MODD_CONVPAREXT, ONLY : JCVEXB, JCVEXT ! ! IMPLICIT NONE diff --git a/src/arome/conv/convect_condens.F90 b/src/arome/conv/convect_condens.F90 index 5bfbc0e90..1facb675f 100644 --- a/src/arome/conv/convect_condens.F90 +++ b/src/arome/conv/convect_condens.F90 @@ -63,8 +63,8 @@ !* 0. DECLARATIONS ! ------------ ! -USE MODD_CST -USE MODD_CONVPAR +USE MODD_CST, ONLY : XALPI, XALPW, XBETAI, XBETAW, XCI, XCL, XCPD, XCPV, XG, XGAMI, XGAMW, XLSTT, XLVTT, XRD, XRV, XTT +USE MODD_CONVPAR, ONLY : XTFRZ1, XTFRZ2 ! ! IMPLICIT NONE diff --git a/src/arome/conv/convect_satmixratio.F90 b/src/arome/conv/convect_satmixratio.F90 index 34da003ce..0926cd7a3 100644 --- a/src/arome/conv/convect_satmixratio.F90 +++ b/src/arome/conv/convect_satmixratio.F90 @@ -52,7 +52,7 @@ !* 0. DECLARATIONS ! ------------ ! -USE MODD_CST +USE MODD_CST, ONLY : XALPW, XBETAW, XCI, XCL, XCPD, XCPV, XGAMW, XLSTT, XLVTT, XRD, XRV, XTT ! ! IMPLICIT NONE diff --git a/src/arome/conv/convect_trigger_shal.F90 b/src/arome/conv/convect_trigger_shal.F90 index 7738cad93..9b0975808 100644 --- a/src/arome/conv/convect_trigger_shal.F90 +++ b/src/arome/conv/convect_trigger_shal.F90 @@ -80,9 +80,9 @@ !* 0. DECLARATIONS ! ------------ ! -USE MODD_CST -USE MODD_CONVPAR_SHAL -USE MODD_CONVPAREXT +USE MODD_CST, ONLY : XBETAW, XCPD, XG, XGAMW, XP00, XRD, XRV, XTT +USE MODD_CONVPAR_SHAL, ONLY : XATPERT, XAW, XBTPERT, XBW, XCDEPTH, XDTPERT, XNHGAM, XZLCL, XZPBL +USE MODD_CONVPAREXT, ONLY : JCVEXB, JCVEXT ! ! IMPLICIT NONE diff --git a/src/arome/conv/convect_updraft_shal.F90 b/src/arome/conv/convect_updraft_shal.F90 index 360088752..6aa68e00d 100644 --- a/src/arome/conv/convect_updraft_shal.F90 +++ b/src/arome/conv/convect_updraft_shal.F90 @@ -77,9 +77,9 @@ !* 0. DECLARATIONS ! ------------ ! -USE MODD_CST -USE MODD_CONVPAR_SHAL -USE MODD_CONVPAREXT +USE MODD_CST, ONLY : XCPD, XCPV, XG, XP00, XRD, XRV +USE MODD_CONVPAR_SHAL, ONLY : XCDEPTH, XCDEPTH_D, XCRAD, XENTR, XNHGAM +USE MODD_CONVPAREXT, ONLY : JCVEXB, JCVEXT ! ! IMPLICIT NONE diff --git a/src/arome/conv/ini_convpar.F90 b/src/arome/conv/ini_convpar.F90 index a1be28567..16ab5ca90 100644 --- a/src/arome/conv/ini_convpar.F90 +++ b/src/arome/conv/ini_convpar.F90 @@ -42,7 +42,9 @@ !* 0. DECLARATIONS ! ------------ ! -USE MODD_CONVPAR +USE MODD_CONVPAR, ONLY : XA25, XCDEPTH, XCRAD, XENTR, XMELDPTH, XNHGAM, XRCONV, XRHDBC, XSTABC, & +& XSTABT, XTFRZ1, XTFRZ2, XUSRDPTH, XUVDP, XWTRIG, XZLCL, XZPBL + ! IMPLICIT NONE ! diff --git a/src/arome/conv/shallow_convection.F90 b/src/arome/conv/shallow_convection.F90 index 172d00af7..ba40743d0 100644 --- a/src/arome/conv/shallow_convection.F90 +++ b/src/arome/conv/shallow_convection.F90 @@ -94,9 +94,9 @@ !* 0. DECLARATIONS ! ------------ ! -USE MODD_CST -USE MODD_CONVPAREXT -USE MODD_CONVPAR_SHAL +USE MODD_CST, ONLY : XALPW, XBETAW, XCI, XCL, XCPD, XCPV, XG, XGAMW, XLSTT, XLVTT, XP00, XRD, XRV, XTT +USE MODD_CONVPAREXT, ONLY : JCVEXB, JCVEXT +USE MODD_CONVPAR_SHAL, ONLY : LLSMOOTH, XA25, XCTIME_SHAL USE MODD_NSV, ONLY : NSV_LGBEG,NSV_LGEND ! ! -- GitLab