From 4ef50c14cc191f02032e6276338d3f7ea8798be7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Riette?= <sebastien.riette@meteo.fr> Date: Tue, 16 May 2023 15:49:00 +0200 Subject: [PATCH] S. Riette 16 May 2023: remove unused local variables Unused local variables from common source codes are removed except for minpack --- src/common/aux/gradient_m.F90 | 4 ++-- src/common/aux/mode_budget_phy.F90 | 1 - src/common/aux/mode_gradient_m_phy.F90 | 2 +- src/common/aux/mode_gradient_w_phy.F90 | 4 ++-- src/common/aux/shuman.F90 | 4 ---- src/common/aux/shuman_phy.F90 | 2 -- src/common/micro/hypgeo.F90 | 5 +---- src/common/micro/lima.F90 | 11 +++------- src/common/micro/lima_adjust_split.F90 | 11 ++-------- src/common/micro/lima_precip_scavenging.F90 | 8 +++---- src/common/micro/modd_nebn.F90 | 3 +-- src/common/micro/modd_param_lima.F90 | 2 +- src/common/micro/mode_ice4_budgets.F90 | 2 +- src/common/micro/mode_ice4_fast_rh.F90 | 2 +- src/common/micro/mode_ice4_fast_rs.F90 | 2 +- src/common/micro/mode_ice4_sedimentation.F90 | 2 +- .../micro/mode_ice4_sedimentation_split.F90 | 4 ++-- .../micro/mode_ice4_sedimentation_stat.F90 | 10 ++++----- src/common/micro/mode_ice4_slow.F90 | 1 - src/common/micro/mode_ice4_stepping.F90 | 2 -- src/common/micro/mode_ice4_tendencies.F90 | 1 - src/common/micro/mode_icecloud.F90 | 4 ++-- src/common/micro/mode_ini_lima.F90 | 2 -- src/common/micro/mode_ini_lima_cold_mixed.F90 | 17 +++++--------- src/common/micro/mode_ini_lima_warm.F90 | 4 +--- src/common/micro/mode_ini_tiwmx.F90 | 2 -- .../micro/mode_init_aerosol_properties.F90 | 16 +------------- src/common/micro/mode_lima_ccn_activation.F90 | 2 +- .../micro/mode_lima_ccn_hom_freezing.F90 | 14 +++++------- .../mode_lima_collisional_ice_breakup.F90 | 2 +- .../mode_lima_compute_cloud_fractions.F90 | 1 - .../mode_lima_conversion_melting_snow.F90 | 2 +- .../micro/mode_lima_droplets_riming_snow.F90 | 4 ++-- src/common/micro/mode_lima_drops_break_up.F90 | 1 - .../mode_lima_drops_to_droplets_conv.F90 | 3 --- src/common/micro/mode_lima_graupel.F90 | 8 +++---- src/common/micro/mode_lima_hail.F90 | 9 +++----- .../micro/mode_lima_ice_aggregation_snow.F90 | 4 ++-- src/common/micro/mode_lima_ice_deposition.F90 | 9 ++------ ...mode_lima_init_ccn_activation_spectrum.F90 | 5 ++--- .../micro/mode_lima_nucleation_procs.F90 | 4 +--- .../mode_lima_phillips_ifn_nucleation.F90 | 3 +-- src/common/micro/mode_lima_sedimentation.F90 | 3 +-- .../micro/mode_lima_snow_deposition.F90 | 12 ++++------ .../micro/mode_lima_snow_self_collection.F90 | 4 ++-- src/common/micro/mode_lima_tendencies.F90 | 7 +++--- src/common/micro/mode_qsatmx_tab.F90 | 1 - .../micro/mode_rain_ice_old_fast_rg.F90 | 2 +- .../micro/mode_rain_ice_old_fast_rh.F90 | 2 +- .../micro/mode_rain_ice_old_fast_ri.F90 | 4 ++-- .../micro/mode_rain_ice_old_fast_rs.F90 | 2 +- .../mode_rain_ice_old_sedimentation_stat.F90 | 2 +- src/common/micro/mode_rain_ice_old_slow.F90 | 2 +- src/common/micro/mode_rain_ice_old_warm.F90 | 2 +- src/common/micro/mode_set_conc_lima.F90 | 10 ++++----- src/common/micro/rain_ice.F90 | 7 +++--- src/common/micro/rain_ice_old.F90 | 5 ----- src/common/turb/modd_param_mfshalln.F90 | 3 +-- src/common/turb/modd_turbn.F90 | 3 +-- src/common/turb/mode_bl89.F90 | 1 - src/common/turb/mode_compute_updraft_raha.F90 | 22 ++++--------------- .../turb/mode_compute_updraft_rhcj10.F90 | 8 +------ src/common/turb/mode_ibm_mixinglength.F90 | 2 -- src/common/turb/mode_prandtl.F90 | 6 ++--- src/common/turb/mode_sbl.F90 | 12 +++++----- src/common/turb/mode_sbl_phy.F90 | 2 +- src/common/turb/mode_tke_eps_sources.F90 | 3 +-- src/common/turb/mode_tm06.F90 | 2 +- src/common/turb/mode_tridiag.F90 | 1 - src/common/turb/mode_tridiag_thermo.F90 | 2 -- src/common/turb/mode_turb_hor_dyn_corr.F90 | 1 - src/common/turb/mode_turb_hor_sv_flux.F90 | 1 - src/common/turb/mode_turb_hor_uv.F90 | 1 - src/common/turb/mode_turb_hor_uw.F90 | 1 - src/common/turb/mode_turb_hor_vw.F90 | 1 - src/common/turb/mode_turb_ver.F90 | 3 --- src/common/turb/mode_turb_ver_dyn_flux.F90 | 4 ++-- src/common/turb/mode_turb_ver_sv_corr.F90 | 1 - src/common/turb/mode_turb_ver_sv_flux.F90 | 4 +--- src/common/turb/mode_turb_ver_thermo_corr.F90 | 3 --- src/common/turb/mode_turb_ver_thermo_flux.F90 | 7 +----- src/common/turb/turb.F90 | 3 +-- 82 files changed, 108 insertions(+), 253 deletions(-) diff --git a/src/common/aux/gradient_m.F90 b/src/common/aux/gradient_m.F90 index 3ab195aa5..b98d5acd8 100644 --- a/src/common/aux/gradient_m.F90 +++ b/src/common/aux/gradient_m.F90 @@ -189,9 +189,9 @@ REAL, DIMENSION(:,:,:), INTENT(IN) :: PY ! variable at mass ! localization REAL, DIMENSION(SIZE(PY,1),SIZE(PY,2),SIZE(PY,3)) :: PGX_M_U ! result at flux ! side -INTEGER IIU,IKU,JI,JK +INTEGER IIU,IKU,JI ! -INTEGER :: JJK,IJU +INTEGER :: IJU INTEGER :: JIJK,JIJKOR,JIJKEND INTEGER :: JI_1JK, JIJK_1, JI_1JK_1, JIJKP1, JI_1JKP1 ! diff --git a/src/common/aux/mode_budget_phy.F90 b/src/common/aux/mode_budget_phy.F90 index 30db2f33b..6e709a1ab 100644 --- a/src/common/aux/mode_budget_phy.F90 +++ b/src/common/aux/mode_budget_phy.F90 @@ -46,6 +46,5 @@ SUBROUTINE BUDGET_STORE_ADD(TPBUDGET, HSOURCE, PVARS) TYPE(TBUDGETDATA), INTENT(INOUT) :: TPBUDGET ! Budget datastructure CHARACTER(LEN=*), INTENT(IN) :: HSOURCE ! Name of the source term REAL, DIMENSION(:,:,:), INTENT(IN) :: PVARS ! Current value to be stored - REAL, DIMENSION(SIZE(PVARS, 1), SIZE(PVARS, 2), SIZE(PVARS, 3)) :: ZVARS END SUBROUTINE BUDGET_STORE_ADD END MODULE MODE_BUDGET_PHY diff --git a/src/common/aux/mode_gradient_m_phy.F90 b/src/common/aux/mode_gradient_m_phy.F90 index 6f3c34f01..718599a9d 100644 --- a/src/common/aux/mode_gradient_m_phy.F90 +++ b/src/common/aux/mode_gradient_m_phy.F90 @@ -439,7 +439,7 @@ REAL, DIMENSION(D%NIT*D%NJT*D%NKT) :: ZGX_M_U REAL, DIMENSION(D%NIT,D%NJT,D%NKT):: ZY, ZDXX INTEGER IIU,IKU,JI,JK,IKL, IKA ! -INTEGER :: JJK,IJU +INTEGER :: IJU INTEGER :: JIJK,JIJKOR,JIJKEND INTEGER :: JI_1JK, JIJK_1, JI_1JK_1, JIJKP1, JI_1JKP1 ! diff --git a/src/common/aux/mode_gradient_w_phy.F90 b/src/common/aux/mode_gradient_w_phy.F90 index 0f8db721b..b9b43a2b4 100644 --- a/src/common/aux/mode_gradient_w_phy.F90 +++ b/src/common/aux/mode_gradient_w_phy.F90 @@ -50,7 +50,7 @@ CONTAINS !* 0. DECLARATIONS ! ! -USE MODE_SHUMAN_PHY, ONLY: MZF_PHY, DZF_PHY, MXM_PHY, DXM_PHY, MZM_PHY, DZM_PHY +USE MODE_SHUMAN_PHY, ONLY: MZF_PHY, MXM_PHY, DXM_PHY, MZM_PHY, DZM_PHY USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t ! IMPLICIT NONE @@ -162,7 +162,7 @@ END SUBROUTINE GX_W_UW_PHY !* 0. DECLARATIONS ! ! -USE MODE_SHUMAN_PHY, ONLY: MZF_PHY, DZF_PHY, MYM_PHY, DYM_PHY, MZM_PHY, DZM_PHY +USE MODE_SHUMAN_PHY, ONLY: MZF_PHY, MYM_PHY, DYM_PHY, MZM_PHY, DZM_PHY USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t ! IMPLICIT NONE diff --git a/src/common/aux/shuman.F90 b/src/common/aux/shuman.F90 index f8949e00d..be56b4cce 100644 --- a/src/common/aux/shuman.F90 +++ b/src/common/aux/shuman.F90 @@ -66,7 +66,6 @@ REAL, DIMENSION(SIZE(PA,1),SIZE(PA,2),SIZE(PA,3)) :: PMXF ! result at mass !* 0.2 Declarations of local variables ! ------------------------------- ! -INTEGER :: JI ! Loop index in x direction INTEGER :: IIU ! upper bound in x direction of PA ! !------------------------------------------------------------------------------- @@ -159,7 +158,6 @@ REAL, DIMENSION(SIZE(PA,1),SIZE(PA,2),SIZE(PA,3)) :: PMXM ! result at flux loc !* 0.2 Declarations of local variables ! ------------------------------- ! -INTEGER :: JI ! Loop index in x direction INTEGER :: IIU ! Size of the array in the x direction ! !------------------------------------------------------------------------------- @@ -254,7 +252,6 @@ REAL, DIMENSION(SIZE(PA,1),SIZE(PA,2),SIZE(PA,3)) :: PMYF ! result at mass !* 0.2 Declarations of local variables ! ------------------------------- ! -INTEGER :: JJ ! Loop index in y direction INTEGER :: IJU ! upper bound in y direction of PA ! !------------------------------------------------------------------------------- @@ -346,7 +343,6 @@ REAL, DIMENSION(SIZE(PA,1),SIZE(PA,2),SIZE(PA,3)) :: PMYM ! result at flux loc !* 0.2 Declarations of local variables ! ------------------------------- ! -INTEGER :: JJ ! Loop index in y direction INTEGER :: IJU ! Size of the array in the y direction ! !------------------------------------------------------------------------------- diff --git a/src/common/aux/shuman_phy.F90 b/src/common/aux/shuman_phy.F90 index ab0244733..59af8535c 100644 --- a/src/common/aux/shuman_phy.F90 +++ b/src/common/aux/shuman_phy.F90 @@ -295,7 +295,6 @@ REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(OUT) :: PMYM ! result at flux local !* 0.2 Declarations of local variables ! ------------------------------- ! -INTEGER :: JJ ! Loop index in y direction INTEGER :: IJU ! Size of the array in the y direction ! !------------------------------------------------------------------------------- @@ -565,7 +564,6 @@ REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(OUT) :: PMXM ! result at flux local !* 0.2 Declarations of local variables ! ------------------------------- ! -INTEGER :: JI ! Loop index in x direction INTEGER :: IIU ! Size of the array in the x direction ! !------------------------------------------------------------------------------- diff --git a/src/common/micro/hypgeo.F90 b/src/common/micro/hypgeo.F90 index 4619bf51a..378c3ce3d 100644 --- a/src/common/micro/hypgeo.F90 +++ b/src/common/micro/hypgeo.F90 @@ -84,12 +84,9 @@ REAL :: PHYPGEO !* 0.2 declarations of local variables ! ! -INTEGER :: JN -INTEGER :: ITMAX=100 REAL :: ZEPS,ZTEMP -REAL :: ZFPMIN=1.E-30 REAL :: ZXH -REAL :: ZX0,ZX1,ZZA,ZZB,ZZC,ZZD,Y(2) +REAL :: ZX0,ZX1 ! !------------------------------------------------------------------------------ ! diff --git a/src/common/micro/lima.F90 b/src/common/micro/lima.F90 index 36474a920..6665319bc 100644 --- a/src/common/micro/lima.F90 +++ b/src/common/micro/lima.F90 @@ -49,24 +49,20 @@ USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t USE MODD_BUDGET, ONLY: TBUDGETDATA, TBUDGETCONF_t, NBUDGET_TH, NBUDGET_RV, NBUDGET_RC, & NBUDGET_RI, NBUDGET_RR, NBUDGET_RS, NBUDGET_RG, NBUDGET_RH, NBUDGET_SV1 USE MODD_CST, ONLY: CST_t -USE MODD_IO, ONLY: TFILEDATA USE MODD_NSV, ONLY: NSV_LIMA_NC, NSV_LIMA_NR, NSV_LIMA_CCN_FREE, NSV_LIMA_CCN_ACTI, & NSV_LIMA_NI, NSV_LIMA_NS, NSV_LIMA_NG, NSV_LIMA_NH, & NSV_LIMA_IFN_FREE, NSV_LIMA_IFN_NUCL, NSV_LIMA_IMM_NUCL, NSV_LIMA_HOM_HAZE, & NSV_LIMA_BEG -USE MODD_PARAMETERS, ONLY: JPHEXT, JPVEXT USE MODD_PARAM_LIMA, ONLY: NMOD_CCN, NMOD_IFN, NMOD_IMM, LHHONI, & - LACTIT, LFEEDBACKT, NMAXITER, XMRSTEP, XTSTEP_TS, & + LFEEDBACKT, NMAXITER, XMRSTEP, XTSTEP_TS, & LSEDC, LSEDI, XRTMIN, XCTMIN, LDEPOC, XVDEPOC, & NMOM_C, NMOM_R, NMOM_I, NMOM_S, NMOM_G, NMOM_H -USE MODD_PARAM_LIMA_COLD, ONLY: XAI, XBI -USE MODD_PARAM_LIMA_WARM, ONLY: XLBC, XLBEXC, XAC, XBC, XAR, XBR USE MODE_BUDGET_PHY, ONLY: BUDGET_STORE_ADD_PHY, BUDGET_STORE_INIT_PHY, BUDGET_STORE_END_PHY use mode_tools, only: Countjv USE MODE_LIMA_COMPUTE_CLOUD_FRACTIONS, ONLY: LIMA_COMPUTE_CLOUD_FRACTIONS -USE MODE_LIMA_DROPS_TO_DROPLETS_CONV, ONLY: LIMA_DROPS_TO_DROPLETS_CONV + USE MODE_LIMA_INST_PROCS, ONLY: LIMA_INST_PROCS USE MODE_LIMA_NUCLEATION_PROCS, ONLY: LIMA_NUCLEATION_PROCS USE MODE_LIMA_SEDIMENTATION, ONLY: LIMA_SEDIMENTATION @@ -273,13 +269,12 @@ REAL, DIMENSION(:), ALLOCATABLE :: ZCF1D, ZIF1D, ZPF1D ! domain size and levels (AROME compatibility) INTEGER :: KRR ! loops and packing -INTEGER :: II, IPACK, JI, JJ, JK +INTEGER :: II, IPACK, JI integer :: idx INTEGER, DIMENSION(:), ALLOCATABLE :: I1, I2, I3 ! Inverse ov PTSTEP REAL :: ZINV_TSTEP ! Work arrays -REAL, DIMENSION(SIZE(PRT,1),SIZE(PRT,2),SIZE(PRT,3)) :: ZW3D REAL, DIMENSION(SIZE(PRT,1),SIZE(PRT,2)) :: ZW2D REAL, DIMENSION(SIZE(PRT,1),SIZE(PRT,2),SIZE(PRT,3)) :: ZRT_SUM ! Total condensed water mr REAL, DIMENSION(SIZE(PRT,1),SIZE(PRT,2),SIZE(PRT,3)) :: ZCPT ! Total condensed water mr diff --git a/src/common/micro/lima_adjust_split.F90 b/src/common/micro/lima_adjust_split.F90 index 96187f126..5ad444ac7 100644 --- a/src/common/micro/lima_adjust_split.F90 +++ b/src/common/micro/lima_adjust_split.F90 @@ -106,7 +106,6 @@ USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t USE MODE_BUDGET_PHY, ONLY: BUDGET_STORE_INIT_PHY, BUDGET_STORE_END_PHY !USE MODE_IO_FIELD_WRITE, only: IO_Field_write use mode_msg -use mode_tools, only: Countjv ! USE MODI_CONDENSATION USE MODE_LIMA_CCN_ACTIVATION, ONLY: LIMA_CCN_ACTIVATION @@ -191,8 +190,7 @@ REAL, DIMENSION(SIZE(PRHODJ,1),SIZE(PRHODJ,2),SIZE(PRHODJ,3)) & PCIT, & ! Cloud ice conc. at t ! PCCS, & ! Cloud water C. source - PMAS, & ! Mass of scavenged AP - PCIS ! Ice crystal C. source + PMAS ! Mass of scavenged AP ! REAL, DIMENSION(:,:,:,:), ALLOCATABLE & :: PNFS, & ! Free CCN C. source @@ -228,11 +226,6 @@ REAL, DIMENSION(SIZE(PRHODJ,1),SIZE(PRHODJ,2)) :: ZSIGQSAT2D INTEGER, DIMENSION(SIZE(PRHODJ,1),SIZE(PRHODJ,2),SIZE(PRHODJ,3)) :: IVEC1 ! !INTEGER :: IRESP ! Return code of FM routines -INTEGER :: IIU,IJU,IKU! dimensions of dummy arrays -INTEGER :: IKB ! K index value of the first inner mass point -INTEGER :: IKE ! K index value of the last inner mass point -INTEGER :: IIB,IJB ! Horz index values of the first inner mass points -INTEGER :: IIE,IJE ! Horz index values of the last inner mass points INTEGER :: JITER,ITERMAX ! iterative loop for first order adjustment !INTEGER :: ILUOUT ! Logical unit of output listing ! @@ -243,7 +236,7 @@ REAL, DIMENSION(:), ALLOCATABLE :: ZCTMIN ! integer :: idx integer :: JI, JJ, JK, jl -INTEGER :: JMOD, JMOD_IFN, JMOD_IMM +INTEGER :: JMOD ! !!$TYPE(TFIELDMETADATA) :: TZFIELD ! diff --git a/src/common/micro/lima_precip_scavenging.F90 b/src/common/micro/lima_precip_scavenging.F90 index 3d23f6450..78d415912 100644 --- a/src/common/micro/lima_precip_scavenging.F90 +++ b/src/common/micro/lima_precip_scavenging.F90 @@ -86,7 +86,7 @@ USE MODD_PARAM_LIMA, ONLY: NMOD_IFN, NSPECIE, XFRAC, XMDIAM_IFN, XSIGMA_IFN, XRHO_IFN, & NMOD_CCN, XR_MEAN_CCN, XLOGSIG_CCN, XRHO_CCN, & XALPHAR, XNUR, & - LAERO_MASS, NDIAMR, NDIAMP, XT0SCAV, XTREF, XNDO, & + LAERO_MASS, NDIAMR, NDIAMP, XT0SCAV, XTREF, & XMUA0, XT_SUTH_A, XMFPA0, XVISCW, XRHO00, & XRTMIN, XCTMIN USE MODD_PARAM_LIMA_WARM, ONLY: XCR, XDR @@ -136,7 +136,7 @@ INTEGER :: IKB ! INTEGER :: IKE ! ! INTEGER :: JSV ! CCN or IFN mode -INTEGER :: J1, J2, IJ, JMOD +INTEGER :: J1, J2, JMOD ! LOGICAL, DIMENSION(SIZE(PRHODREF,1),SIZE(PRHODREF,2),SIZE(PRHODREF,3)) & :: GRAIN, &! Test where rain is present @@ -149,7 +149,6 @@ REAL :: ZDENS_RATIO, & !density ratio ZNUM, & !PNU-1. ZSHAPE_FACTOR ! -REAL, DIMENSION(SIZE(PZZ,1),SIZE(PZZ,2),SIZE(PZZ,3)) :: ZW ! work array REAL, DIMENSION(SIZE(PZZ,1),SIZE(PZZ,2),SIZE(PZZ,3)) :: PCRT ! cloud droplet conc. ! REAL, DIMENSION(:), ALLOCATABLE :: ZLAMBDAR, & !slope parameter of the @@ -190,7 +189,6 @@ REAL, DIMENSION(:,:,:), ALLOCATABLE :: ZCOL_EF, &! Collision efficiency ZSIZE_RATIO, &! Size Ratio ZST ! Stokes number ! -REAL, DIMENSION(SIZE(PRRT,1),SIZE(PRRT,2),SIZE(PRRT,3)) :: ZRRS ! REAL, DIMENSION(SIZE(PRHODREF,1),SIZE(PRHODREF,2),SIZE(PRHODREF,3)) & :: PMEAN_SCAV_COEF, & !Mean Scavenging @@ -644,7 +642,7 @@ REAL, DIMENSION(:,:), INTENT(INOUT) :: PINPAP ! !* 0.2 Declarations of local variables : ! -INTEGER :: JJ, JK, JN, JRR ! Loop indexes +INTEGER :: JK, JN ! Loop indexes INTEGER :: IIB, IIE, IJB, IJE, IKB, IKE ! Physical domain ! REAL :: ZTSPLITR ! Small time step for rain sedimentation diff --git a/src/common/micro/modd_nebn.F90 b/src/common/micro/modd_nebn.F90 index f1dc34df0..459b4cfbd 100644 --- a/src/common/micro/modd_nebn.F90 +++ b/src/common/micro/modd_nebn.F90 @@ -129,8 +129,7 @@ SUBROUTINE NEBN_INIT(HPROGRAM, KUNITNML, LDNEEDNAM, KLUOUT, & ! --------------- ! USE MODE_POSNAM_PHY, ONLY: POSNAM_PHY -USE MODE_MSG, ONLY: PRINT_MSG, NVERB_FATAL -USE MODE_CHECK_NAM_VAL, ONLY: CHECK_NAM_VAL_CHAR, CHECK_NAM_VAL_REAL, CHECK_NAM_VAL_INT +USE MODE_CHECK_NAM_VAL, ONLY: CHECK_NAM_VAL_CHAR ! IMPLICIT NONE ! diff --git a/src/common/micro/modd_param_lima.F90 b/src/common/micro/modd_param_lima.F90 index 22baffab5..b1f61e2ee 100644 --- a/src/common/micro/modd_param_lima.F90 +++ b/src/common/micro/modd_param_lima.F90 @@ -589,7 +589,7 @@ SUBROUTINE PARAM_LIMA_INIT(HPROGRAM, KUNITNML, LDNEEDNAM, KLUOUT, & ! USE MODE_POSNAM_PHY, ONLY: POSNAM_PHY USE MODE_MSG, ONLY: PRINT_MSG, NVERB_FATAL -USE MODE_CHECK_NAM_VAL, ONLY: CHECK_NAM_VAL_CHAR, CHECK_NAM_VAL_REAL, CHECK_NAM_VAL_INT +USE MODE_CHECK_NAM_VAL, ONLY: CHECK_NAM_VAL_CHAR ! IMPLICIT NONE ! diff --git a/src/common/micro/mode_ice4_budgets.F90 b/src/common/micro/mode_ice4_budgets.F90 index 47d1df99a..9aa4f2eb9 100644 --- a/src/common/micro/mode_ice4_budgets.F90 +++ b/src/common/micro/mode_ice4_budgets.F90 @@ -25,7 +25,7 @@ USE MODD_PARAM_ICE_n, ONLY: PARAM_ICE_t ! USE MODD_FIELDS_ADDRESS ! index number for prognostic (theta and mixing ratios) and budgets ! -USE MODE_BUDGET_PHY, ONLY: BUDGET_STORE_ADD_PHY, BUDGET_STORE_INIT_PHY, BUDGET_STORE_END_PHY +USE MODE_BUDGET_PHY, ONLY: BUDGET_STORE_ADD_PHY ! ! IMPLICIT NONE diff --git a/src/common/micro/mode_ice4_fast_rh.F90 b/src/common/micro/mode_ice4_fast_rh.F90 index 44112410a..6ea2630e6 100644 --- a/src/common/micro/mode_ice4_fast_rh.F90 +++ b/src/common/micro/mode_ice4_fast_rh.F90 @@ -98,7 +98,7 @@ INTEGER, DIMENSION(KPROMA) :: IBUF1, IBUF2, IBUF3 REAL, DIMENSION(KPROMA) :: ZZW, & ZRDRYH_INIT, ZRWETH_INIT, & ZRDRYHG -INTEGER :: JJ, JL +INTEGER :: JL REAL(KIND=JPRB) :: ZHOOK_HANDLE LOGICAL, DIMENSION(KPROMA) :: LLWETH, LLDRYH ! diff --git a/src/common/micro/mode_ice4_fast_rs.F90 b/src/common/micro/mode_ice4_fast_rs.F90 index 415869a19..3545799c2 100644 --- a/src/common/micro/mode_ice4_fast_rs.F90 +++ b/src/common/micro/mode_ice4_fast_rs.F90 @@ -89,7 +89,7 @@ INTEGER :: IGRIM, IGACC INTEGER, DIMENSION(KPROMA) :: IBUF1, IBUF2, IBUF3 REAL, DIMENSION(KPROMA) :: ZBUF1, ZBUF2, ZBUF3 REAL, DIMENSION(KPROMA) :: ZZW, ZZW1, ZZW2, ZZW3, ZFREEZ_RATE -INTEGER :: JJ, JL +INTEGER :: JL REAL :: ZZW0D REAL(KIND=JPRB) :: ZHOOK_HANDLE !------------------------------------------------------------------------------- diff --git a/src/common/micro/mode_ice4_sedimentation.F90 b/src/common/micro/mode_ice4_sedimentation.F90 index eddcadf26..e0a0d6ab7 100644 --- a/src/common/micro/mode_ice4_sedimentation.F90 +++ b/src/common/micro/mode_ice4_sedimentation.F90 @@ -34,7 +34,7 @@ SUBROUTINE ICE4_SEDIMENTATION(D, CST, ICEP, ICED, PARAMI, BUCONF, & USE PARKIND1, ONLY : JPRB USE YOMHOOK , ONLY : LHOOK, DR_HOOK USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t -USE MODD_BUDGET, ONLY: TBUDGETDATA, TBUDGETCONF_t, NBUDGET_TH, NBUDGET_RV, NBUDGET_RC, & +USE MODD_BUDGET, ONLY: TBUDGETDATA, TBUDGETCONF_t, NBUDGET_RC, & NBUDGET_RI, NBUDGET_RR, NBUDGET_RS, NBUDGET_RG, NBUDGET_RH USE MODD_CST, ONLY: CST_t USE MODD_RAIN_ICE_DESCR_n, ONLY: RAIN_ICE_DESCR_t diff --git a/src/common/micro/mode_ice4_sedimentation_split.F90 b/src/common/micro/mode_ice4_sedimentation_split.F90 index 83402d58a..e72dfba7d 100644 --- a/src/common/micro/mode_ice4_sedimentation_split.F90 +++ b/src/common/micro/mode_ice4_sedimentation_split.F90 @@ -88,7 +88,7 @@ REAL, DIMENSION(D%NIJT,D%NKT,KRR), OPTIONAL, INTENT(OUT) :: PFPR ! upper-ai ! ! INTEGER :: JIJ, JK -INTEGER :: IKTB, IKTE, IKB, IKL, IIJE, IIJB +INTEGER :: IKTB, IKTE, IIJE, IIJB INTEGER :: IRR !Workaround of PGI bug with OpenACC (at least up to 18.10 version) LOGICAL :: GSEDIC !Workaround of PGI bug with OpenACC (at least up to 18.10 version) LOGICAL :: GPRESENT_PFPR, GPRESENT_PSEA @@ -311,7 +311,7 @@ REAL, DIMENSION(D%NIJT,D%NKT,KRR), INTENT(INOUT), OPTIONAL :: PFPR ! upper-ai !* 0.2 declaration of local variables ! CHARACTER(LEN=10) :: YSPE ! String for error message -INTEGER :: JIJ, JK, JL +INTEGER :: JIJ, JK LOGICAL :: GPRESENT_PFPR REAL :: ZINVTSTEP REAL :: ZZWLBDC, ZRAY, ZZT, ZZWLBDA, ZZCC diff --git a/src/common/micro/mode_ice4_sedimentation_stat.F90 b/src/common/micro/mode_ice4_sedimentation_stat.F90 index 1c4385047..fe8e820df 100644 --- a/src/common/micro/mode_ice4_sedimentation_stat.F90 +++ b/src/common/micro/mode_ice4_sedimentation_stat.F90 @@ -91,7 +91,7 @@ REAL, DIMENSION(D%NIJT,D%NKT,KRR), OPTIONAL, INTENT(OUT) :: PFPR ! upper-ai LOGICAL :: LLSEA_AND_TOWN INTEGER :: JRR, JIJ, JK, IKB, IKE,IKL, IIJB, IIJE, IKTB, IKTE INTEGER :: ISHIFT, IK, IKPLUS -REAL :: ZQP, ZP1, ZINVTSTEP, ZGAC, ZGC, ZGAC2, ZGC2, ZRAYDEFO, ZLBDAS +REAL :: ZQP, ZINVTSTEP, ZGAC, ZGC, ZGAC2, ZGC2, ZRAYDEFO, ZLBDAS REAL, DIMENSION(D%NIJT) :: ZWSEDW1, ZWSEDW2 ! sedimentation speed REAL, DIMENSION(D%NIJT) :: ZTSORHODZ ! TimeStep Over (Rhodref times delta Z) REAL, DIMENSION(D%NIJT,0:1,2:KRR) :: ZSED ! sedimentation flux array for each species and for above and current levels @@ -253,7 +253,7 @@ CONTAINS REAL :: ZRAY ! Cloud Mean radius REAL :: ZZWLBDA, ZZWLBDC, ZZCC - REAL(KIND=JPRB) :: ZHOOK_HANDLE + !!REAL(KIND=JPRB) :: ZHOOK_HANDLE !!IF (LHOOK) CALL DR_HOOK('ICE4_SEDIMENTATION_STAT:CLOUD',0,ZHOOK_HANDLE) @@ -312,7 +312,7 @@ CONTAINS REAL, INTENT(IN) :: PRXT(D%NIJT) ! mr of specy X - REAL(KIND=JPRB) :: ZHOOK_HANDLE + !!REAL(KIND=JPRB) :: ZHOOK_HANDLE !!IF (LHOOK) CALL DR_HOOK('ICE4_SEDIMENTATION_STAT:PRISTINE_ICE',0,ZHOOK_HANDLE) @@ -359,7 +359,7 @@ CONTAINS REAL, INTENT(IN) :: PRXT(D%NIJT) ! mr of specy X - REAL(KIND=JPRB) :: ZHOOK_HANDLE + !!REAL(KIND=JPRB) :: ZHOOK_HANDLE !!IF (LHOOK) CALL DR_HOOK('ICE4_SEDIMENTATION_STAT:SNOW',0,ZHOOK_HANDLE) @@ -418,7 +418,7 @@ CONTAINS REAL, INTENT(IN) :: PEXSED REAL, INTENT(IN) :: PRXT(D%NIJT) ! mr of specy X - REAL(KIND=JPRB) :: ZHOOK_HANDLE + !!REAL(KIND=JPRB) :: ZHOOK_HANDLE !!IF (LHOOK) CALL DR_HOOK('ICE4_SEDIMENTATION_STAT:OTHER_SPECIES',0,ZHOOK_HANDLE) diff --git a/src/common/micro/mode_ice4_slow.F90 b/src/common/micro/mode_ice4_slow.F90 index cdf1e056e..03a55ed21 100644 --- a/src/common/micro/mode_ice4_slow.F90 +++ b/src/common/micro/mode_ice4_slow.F90 @@ -71,7 +71,6 @@ REAL, DIMENSION(KPROMA), INTENT(INOUT) :: PRVDEPG ! Deposition on r_g !* 0.2 declaration of local variables ! REAL, DIMENSION(KPROMA) :: ZCRIAUTI -REAL :: ZTIMAUTIC INTEGER :: JL REAL(KIND=JPRB) :: ZHOOK_HANDLE !------------------------------------------------------------------------------- diff --git a/src/common/micro/mode_ice4_stepping.F90 b/src/common/micro/mode_ice4_stepping.F90 index 6cb5d7421..98a45c583 100644 --- a/src/common/micro/mode_ice4_stepping.F90 +++ b/src/common/micro/mode_ice4_stepping.F90 @@ -44,8 +44,6 @@ USE MODD_FIELDS_ADDRESS, ONLY : & ! common fields adress & IRREVAV, & ! Index for the evaporation tendency & IBUEXTRAIND ! Index indirection -USE MODE_MSG, ONLY: PRINT_MSG, NVERB_FATAL - USE MODE_ICE4_TENDENCIES, ONLY: ICE4_TENDENCIES ! IMPLICIT NONE diff --git a/src/common/micro/mode_ice4_tendencies.F90 b/src/common/micro/mode_ice4_tendencies.F90 index 42994ff49..46c7d8e03 100644 --- a/src/common/micro/mode_ice4_tendencies.F90 +++ b/src/common/micro/mode_ice4_tendencies.F90 @@ -39,7 +39,6 @@ SUBROUTINE ICE4_TENDENCIES(D, CST, PARAMI, ICEP, ICED, BUCONF, KPROMA, KSIZE, & ! USE MODD_BUDGET, ONLY: TBUDGETCONF_t USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t -USE MODE_MSG, ONLY: PRINT_MSG, NVERB_FATAL USE MODD_CST, ONLY: CST_t USE MODD_PARAM_ICE_n, ONLY: PARAM_ICE_t USE MODD_RAIN_ICE_DESCR_n, ONLY: RAIN_ICE_DESCR_t diff --git a/src/common/micro/mode_icecloud.F90 b/src/common/micro/mode_icecloud.F90 index e05effa6e..8ba69db98 100644 --- a/src/common/micro/mode_icecloud.F90 +++ b/src/common/micro/mode_icecloud.F90 @@ -10,7 +10,7 @@ SUBROUTINE ICECLOUD & USE PARKIND1, ONLY : JPRB USE YOMHOOK , ONLY : LHOOK, DR_HOOK USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t - USE MODD_CST,ONLY : XCPD,XCPV,XLVTT,XLSTT,XG,XRD,XEPSILO + USE MODD_CST,ONLY : XCPD,XLVTT,XG,XRD,XEPSILO USE MODE_TIWMX, ONLY: ESATW, ESATI USE MODE_QSATMX_TAB, ONLY: QSATMX_TAB IMPLICIT NONE @@ -73,7 +73,7 @@ REAL, INTENT(OUT) :: RSI(D%NIJT) ! Working variables: REAL :: ZSIGMAX,ZSIGMAY,ZSIGMAZ,ZXDIST,ZYDIST,& - & ZRSW,ZRHW,ZRHIN,ZDRHDZ,ZZ,ZRHDIST,ZRHLIM, & + & ZRHW,ZRHIN,ZDRHDZ,ZZ,ZRHDIST,ZRHLIM, & & ZRHDIF,ZWCLD,ZI2W,ZRHLIMICE,ZRHLIMINV,ZA,ZRHI,ZR INTEGER :: JIJ, IIJB, IIJE diff --git a/src/common/micro/mode_ini_lima.F90 b/src/common/micro/mode_ini_lima.F90 index 5c834e5c7..3fba2eaab 100644 --- a/src/common/micro/mode_ini_lima.F90 +++ b/src/common/micro/mode_ini_lima.F90 @@ -63,8 +63,6 @@ REAL :: ZT ! Work variable REAL, DIMENSION(7) :: ZVTRMAX ! INTEGER :: JI -INTEGER :: ILUOUT0 ! Logical unit number for output-listing -INTEGER :: IRESP ! Return code of FM-routines ! !------------------------------------------------------------------------------- ! diff --git a/src/common/micro/mode_ini_lima_cold_mixed.F90 b/src/common/micro/mode_ini_lima_cold_mixed.F90 index 88f340867..e87748470 100644 --- a/src/common/micro/mode_ini_lima_cold_mixed.F90 +++ b/src/common/micro/mode_ini_lima_cold_mixed.F90 @@ -80,13 +80,11 @@ REAL, INTENT(IN) :: PDZMIN ! minimun vertical mesh size character(len=13) :: yval ! String for error message INTEGER :: IKB ! Coordinates of the first physical ! points along z -INTEGER :: J1,J2 ! Internal loop indexes +INTEGER :: J1 ! Internal loop indexes ! REAL, DIMENSION(8) :: ZGAMI ! parameters involving various moments REAL, DIMENSION(2) :: ZGAMS ! of the generalized gamma law ! -REAL :: ZT ! Work variable -REAL :: ZVTRMAX ! Raindrop maximal fall velocity REAL :: ZRHO00 ! Surface reference air density REAL :: ZRATE ! Geometrical growth of Lbda in the tabulated ! functions and kernels @@ -109,7 +107,7 @@ INTEGER :: KND INTEGER :: KACCLBDAS,KACCLBDAR,KDRYLBDAG,KDRYLBDAS,KDRYLBDAR REAL :: PALPHAR,PALPHAS,PALPHAG,PALPHAH REAL :: PNUR,PNUS,PNUG,PNUH -REAL :: PBR,PBS,PBG,PBH +REAL :: PBR,PBS,PBG REAL :: PCR,PCS,PCG,PCH REAL :: PDR,PDS,PFVELOS,PDG,PDH REAL :: PESR,PEGS,PEGR,PEHS,PEHG @@ -123,20 +121,15 @@ INTEGER :: KWETLBDAS,KWETLBDAG,KWETLBDAH ! REAL :: ZFAC_ZRNIC ! Zrnic factor used to decrease Long Kernels ! -REAL :: ZBOUND_CIBU_SMIN ! XDCSLIM*Lbda_s : lower & upper bound used -REAL :: ZBOUND_CIBU_SMAX ! in the tabulated function -REAL :: ZBOUND_CIBU_GMIN ! XDCGLIM*Lbda_g : lower & upper bound used -REAL :: ZBOUND_CIBU_GMAX ! in the tabulated function +REAL :: ZBOUND_CIBU_SMIN ! XDCSLIM*Lbda_s : lower bound used in the tabulated function +REAL :: ZBOUND_CIBU_GMIN ! XDCGLIM*Lbda_g : lower bound used in the tabulated function REAL :: ZRATE_S ! Geometrical growth of Lbda_s in the tabulated function REAL :: ZRATE_G ! Geometrical growth of Lbda_g in the tabulated function ! -REAL :: ZBOUND_RDSF_RMIN ! XDCRLIM*Lbda_r : lower & upper bound used -REAL :: ZBOUND_RDSF_RMAX ! in the tabulated function +REAL :: ZBOUND_RDSF_RMIN ! XDCRLIM*Lbda_r : lower bound used in the tabulated function REAL :: ZRATE_R ! Geometrical growth of Lbda_r in the tabulated function REAL :: ZKHI_LWM ! Coefficient of Lawson et al. (2015) ! -REAL :: ZRHOIW ! ice density -! !------------------------------------------------------------------------------- ! ! diff --git a/src/common/micro/mode_ini_lima_warm.F90 b/src/common/micro/mode_ini_lima_warm.F90 index 47ed2c23b..f3f8d60c1 100644 --- a/src/common/micro/mode_ini_lima_warm.F90 +++ b/src/common/micro/mode_ini_lima_warm.F90 @@ -67,9 +67,7 @@ REAL, DIMENSION(6) :: ZGAMC, ZGAMR ! parameters involving various moments of REAL :: ZTT ! Temperature in Celsius REAL :: ZLV ! Latent heat of vaporization REAL :: ZSS ! Supersaturation -REAL :: ZPSI1, ZG ! Psi1 and G functions -REAL :: ZAHENR ! r_star (FH92) -REAL :: ZVTRMAX ! Raindrop maximal fall velocity +REAL :: ZG ! G function REAL :: ZRHO00 ! Surface reference air density REAL :: ZSURF_TEN ! Water drop surface tension REAL :: ZSMIN, ZSMAX ! Minimal and maximal supersaturation used to diff --git a/src/common/micro/mode_ini_tiwmx.F90 b/src/common/micro/mode_ini_tiwmx.F90 index 22b1432a8..4e69d5de7 100644 --- a/src/common/micro/mode_ini_tiwmx.F90 +++ b/src/common/micro/mode_ini_tiwmx.F90 @@ -3,8 +3,6 @@ IMPLICIT NONE CONTAINS SUBROUTINE INI_TIWMX USE PARKIND1, ONLY : JPRB - USE MODD_CST, ONLY : XALPW,XBETAW,XGAMW,XALPI,XBETAI,XGAMI, & - & XTT,XRV,XLVTT,XLSTT ! Include function definitions USE MODE_TIWMX_FUN, ONLY : ESATW,DESDTW,ESATI,DESDTI,AA2,AA2W,AM3,AF3,BB3,BB3W,REDIN ! Only the tables, _NOT_ the functions! diff --git a/src/common/micro/mode_init_aerosol_properties.F90 b/src/common/micro/mode_init_aerosol_properties.F90 index e23662ec0..a936ac46f 100644 --- a/src/common/micro/mode_init_aerosol_properties.F90 +++ b/src/common/micro/mode_init_aerosol_properties.F90 @@ -45,8 +45,7 @@ CONTAINS USE MODD_PARAM_LIMA, ONLY : NMOD_CCN, HINI_CCN, HTYPE_CCN, & XR_MEAN_CCN, XLOGSIG_CCN, XRHO_CCN, & XKHEN_MULTI, XMUHEN_MULTI, XBETAHEN_MULTI, & - XLIMIT_FACTOR, CCCN_MODES, LSCAV, & - XACTEMP_CCN, XFSOLUB_CCN, & + XLIMIT_FACTOR, CCCN_MODES, & NMOD_IFN, NSPECIE, CIFN_SPECIES, & XMDIAM_IFN, XSIGMA_IFN, XRHO_IFN, XFRAC, XFRAC_REF, & CINT_MIXING, NPHILLIPS, & @@ -60,18 +59,6 @@ USE MODE_LIMA_INIT_CCN_ACTIVATION_SPECTRUM, ONLY: LIMA_INIT_CCN_ACTIVATION_SPECT ! IMPLICIT NONE ! -REAL :: XKHEN0 -REAL :: XLOGSIG0 -REAL :: XALPHA1 -REAL :: XMUHEN0 -REAL :: XALPHA2 -REAL :: XBETAHEN0 -REAL :: XR_MEAN0 -REAL :: XALPHA3 -REAL :: XALPHA4 -REAL :: XALPHA5 -REAL :: XACTEMP0 -REAL :: XALPHA6 ! REAL, DIMENSION(6) :: XKHEN_TMP = (/1.56, 1.56, 1.56, 1.56, 1.56, 1.56 /) REAL, DIMENSION(6) :: XMUHEN_TMP = (/0.80, 0.80, 0.80, 0.80, 0.80, 0.80 /) @@ -92,7 +79,6 @@ REAL :: X1, X2, X3, X4, X5 ! CHARACTER(LEN=7), DIMENSION(3) :: types=(/ 'NH42SO4', 'NaCl ', ' ' /) !REAL, DIMENSION(1) :: diameters=(/ 0.25E-6 /) !CHARACTER(LEN=7), DIMENSION(1) :: types=(/ ' ' /) -INTEGER :: II, IJ, IK ! !------------------------------------------------------------------------------- ! diff --git a/src/common/micro/mode_lima_ccn_activation.F90 b/src/common/micro/mode_lima_ccn_activation.F90 index cb3ed2cd0..38732eee8 100644 --- a/src/common/micro/mode_lima_ccn_activation.F90 +++ b/src/common/micro/mode_lima_ccn_activation.F90 @@ -136,7 +136,7 @@ REAL, DIMENSION(:), ALLOCATABLE :: ZZW1, ZZW2, ZZW3, ZZW4, ZZW5, ZZW6, & REAL, DIMENSION(:,:), ALLOCATABLE :: ZTMP, ZCHEN_MULTI ! REAL, DIMENSION(SIZE(PRHODREF,1),SIZE(PRHODREF,2),SIZE(PRHODREF,3)) & - :: ZTDT, ZDRC, ZRVSAT, ZW, ZW2, ZCLDFR + :: ZTDT, ZRVSAT, ZW, ZW2, ZCLDFR REAL, DIMENSION(SIZE(PNFT,1),SIZE(PNFT,2),SIZE(PNFT,3)) & :: ZCONC_TOT ! total CCN C. available ! diff --git a/src/common/micro/mode_lima_ccn_hom_freezing.F90 b/src/common/micro/mode_lima_ccn_hom_freezing.F90 index 25744d42a..38f760fc5 100644 --- a/src/common/micro/mode_lima_ccn_hom_freezing.F90 +++ b/src/common/micro/mode_lima_ccn_hom_freezing.F90 @@ -38,14 +38,11 @@ CONTAINS USE MODD_CST, ONLY: CST_t USE MODD_NSV USE MODD_PARAMETERS, ONLY: JPHEXT, JPVEXT -USE MODD_PARAM_LIMA, ONLY: NMOD_CCN, NMOD_IMM, XRTMIN, XCTMIN, XNUC +USE MODD_PARAM_LIMA, ONLY: NMOD_CCN USE MODD_PARAM_LIMA_COLD, ONLY: XRCOEF_HONH, XCEXP_DIFVAP_HONH, XCOEF_DIFVAP_HONH,& XCRITSAT1_HONH, XCRITSAT2_HONH, XTMAX_HONH, & XTMIN_HONH, XC1_HONH, XC2_HONH, XC3_HONH, & - XDLNJODT1_HONH, XDLNJODT2_HONH, XRHOI_HONH, & - XC_HONC, XTEXP1_HONC, XTEXP2_HONC, XTEXP3_HONC, & - XTEXP4_HONC, XTEXP5_HONC -USE MODD_PARAM_LIMA_WARM, ONLY: XLBC + XDLNJODT1_HONH, XDLNJODT2_HONH, XRHOI_HONH ! use mode_tools, only: Countjv ! @@ -99,11 +96,10 @@ REAL, DIMENSION(SIZE(PRHODREF,1),SIZE(PRHODREF,2),SIZE(PRHODREF,3)) & :: ZNHT ! Nucleated Ice nuclei conc. source ! by Homogeneous freezing of haze REAL, DIMENSION(SIZE(PRHODREF,1),SIZE(PRHODREF,2),SIZE(PRHODREF,3)) & - :: ZW, ZT ! work arrays + :: ZT ! work arrays ! REAL, DIMENSION(:), ALLOCATABLE & :: ZRHODREF, & ! RHO Dry REFerence - ZRHODJ, & ! RHO times Jacobian ZZT, & ! Temperature ZPRES, & ! Pressure ZEXNREF, & ! EXNer Pressure REFerence @@ -125,11 +121,11 @@ REAL, DIMENSION(:), ALLOCATABLE & ZCCNFROZEN ! INTEGER :: IIB, IIE, IJB, IJE, IKB, IKE ! Physical domain -INTEGER :: JL, JMOD_CCN, JMOD_IMM ! Loop index +INTEGER :: JL, JMOD_CCN ! Loop index ! INTEGER :: INEGT ! Case number of hom. nucleation LOGICAL, DIMENSION(SIZE(PRHODREF,1),SIZE(PRHODREF,2),SIZE(PRHODREF,3)) & - :: GNEGT ! Test where to compute the hom. nucleation + :: GNEGT ! Test where to compute the hom. nucleation INTEGER , DIMENSION(SIZE(GNEGT)) :: I1,I2,I3 ! Used to replace the COUNT ! REAL :: ZEPS ! molar mass ratio diff --git a/src/common/micro/mode_lima_collisional_ice_breakup.F90 b/src/common/micro/mode_lima_collisional_ice_breakup.F90 index 58a040f5a..35542d9c2 100644 --- a/src/common/micro/mode_lima_collisional_ice_breakup.F90 +++ b/src/common/micro/mode_lima_collisional_ice_breakup.F90 @@ -36,7 +36,7 @@ CONTAINS USE MODD_PARAM_LIMA, ONLY : LCIBU, XRTMIN, XCTMIN, XCEXVT, XALPHAS, XNUS, XNDEBRIS_CIBU USE MODD_PARAM_LIMA_COLD, ONLY : XBS, XCS, XDS, XFVELOS, XMNU0 -USE MODD_PARAM_LIMA_MIXED, ONLY : XCG, XDG, XCXG, & +USE MODD_PARAM_LIMA_MIXED, ONLY : XCG, XDG, & XCIBUINTP_S, XCIBUINTP1_S, XCIBUINTP2_S, & XCIBUINTP_G, XCIBUINTP1_G, & XFACTOR_CIBU_NI, XFACTOR_CIBU_RI, & diff --git a/src/common/micro/mode_lima_compute_cloud_fractions.F90 b/src/common/micro/mode_lima_compute_cloud_fractions.F90 index 98ac4ae51..325e04864 100644 --- a/src/common/micro/mode_lima_compute_cloud_fractions.F90 +++ b/src/common/micro/mode_lima_compute_cloud_fractions.F90 @@ -69,7 +69,6 @@ REAL, DIMENSION(:,:,:),INTENT(INOUT) :: PPRCFR ! ! !* 0.2 Declarations of local variables : ! -INTEGER :: JI, JJ, JK ! !------------------------------------------------------------------------------- ! diff --git a/src/common/micro/mode_lima_conversion_melting_snow.F90 b/src/common/micro/mode_lima_conversion_melting_snow.F90 index 0921e3f73..32537b585 100644 --- a/src/common/micro/mode_lima_conversion_melting_snow.F90 +++ b/src/common/micro/mode_lima_conversion_melting_snow.F90 @@ -38,7 +38,7 @@ CONTAINS USE MODD_CST, ONLY : XTT, XMV, XMD, XLVTT, XCPV, XCL, XESTT, XRV USE MODD_PARAM_LIMA, ONLY : XRTMIN, XCTMIN, XNUS, XALPHAS USE MODD_PARAM_LIMA_MIXED, ONLY : XFSCVMG -USE MODD_PARAM_LIMA_COLD, ONLY : X0DEPS, XEX0DEPS, X1DEPS, XEX1DEPS, XBS, XFVELOS +USE MODD_PARAM_LIMA_COLD, ONLY : X0DEPS, XEX0DEPS, X1DEPS, XEX1DEPS, XFVELOS ! IMPLICIT NONE ! diff --git a/src/common/micro/mode_lima_droplets_riming_snow.F90 b/src/common/micro/mode_lima_droplets_riming_snow.F90 index 70ab95d47..9974166a1 100644 --- a/src/common/micro/mode_lima_droplets_riming_snow.F90 +++ b/src/common/micro/mode_lima_droplets_riming_snow.F90 @@ -42,7 +42,7 @@ USE MODD_PARAM_LIMA, ONLY : XRTMIN, XCTMIN, XCEXVT, XNUS, XALPHAS, LMURAKA USE MODD_PARAM_LIMA_MIXED, ONLY : NGAMINC, XRIMINTP1, XRIMINTP2, XGAMINC_RIM1, XGAMINC_RIM2, XGAMINC_RIM4, & XCRIMSS, XEXCRIMSS, XSRIMCG, XEXSRIMCG, XSRIMCG2, XSRIMCG3, XEXSRIMCG2, & XHMLINTP1, XHMLINTP2, XGAMINC_HMC, XHM_FACTS, XHMTMIN, XHMTMAX -USE MODD_PARAM_LIMA_COLD, ONLY : XMNU0, XBS, XFVELOS +USE MODD_PARAM_LIMA_COLD, ONLY : XMNU0, XFVELOS ! IMPLICIT NONE ! @@ -78,7 +78,7 @@ REAL, DIMENSION(:), INTENT(OUT) :: P_RS_HMS ! REAL, DIMENSION(SIZE(PRCT)) :: ZZW1, ZZW2, ZZW3, ZZW4, ZZW5 ! -INTEGER, DIMENSION(SIZE(PRCT)) :: IVEC1,IVEC2 ! Vectors of indices +INTEGER, DIMENSION(SIZE(PRCT)) :: IVEC2 ! Vector of indices REAL, DIMENSION(SIZE(PRCT)) :: ZVEC1,ZVEC2,ZVEC1W ! Work vectors INTEGER :: JI ! diff --git a/src/common/micro/mode_lima_drops_break_up.F90 b/src/common/micro/mode_lima_drops_break_up.F90 index e2b36c2ab..67f119b54 100644 --- a/src/common/micro/mode_lima_drops_break_up.F90 +++ b/src/common/micro/mode_lima_drops_break_up.F90 @@ -52,7 +52,6 @@ REAL, DIMENSION(:), INTENT(INOUT) :: PB_CR ! Cumulated concentrati !* 0.2 Declarations of local variables : ! REAL, DIMENSION(SIZE(PCRT)) :: ZWLBDR,ZWLBDR3 -INTEGER :: JL ! !------------------------------------------------------------------------------- ! diff --git a/src/common/micro/mode_lima_drops_to_droplets_conv.F90 b/src/common/micro/mode_lima_drops_to_droplets_conv.F90 index 808bed240..daaf68b45 100644 --- a/src/common/micro/mode_lima_drops_to_droplets_conv.F90 +++ b/src/common/micro/mode_lima_drops_to_droplets_conv.F90 @@ -33,8 +33,6 @@ CONTAINS ! USE MODD_CST, ONLY : CST_t USE MODD_PARAM_LIMA, ONLY : XRTMIN, XCTMIN -USE MODD_PARAM_LIMA_WARM, ONLY : XLBR, XLBEXR, XLBC, XLBEXC, & - XACCR1, XACCR3, XACCR4, XACCR5 ! IMPLICIT NONE ! @@ -58,7 +56,6 @@ REAL, DIMENSION(SIZE(PRCT,1),SIZE(PRCT,2),SIZE(PRCT,3)) :: ZDR ! LOGICAL, DIMENSION(SIZE(PRCT,1),SIZE(PRCT,2),SIZE(PRCT,3)) :: ZMASKR, ZMASKC ! -REAL :: ZFACT ! ! ! diff --git a/src/common/micro/mode_lima_graupel.F90 b/src/common/micro/mode_lima_graupel.F90 index 74f8bff58..84f56e43d 100644 --- a/src/common/micro/mode_lima_graupel.F90 +++ b/src/common/micro/mode_lima_graupel.F90 @@ -46,9 +46,9 @@ CONTAINS !* 0. DECLARATIONS ! ------------ ! -USE MODD_CST, ONLY : XTT, XMD, XMV, XRD, XRV, XLVTT, XLMTT, XESTT, XCL, XCI, XCPV +USE MODD_CST, ONLY : XTT, XMD, XMV, XRV, XLVTT, XLMTT, XESTT, XCL, XCI, XCPV USE MODD_PARAM_LIMA, ONLY : XRTMIN, XCTMIN, XCEXVT, NMOM_H -USE MODD_PARAM_LIMA_MIXED, ONLY : XCXG, XDG, X0DEPG, X1DEPG, NGAMINC, & +USE MODD_PARAM_LIMA_MIXED, ONLY : XDG, X0DEPG, X1DEPG, NGAMINC, & XFCDRYG, XFIDRYG, XCOLIG, XCOLSG, XCOLEXIG, XCOLEXSG, & XFSDRYG, XLBSDRYG1, XLBSDRYG2, XLBSDRYG3, XKER_SDRYG, & XFNSDRYG, XLBNSDRYG1, XLBNSDRYG2, XLBNSDRYG3, XKER_N_SDRYG, & @@ -59,7 +59,7 @@ USE MODD_PARAM_LIMA_MIXED, ONLY : XCXG, XDG, X0DEPG, X1DEPG, NGAMINC, XDRYINTP1R, XDRYINTP1S, XDRYINTP1G, & XDRYINTP2R, XDRYINTP2S, XDRYINTP2G, & NDRYLBDAR, NDRYLBDAS, NDRYLBDAG -USE MODD_PARAM_LIMA_COLD, ONLY : XMNU0, XCXS, XBS +USE MODD_PARAM_LIMA_COLD, ONLY : XMNU0 ! IMPLICIT NONE ! @@ -146,8 +146,6 @@ REAL, DIMENSION(:), INTENT(INOUT) :: PA_CH !* 0.2 Declarations of local variables : ! LOGICAL, DIMENSION(SIZE(PRCT)) :: GDRY -INTEGER :: IGDRY -INTEGER :: JJ ! REAL, DIMENSION(SIZE(PRCT)) :: Z1, Z2, Z3, Z4 REAL, DIMENSION(SIZE(PRCT)) :: ZZX, ZZW, ZZW1, ZZW2, ZZW3, ZZW4, ZZW5, ZZW6, ZZW7 diff --git a/src/common/micro/mode_lima_hail.F90 b/src/common/micro/mode_lima_hail.F90 index 8c3f23c4e..7c0231d89 100644 --- a/src/common/micro/mode_lima_hail.F90 +++ b/src/common/micro/mode_lima_hail.F90 @@ -44,7 +44,7 @@ CONTAINS !* 0. DECLARATIONS ! ------------ ! -USE MODD_CST, ONLY : XTT, XMD, XMV, XRD, XRV, XLVTT, XLMTT, XESTT, XCL, XCI, XCPV +USE MODD_CST, ONLY : XTT, XMD, XMV, XRV, XLVTT, XLMTT, XESTT, XCL, XCI, XCPV USE MODD_PARAM_LIMA, ONLY : XRTMIN, XCTMIN, XCEXVT USE MODD_PARAM_LIMA_MIXED, ONLY : NWETLBDAG, XWETINTP1G, XWETINTP2G, & NWETLBDAH, X0DEPH, X1DEPH, XDH, XEX0DEPH, XEX1DEPH, & @@ -56,7 +56,6 @@ USE MODD_PARAM_LIMA_MIXED, ONLY : NWETLBDAG, XWETINTP1G, XWETINTP2G, & XFGWETH, XLBGWETH1, XLBGWETH2, XLBGWETH3, & XFNGWETH, XLBNGWETH1, XLBNGWETH2, XLBNGWETH3 -USE MODD_PARAM_LIMA_COLD, ONLY : XMNU0, XCXS, XBS ! IMPLICIT NONE ! @@ -134,17 +133,15 @@ REAL, DIMENSION(:), INTENT(INOUT) :: PA_CH !* 0.2 Declarations of local variables : ! LOGICAL, DIMENSION(SIZE(PRCT)) :: GWET -INTEGER :: JJ ! REAL, DIMENSION(SIZE(PRCT)) :: Z1, Z2, Z3, Z4 -REAL, DIMENSION(SIZE(PRCT)) :: ZZX, ZZW, ZZW1, ZZW2, ZZW3, ZZW4, ZZW5, ZZW6 -REAL, DIMENSION(SIZE(PRCT)) :: ZZW3N, ZZW4N, ZZW6N +REAL, DIMENSION(SIZE(PRCT)) :: ZZW, ZZW1, ZZW2, ZZW3, ZZW4, ZZW5, ZZW6 +REAL, DIMENSION(SIZE(PRCT)) :: ZZW3N, ZZW4N REAL, DIMENSION(SIZE(PRCT)) :: ZRWETH ! INTEGER, DIMENSION(SIZE(PRCT)) :: IVEC1,IVEC2 ! Vectors of indices REAL, DIMENSION(SIZE(PRCT)) :: ZVEC1,ZVEC2, ZVEC3 ! Work vectors ! -INTEGER :: NHAIL REAL :: ZTHRH, ZTHRC ! !------------------------------------------------------------------------------- diff --git a/src/common/micro/mode_lima_ice_aggregation_snow.F90 b/src/common/micro/mode_lima_ice_aggregation_snow.F90 index 03f4c10b2..c442ab8b0 100644 --- a/src/common/micro/mode_lima_ice_aggregation_snow.F90 +++ b/src/common/micro/mode_lima_ice_aggregation_snow.F90 @@ -38,8 +38,8 @@ CONTAINS ! USE MODD_CST, ONLY : XTT USE MODD_PARAM_LIMA, ONLY : XRTMIN, XCTMIN, XCEXVT, NMOM_I, XNUS, XALPHAS, XCEXVT -USE MODD_PARAM_LIMA_COLD, ONLY : XBI, XCCS, XCXS, XCOLEXIS, XAGGS_CLARGE1, XAGGS_CLARGE2, & - XAGGS_RLARGE1, XAGGS_RLARGE2, XFIAGGS, XBS, XNS, XFVELOS, XEXIAGGS +USE MODD_PARAM_LIMA_COLD, ONLY : XBI, XCOLEXIS, XAGGS_CLARGE1, XAGGS_CLARGE2, & + XAGGS_RLARGE1, XAGGS_RLARGE2, XFIAGGS, XFVELOS, XEXIAGGS ! IMPLICIT NONE ! diff --git a/src/common/micro/mode_lima_ice_deposition.F90 b/src/common/micro/mode_lima_ice_deposition.F90 index ed7540ca2..99ea4469c 100644 --- a/src/common/micro/mode_lima_ice_deposition.F90 +++ b/src/common/micro/mode_lima_ice_deposition.F90 @@ -40,15 +40,10 @@ CONTAINS !* 0. DECLARATIONS ! ------------ ! -USE MODD_PARAM_LIMA, ONLY : XRTMIN, XCTMIN, XALPHAI, XALPHAS, XNUI, XNUS,& +USE MODD_PARAM_LIMA, ONLY : XRTMIN, XCTMIN, XALPHAI, XNUI, & NMOM_I, NMOM_S -USE MODD_PARAM_LIMA_COLD, ONLY : XCXS, XCCS, & - XLBDAS_MAX, XDSCNVI_LIM, XLBDASCNVI_MAX, & - XC0DEPSI, XC1DEPSI, XR0DEPSI, XR1DEPSI, & - XSCFAC, XDICNVS_LIM, XLBDAICNVS_LIM, & +USE MODD_PARAM_LIMA_COLD, ONLY : XDICNVS_LIM, XLBDAICNVS_LIM, & XC0DEPIS, XC1DEPIS, XR0DEPIS, XR1DEPIS, & - XCOLEXIS, XAGGS_CLARGE1, XAGGS_CLARGE2, & - XAGGS_RLARGE1, XAGGS_RLARGE2, & XDI, X0DEPI, X2DEPI USE MODD_CST, ONLY : XTT ! diff --git a/src/common/micro/mode_lima_init_ccn_activation_spectrum.F90 b/src/common/micro/mode_lima_init_ccn_activation_spectrum.F90 index 69c448bce..a70652574 100644 --- a/src/common/micro/mode_lima_init_ccn_activation_spectrum.F90 +++ b/src/common/micro/mode_lima_init_ccn_activation_spectrum.F90 @@ -230,10 +230,9 @@ REAL :: PZRIDDR ! ! INTEGER, PARAMETER :: MAXIT=60 -REAL, PARAMETER :: UNUSED=0.0 !-1.11e30 REAL :: fh,fl, fm,fnew REAL :: s,xh,xl,xm,xnew -INTEGER :: j, JL +INTEGER :: j ! PZRIDDR= 999999. fl = DSDD(PX1,XDDRY,XKAPPA,XT) @@ -407,7 +406,7 @@ END FUNCTION DSDD ! integer I real C - real ZW, ZW2 + real ZW ! ! print *, "X = ", X IF ( ANY(X .LT.0.) .OR. X(1).gt.2*X(2)) THEN diff --git a/src/common/micro/mode_lima_nucleation_procs.F90 b/src/common/micro/mode_lima_nucleation_procs.F90 index a31c55210..58f9212cc 100644 --- a/src/common/micro/mode_lima_nucleation_procs.F90 +++ b/src/common/micro/mode_lima_nucleation_procs.F90 @@ -39,9 +39,7 @@ USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t USE MODD_BUDGET, ONLY: TBUDGETDATA, TBUDGETCONF_t USE MODD_CST, ONLY: CST_t use modd_budget, only: NBUDGET_TH, NBUDGET_RV, NBUDGET_RC, NBUDGET_RI, NBUDGET_SV1 -!USE MODD_IO, ONLY: TFILEDATA -USE MODD_PARAMETERS, ONLY : JPHEXT, JPVEXT -USE MODD_NSV, ONLY : NSV_LIMA_NC, NSV_LIMA_NR, NSV_LIMA_CCN_FREE, NSV_LIMA_CCN_ACTI, & +USE MODD_NSV, ONLY : NSV_LIMA_NC, NSV_LIMA_CCN_FREE, NSV_LIMA_CCN_ACTI, & NSV_LIMA_NI, NSV_LIMA_IFN_FREE, NSV_LIMA_IFN_NUCL, NSV_LIMA_IMM_NUCL, NSV_LIMA_HOM_HAZE USE MODD_PARAM_LIMA, ONLY : LNUCL, LMEYERS, LACTI, LHHONI, & NMOD_CCN, NMOD_IFN, NMOD_IMM, XCTMIN, XRTMIN, LSPRO, NMOM_I, NMOM_C diff --git a/src/common/micro/mode_lima_phillips_ifn_nucleation.F90 b/src/common/micro/mode_lima_phillips_ifn_nucleation.F90 index 37d4b321f..41b8b5762 100644 --- a/src/common/micro/mode_lima_phillips_ifn_nucleation.F90 +++ b/src/common/micro/mode_lima_phillips_ifn_nucleation.F90 @@ -75,7 +75,7 @@ USE MODD_CST, ONLY: CST_t USE MODD_PARAMETERS, ONLY : JPHEXT, JPVEXT USE MODD_PARAM_LIMA, ONLY : NMOD_IFN, NSPECIE, XFRAC, & NMOD_CCN, NMOD_IMM, NIND_SPECIE, NINDICE_CCN_IMM, & - XDSI0, XRTMIN, XCTMIN, NPHILLIPS + XDSI0, NPHILLIPS USE MODD_PARAM_LIMA_COLD, ONLY : XMNU0 use mode_tools, only: Countjv @@ -149,7 +149,6 @@ REAL, DIMENSION(:,:), ALLOCATABLE :: ZNIT ! Nucleated Ice nuclei conc. source ! REAL, DIMENSION(:), ALLOCATABLE & :: ZRHODREF, & ! RHO Dry REFerence - ZRHODJ, & ! RHO times Jacobian ZZT, & ! Temperature ZPRES, & ! Pressure ZEXNREF, & ! EXNer Pressure REFerence diff --git a/src/common/micro/mode_lima_sedimentation.F90 b/src/common/micro/mode_lima_sedimentation.F90 index dc6164d49..1efeb3191 100644 --- a/src/common/micro/mode_lima_sedimentation.F90 +++ b/src/common/micro/mode_lima_sedimentation.F90 @@ -47,12 +47,11 @@ CONTAINS ! USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t USE MODD_CST, ONLY: CST_t -USE MODD_PARAMETERS, ONLY: JPHEXT, JPVEXT USE MODD_PARAM_LIMA, ONLY: XCEXVT, XRTMIN, XCTMIN, NSPLITSED, & XLB, XLBEX, XD, XFSEDR, XFSEDC, & XALPHAC, XNUC, XALPHAS, XNUS, LSNOW_T, & NMOM_S -USE MODD_PARAM_LIMA_COLD, ONLY: XLBEXI, XLBI, XDI, XLBDAS_MAX, XBS, XEXSEDS, & +USE MODD_PARAM_LIMA_COLD, ONLY: XLBDAS_MAX, XBS, & XLBDAS_MIN, XTRANS_MP_GAMMAS, XFVELOS use mode_tools, only: Countjv diff --git a/src/common/micro/mode_lima_snow_deposition.F90 b/src/common/micro/mode_lima_snow_deposition.F90 index 0a520c063..c45153e9e 100644 --- a/src/common/micro/mode_lima_snow_deposition.F90 +++ b/src/common/micro/mode_lima_snow_deposition.F90 @@ -42,15 +42,11 @@ CONTAINS !* 0. DECLARATIONS ! ------------ ! -USE MODD_PARAM_LIMA, ONLY : XRTMIN, XCTMIN, XALPHAI, XALPHAS, XNUI, XNUS, NMOM_I -USE MODD_PARAM_LIMA_COLD, ONLY : XNS,XBS, & - XLBDAS_MAX, XDSCNVI_LIM, XLBDASCNVI_MAX, & +USE MODD_PARAM_LIMA, ONLY : XRTMIN, XCTMIN, XALPHAS, XNUS, NMOM_I +USE MODD_PARAM_LIMA_COLD, ONLY : XDSCNVI_LIM, XLBDASCNVI_MAX, & XC0DEPSI, XC1DEPSI, XR0DEPSI, XR1DEPSI, & - XSCFAC, X1DEPS, X0DEPS, XEX1DEPS, XEX0DEPS, & - XDICNVS_LIM, XLBDAICNVS_LIM, & - XC0DEPIS, XC1DEPIS, XR0DEPIS, XR1DEPIS, & - XCOLEXIS, XAGGS_CLARGE1, XAGGS_CLARGE2, & - XAGGS_RLARGE1, XAGGS_RLARGE2, XFVELOS + X1DEPS, X0DEPS, XEX1DEPS, XEX0DEPS, & + XFVELOS ! IMPLICIT NONE diff --git a/src/common/micro/mode_lima_snow_self_collection.F90 b/src/common/micro/mode_lima_snow_self_collection.F90 index 50339a87f..1a3bdb581 100644 --- a/src/common/micro/mode_lima_snow_self_collection.F90 +++ b/src/common/micro/mode_lima_snow_self_collection.F90 @@ -61,8 +61,8 @@ REAL, DIMENSION(SIZE(PCST)) :: & ZW2 LOGICAL, DIMENSION(SIZE(PCST)) :: GSSC INTEGER :: IGSSC, JJ -INTEGER, DIMENSION(:), ALLOCATABLE :: IVEC1,IVEC2 ! Vectors of indices -REAL, DIMENSION(:), ALLOCATABLE :: ZVEC1,ZVEC2, ZVEC3 ! Work vectors +INTEGER, DIMENSION(:), ALLOCATABLE :: IVEC1 ! Vectors of indices +REAL, DIMENSION(:), ALLOCATABLE :: ZVEC1, ZVEC3 ! Work vectors ! !------------------------------------------------------------------------------- ! diff --git a/src/common/micro/mode_lima_tendencies.F90 b/src/common/micro/mode_lima_tendencies.F90 index d25250bcc..cbfde662f 100644 --- a/src/common/micro/mode_lima_tendencies.F90 +++ b/src/common/micro/mode_lima_tendencies.F90 @@ -72,13 +72,12 @@ CONTAINS ! USE MODD_CST, ONLY : XP00, XRD, XRV, XMD, XMV, XCPD, XCPV, XCL, XCI, XLVTT, XLSTT, XTT, & XALPW, XBETAW, XGAMW, XALPI, XBETAI, XGAMI -USE MODD_PARAM_LIMA, ONLY : XRTMIN, XCTMIN, XNUS, LCIBU, LRDSF, & - LNUCL, LACTI, LKHKO, LSNOW_T, & +USE MODD_PARAM_LIMA, ONLY : XRTMIN, XCTMIN, LCIBU, LRDSF, LKHKO, LSNOW_T, & NMOM_C, NMOM_R, NMOM_I, NMOM_S, NMOM_G, NMOM_H USE MODD_PARAM_LIMA_WARM, ONLY : XLBC, XLBEXC, XLBR, XLBEXR, XCCR, XCXR -USE MODD_PARAM_LIMA_MIXED, ONLY : XLBG, XLBEXG, XCCG, XCXG, XLBH, XLBEXH, XCCH, XCXH, XLBDAG_MAX +USE MODD_PARAM_LIMA_MIXED, ONLY : XLBG, XLBEXG, XCCG, XCXG, XLBH, XLBEXH, XCCH, XCXH USE MODD_PARAM_LIMA_COLD, ONLY : XSCFAC, XLBI, XLBEXI, XLBS, XLBEXS, XLBDAS_MAX, XTRANS_MP_GAMMAS, & - XFVELOS, XLBDAS_MIN, XCCS, XCXS, XBS, XNS + XLBDAS_MIN, XCCS, XCXS, XBS, XNS ! USE MODE_LIMA_DROPLETS_HOM_FREEZING, ONLY: LIMA_DROPLETS_HOM_FREEZING USE MODE_LIMA_DROPLETS_SELF_COLLECTION, ONLY: LIMA_DROPLETS_SELF_COLLECTION diff --git a/src/common/micro/mode_qsatmx_tab.F90 b/src/common/micro/mode_qsatmx_tab.F90 index 01d697b19..9e2c33373 100644 --- a/src/common/micro/mode_qsatmx_tab.F90 +++ b/src/common/micro/mode_qsatmx_tab.F90 @@ -3,7 +3,6 @@ IMPLICIT NONE CONTAINS FUNCTION QSATMX_TAB(P,T,FICE) - USE PARKIND1, ONLY : JPRB USE MODD_CST ,ONLY : XEPSILO USE MODE_TIWMX, ONLY : ESATI,ESATW diff --git a/src/common/micro/mode_rain_ice_old_fast_rg.F90 b/src/common/micro/mode_rain_ice_old_fast_rg.F90 index 77c17fac2..a18241de1 100644 --- a/src/common/micro/mode_rain_ice_old_fast_rg.F90 +++ b/src/common/micro/mode_rain_ice_old_fast_rg.F90 @@ -29,7 +29,7 @@ MODULE MODE_RAIN_ICE_OLD_FAST_RG USE MODD_RAIN_ICE_DESCR_n, ONLY: RAIN_ICE_DESCR_T USE MODE_BUDGET_PHY, ONLY: BUDGET_STORE_INIT_PHY, BUDGET_STORE_END_PHY - USE MODD_BUDGET, ONLY: TBUDGETDATA, TBUDGETCONF_t, LBU_ENABLE, NBUDGET_TH, NBUDGET_RG, NBUDGET_RR, NBUDGET_RC, & + USE MODD_BUDGET, ONLY: TBUDGETDATA, TBUDGETCONF_t, NBUDGET_TH, NBUDGET_RG, NBUDGET_RR, NBUDGET_RC, & NBUDGET_RI, NBUDGET_RS, NBUDGET_RH IMPLICIT NONE diff --git a/src/common/micro/mode_rain_ice_old_fast_rh.F90 b/src/common/micro/mode_rain_ice_old_fast_rh.F90 index 838e8526a..6d9348523 100644 --- a/src/common/micro/mode_rain_ice_old_fast_rh.F90 +++ b/src/common/micro/mode_rain_ice_old_fast_rh.F90 @@ -29,7 +29,7 @@ MODULE MODE_RAIN_ICE_OLD_FAST_RH USE MODD_RAIN_ICE_DESCR_n, ONLY: RAIN_ICE_DESCR_T USE MODE_BUDGET_PHY, ONLY: BUDGET_STORE_INIT_PHY, BUDGET_STORE_END_PHY - USE MODD_BUDGET, ONLY: TBUDGETDATA, TBUDGETCONF_t, LBU_ENABLE, NBUDGET_TH, NBUDGET_RG, NBUDGET_RR, NBUDGET_RC, & + USE MODD_BUDGET, ONLY: TBUDGETDATA, TBUDGETCONF_t, NBUDGET_TH, NBUDGET_RG, NBUDGET_RR, NBUDGET_RC, & NBUDGET_RI, NBUDGET_RS, NBUDGET_RH IMPLICIT NONE diff --git a/src/common/micro/mode_rain_ice_old_fast_ri.F90 b/src/common/micro/mode_rain_ice_old_fast_ri.F90 index ad746a45d..776aa0080 100644 --- a/src/common/micro/mode_rain_ice_old_fast_ri.F90 +++ b/src/common/micro/mode_rain_ice_old_fast_ri.F90 @@ -35,7 +35,7 @@ MODULE MODE_RAIN_ICE_OLD_FAST_RI USE MODE_BUDGET_PHY, ONLY: BUDGET_STORE_INIT_PHY, BUDGET_STORE_END_PHY USE MODD_BUDGET, ONLY: TBUDGETDATA, TBUDGETCONF_t, & - LBU_ENABLE, NBUDGET_TH, NBUDGET_RC, NBUDGET_RI + NBUDGET_TH, NBUDGET_RC, NBUDGET_RI IMPLICIT NONE @@ -104,7 +104,7 @@ MODULE MODE_RAIN_ICE_OLD_FAST_RI REAL :: ZQIMAX REAL :: ZHU - INTEGER :: JJ, JK, JL + INTEGER :: JK, JL REAL(KIND=JPRB) :: ZHOOK_HANDLE ! diff --git a/src/common/micro/mode_rain_ice_old_fast_rs.F90 b/src/common/micro/mode_rain_ice_old_fast_rs.F90 index 82ddf721d..4cba8e31b 100644 --- a/src/common/micro/mode_rain_ice_old_fast_rs.F90 +++ b/src/common/micro/mode_rain_ice_old_fast_rs.F90 @@ -28,7 +28,7 @@ MODULE MODE_RAIN_ICE_OLD_FAST_RS USE MODE_BUDGET_PHY, ONLY: BUDGET_STORE_INIT_PHY, BUDGET_STORE_END_PHY USE MODD_BUDGET, ONLY: TBUDGETDATA, TBUDGETCONF_t, & - LBU_ENABLE, NBUDGET_TH, NBUDGET_RG, NBUDGET_RR, NBUDGET_RC, NBUDGET_RS + NBUDGET_TH, NBUDGET_RG, NBUDGET_RR, NBUDGET_RC, NBUDGET_RS IMPLICIT NONE diff --git a/src/common/micro/mode_rain_ice_old_sedimentation_stat.F90 b/src/common/micro/mode_rain_ice_old_sedimentation_stat.F90 index 9b452f28d..44a4f3062 100644 --- a/src/common/micro/mode_rain_ice_old_sedimentation_stat.F90 +++ b/src/common/micro/mode_rain_ice_old_sedimentation_stat.F90 @@ -85,7 +85,7 @@ MODULE MODE_RAIN_ICE_OLD_SEDIMENTATION_STAT REAL, DIMENSION(SIZE(PRHODREF,1)) :: ZQP INTEGER :: JI,JK INTEGER :: JCOUNT, JL - INTEGER, DIMENSION(SIZE(PRHODREF,1)*SIZE(PRHODREF,2)) :: I1, I2 + INTEGER, DIMENSION(SIZE(PRHODREF,1)*SIZE(PRHODREF,2)) :: I1 REAL, DIMENSION(D%NIT,D%NKT) :: ZPRCS, ZPRRS, ZPRSS, ZPRGS, ZPRHS ! Mixing ratios created during the time step diff --git a/src/common/micro/mode_rain_ice_old_slow.F90 b/src/common/micro/mode_rain_ice_old_slow.F90 index c96f8c34b..984b80124 100644 --- a/src/common/micro/mode_rain_ice_old_slow.F90 +++ b/src/common/micro/mode_rain_ice_old_slow.F90 @@ -32,7 +32,7 @@ MODULE MODE_RAIN_ICE_OLD_SLOW USE MODE_BUDGET_PHY, ONLY: BUDGET_STORE_INIT_PHY, BUDGET_STORE_END_PHY - USE MODD_BUDGET, ONLY: TBUDGETDATA, TBUDGETCONF_t, LBU_ENABLE, NBUDGET_TH, NBUDGET_RG, NBUDGET_RR, NBUDGET_RC, & + USE MODD_BUDGET, ONLY: TBUDGETDATA, TBUDGETCONF_t, NBUDGET_TH, NBUDGET_RG, NBUDGET_RR, NBUDGET_RC, & NBUDGET_RI, NBUDGET_RS, NBUDGET_RV USE MODE_RAIN_ICE_OLD_ICENUMBER2, ONLY: ICENUMBER2 diff --git a/src/common/micro/mode_rain_ice_old_warm.F90 b/src/common/micro/mode_rain_ice_old_warm.F90 index b65a82221..8b1d1520e 100644 --- a/src/common/micro/mode_rain_ice_old_warm.F90 +++ b/src/common/micro/mode_rain_ice_old_warm.F90 @@ -35,7 +35,7 @@ MODULE MODE_RAIN_ICE_OLD_WARM USE MODE_BUDGET_PHY, ONLY: BUDGET_STORE_INIT_PHY, BUDGET_STORE_END_PHY USE MODD_BUDGET, ONLY: TBUDGETDATA, TBUDGETCONF_t, & - LBU_ENABLE, NBUDGET_TH, NBUDGET_RR, NBUDGET_RC, NBUDGET_RV + NBUDGET_TH, NBUDGET_RR, NBUDGET_RC, NBUDGET_RV IMPLICIT NONE diff --git a/src/common/micro/mode_set_conc_lima.F90 b/src/common/micro/mode_set_conc_lima.F90 index 39995cd4b..c7ffbfc6e 100644 --- a/src/common/micro/mode_set_conc_lima.F90 +++ b/src/common/micro/mode_set_conc_lima.F90 @@ -73,15 +73,13 @@ contains !* 0. DECLARATIONS ! ------------ ! -USE MODD_PARAM_LIMA, ONLY : XRTMIN, XCTMIN, NMOD_CCN, NMOD_IFN, & +USE MODD_PARAM_LIMA, ONLY : NMOD_CCN, NMOD_IFN, & NMOM_C, NMOM_R, NMOM_I -USE MODD_PARAM_LIMA_COLD, ONLY : XAI, XBI, XAS, XBS +USE MODD_PARAM_LIMA_COLD, ONLY : XAS, XBS USE MODD_PARAM_LIMA_MIXED,ONLY : XAG, XBG, XAH, XBH -USE MODD_NSV, ONLY : NSV_LIMA_BEG_A, NSV_LIMA_NC_A, NSV_LIMA_NR_A, NSV_LIMA_CCN_ACTI_A, & - NSV_LIMA_NI_A, NSV_LIMA_NS_A, NSV_LIMA_NG_A, NSV_LIMA_NH_A, NSV_LIMA_IFN_NUCL_A, & - NSV_LIMA_BEG, NSV_LIMA_NC, NSV_LIMA_NR, NSV_LIMA_CCN_ACTI, & +USE MODD_NSV, ONLY : NSV_LIMA_BEG, NSV_LIMA_NC, NSV_LIMA_NR, NSV_LIMA_CCN_ACTI, & NSV_LIMA_NI, NSV_LIMA_NS, NSV_LIMA_NG, NSV_LIMA_NH, NSV_LIMA_IFN_NUCL -USE MODD_CST, ONLY : XPI, XRHOLW, XRHOLI +USE MODD_CST, ONLY : XPI, XRHOLW ! IMPLICIT NONE ! diff --git a/src/common/micro/rain_ice.F90 b/src/common/micro/rain_ice.F90 index 4e47e20cd..6f413b6ac 100644 --- a/src/common/micro/rain_ice.F90 +++ b/src/common/micro/rain_ice.F90 @@ -186,7 +186,6 @@ USE MODD_CST, ONLY: CST_t USE MODD_PARAM_ICE_n, ONLY: PARAM_ICE_t USE MODD_RAIN_ICE_DESCR_n, ONLY: RAIN_ICE_DESCR_t USE MODD_RAIN_ICE_PARAM_n, ONLY: RAIN_ICE_PARAM_t -USE MODD_TURB_n, ONLY: TURB_t USE MODD_FIELDS_ADDRESS, ONLY : & ! common fields adress & ITH, & ! Potential temperature & IRV, & ! Water vapor @@ -197,10 +196,10 @@ USE MODD_FIELDS_ADDRESS, ONLY : & ! common fields adress & IRG, & ! Graupel & IRH ! Hail -USE MODE_BUDGET_PHY, ONLY: BUDGET_STORE_ADD_PHY, BUDGET_STORE_INIT_PHY, BUDGET_STORE_END_PHY -USE MODE_MSG, ONLY: PRINT_MSG, NVERB_FATAL +USE MODE_BUDGET_PHY, ONLY: BUDGET_STORE_INIT_PHY, BUDGET_STORE_END_PHY +USE MODE_MSG, ONLY: PRINT_MSG, NVERB_FATAL -USE MODE_ICE4_RAINFR_VERT, ONLY: ICE4_RAINFR_VERT +USE MODE_ICE4_RAINFR_VERT, ONLY: ICE4_RAINFR_VERT USE MODE_ICE4_SEDIMENTATION, ONLY: ICE4_SEDIMENTATION USE MODE_ICE4_PACK, ONLY: ICE4_PACK USE MODE_ICE4_NUCLEATION, ONLY: ICE4_NUCLEATION diff --git a/src/common/micro/rain_ice_old.F90 b/src/common/micro/rain_ice_old.F90 index 10e830dc3..6db99a777 100644 --- a/src/common/micro/rain_ice_old.F90 +++ b/src/common/micro/rain_ice_old.F90 @@ -180,7 +180,6 @@ USE MODD_LES, ONLY: TLES USE MODE_BUDGET_PHY, ONLY: BUDGET_STORE_ADD_PHY, BUDGET_STORE_INIT_PHY, BUDGET_STORE_END_PHY USE MODI_GAMMA, ONLY: GAMMA USE MODE_TIWMX, ONLY: ESATI, ESATW, AA2, BB3, AA2W, BB3W -USE MODE_ICECLOUD, ONLY: ICECLOUD USE MODE_TIWMX_TAB, ONLY: TIWMX_TAB ! USE MODE_RAIN_ICE_OLD_NUCLEATION, ONLY: RAIN_ICE_OLD_NUCLEATION @@ -193,7 +192,6 @@ USE MODE_RAIN_ICE_OLD_FAST_RG, ONLY: RAIN_ICE_OLD_FAST_RG USE MODE_RAIN_ICE_OLD_FAST_RH, ONLY: RAIN_ICE_OLD_FAST_RH USE MODE_RAIN_ICE_OLD_FAST_RI, ONLY: RAIN_ICE_OLD_FAST_RI -use iso_fortran_env, only: output_unit IMPLICIT NONE ! @@ -282,14 +280,11 @@ REAL, DIMENSION(D%NIT,D%NKT,KRR), OPTIONAL, INTENT(OUT) :: PFPR ! upper-air p !* 0.2 Declarations of local variables : ! INTEGER :: JK ! Vertical loop index for the rain sedimentation -INTEGER :: JJ ! Loop index for the interpolation INTEGER :: JI ! Loop index for the interpolation INTEGER :: IKB ! INTEGER :: IKE ! ! INTEGER :: IMICRO ! Case number of sedimentation, T>0 (for HEN) and r_x>0 locations -LOGICAL, DIMENSION(D%NIT,D%NKT) :: GNEGT ! Test where to compute the HEN process - ! interpolations REAL, DIMENSION(D%NIT,D%NKT) :: ZW ! work array REAL, DIMENSION(D%NIT) :: ZCONC_TMP ! Weighted concentration REAL, DIMENSION(D%NIT,D%NKT) :: ZT ! Temperature diff --git a/src/common/turb/modd_param_mfshalln.F90 b/src/common/turb/modd_param_mfshalln.F90 index 05e586f47..d946794f8 100644 --- a/src/common/turb/modd_param_mfshalln.F90 +++ b/src/common/turb/modd_param_mfshalln.F90 @@ -212,8 +212,7 @@ SUBROUTINE PARAM_MFSHALLN_INIT(HPROGRAM, KUNITNML, LDNEEDNAM, KLUOUT, & ! --------------- ! USE MODE_POSNAM_PHY, ONLY: POSNAM_PHY -USE MODE_MSG, ONLY: PRINT_MSG, NVERB_FATAL -USE MODE_CHECK_NAM_VAL, ONLY: CHECK_NAM_VAL_CHAR, CHECK_NAM_VAL_REAL, CHECK_NAM_VAL_INT +USE MODE_CHECK_NAM_VAL, ONLY: CHECK_NAM_VAL_CHAR ! IMPLICIT NONE ! diff --git a/src/common/turb/modd_turbn.F90 b/src/common/turb/modd_turbn.F90 index 3cf66c444..581456767 100644 --- a/src/common/turb/modd_turbn.F90 +++ b/src/common/turb/modd_turbn.F90 @@ -260,8 +260,7 @@ SUBROUTINE TURBN_INIT(HPROGRAM, KUNITNML, LDNEEDNAM, KLUOUT, & ! --------------- ! USE MODE_POSNAM_PHY, ONLY: POSNAM_PHY -USE MODE_MSG, ONLY: PRINT_MSG, NVERB_FATAL -USE MODE_CHECK_NAM_VAL, ONLY: CHECK_NAM_VAL_CHAR, CHECK_NAM_VAL_REAL, CHECK_NAM_VAL_INT +USE MODE_CHECK_NAM_VAL, ONLY: CHECK_NAM_VAL_CHAR USE MODD_PARAMETERS, ONLY: XUNDEF ! IMPLICIT NONE diff --git a/src/common/turb/mode_bl89.F90 b/src/common/turb/mode_bl89.F90 index 72c752c07..13bed023b 100644 --- a/src/common/turb/mode_bl89.F90 +++ b/src/common/turb/mode_bl89.F90 @@ -60,7 +60,6 @@ USE MODD_CST, ONLY: CST_t USE MODD_CTURB, ONLY: CSTURB_t USE MODD_TURB_n, ONLY: TURB_t USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t -USE MODD_PARAMETERS, ONLY: JPVEXT_TURB USE MODD_PRECISION, ONLY: MNHREAL ! ! diff --git a/src/common/turb/mode_compute_updraft_raha.F90 b/src/common/turb/mode_compute_updraft_raha.F90 index e87194468..4914be2ae 100644 --- a/src/common/turb/mode_compute_updraft_raha.F90 +++ b/src/common/turb/mode_compute_updraft_raha.F90 @@ -122,18 +122,13 @@ REAL, DIMENSION(D%NIJT), INTENT(OUT) :: PDEPTH ! Deepness of clo ! ! ! Mean environment variables at t-dt at flux point -REAL, DIMENSION(D%NIJT,D%NKT) :: ZTHM_F,ZRVM_F,ZRCM_F ! Theta,rv of - ! updraft environnement +REAL, DIMENSION(D%NIJT,D%NKT) :: ZTHM_F,ZRVM_F ! Theta,rv of updraft environnement REAL, DIMENSION(D%NIJT,D%NKT) :: ZRTM_F, ZTHLM_F, ZTKEM_F ! rt, thetal,TKE,pressure, REAL, DIMENSION(D%NIJT,D%NKT) :: ZUM_F,ZVM_F,ZRHO_F ! density,momentum REAL, DIMENSION(D%NIJT,D%NKT) :: ZPRES_F,ZTHVM_F,ZTHVM ! interpolated at the flux point REAL, DIMENSION(D%NIJT,D%NKT) :: ZG_O_THVREF ! g*ThetaV ref REAL, DIMENSION(D%NIJT,D%NKT) :: ZW_UP2 ! w**2 of the updraft -REAL, DIMENSION(D%NIJT,D%NKT,KSV) :: ZSVM_F ! scalar variables - - - REAL, DIMENSION(D%NIJT,D%NKT) :: ZTH_UP ! updraft THETA REAL, DIMENSION(D%NIJT) :: ZT_UP ! updraft T REAL, DIMENSION(D%NIJT) :: ZLVOCPEXN ! updraft L @@ -143,35 +138,26 @@ REAL, DIMENSION(D%NIJT,D%NKT) :: ZTHS_UP,ZTHSM REAL, DIMENSION(D%NIJT,D%NKT) :: ZCOEF ! diminution coefficient for too high clouds -REAL, DIMENSION(D%NIJT) :: ZWTHVSURF ! Surface w'thetav' - REAL :: ZRDORV ! RD/RV REAL :: ZRVORD ! RV/RD REAL, DIMENSION(D%NIJT) :: ZMIX1,ZMIX2,ZMIX3 -REAL, DIMENSION(D%NIJT) :: ZLUP ! Upward Mixing length from the ground - -REAL, DIMENSION(D%NIJT) :: ZDEPTH ! Deepness limit for cloud -INTEGER :: JK,JIJ,JSV ! loop counters +INTEGER :: JK,JIJ ! loop counters INTEGER :: IIJB,IIJE ! physical horizontal domain indices INTEGEr :: IKT,IKB,IKE,IKL LOGICAL, DIMENSION(D%NIJT) :: GTEST,GTESTLCL,GTESTETL ! Test if the ascent continue, if LCL or ETL is reached -LOGICAL :: GLMIX - ! To choose upward or downward mixing length LOGICAL, DIMENSION(D%NIJT) :: GWORK1 LOGICAL, DIMENSION(D%NIJT,D%NKT) :: GWORK2 -INTEGER :: ITEST -REAL, DIMENSION(D%NIJT) :: ZRC_UP, ZRI_UP, ZRV_UP, ZWP2, ZRSATW, ZRSATI +REAL, DIMENSION(D%NIJT) :: ZRC_UP, ZRI_UP, ZRV_UP, ZRSATW, ZRSATI -LOGICAL, DIMENSION(D%NIJT) :: GTEST_FER REAL, DIMENSION(D%NIJT) :: ZPHI,ZALIM_STAR_TOT REAL, DIMENSION(D%NIJT,D%NKT) :: ZDTHETASDZ,ZALIM_STAR,ZZDZ,ZZZ INTEGER, DIMENSION(D%NIJT) :: IALIM @@ -181,7 +167,7 @@ REAL, DIMENSION(D%NIJT) :: ZCOE,ZWCOE,ZBUCOE REAL, DIMENSION(D%NIJT) :: ZDETR_BUO, ZDETR_RT REAL, DIMENSION(D%NIJT) :: ZW_MAX ! w**2 max of the updraft REAL, DIMENSION(D%NIJT) :: ZZTOP ! Top of the updraft -REAL, DIMENSION(D%NIJT) :: ZA,ZB,ZQTM,ZQT_UP +REAL, DIMENSION(D%NIJT) :: ZQTM,ZQT_UP REAL :: ZDEPTH_MAX1, ZDEPTH_MAX2 ! control auto-extinction process diff --git a/src/common/turb/mode_compute_updraft_rhcj10.F90 b/src/common/turb/mode_compute_updraft_rhcj10.F90 index 4d1a51e64..aa87a5bcc 100644 --- a/src/common/turb/mode_compute_updraft_rhcj10.F90 +++ b/src/common/turb/mode_compute_updraft_rhcj10.F90 @@ -138,10 +138,6 @@ REAL, DIMENSION(D%NIJT,D%NKT) :: ZPRES_F,ZTHVM_F ! interpolated at REAL, DIMENSION(D%NIJT,D%NKT) :: ZG_O_THVREF ! g*ThetaV ref REAL, DIMENSION(D%NIJT,D%NKT) :: ZW_UP2 ! w**2 of the updraft -REAL, DIMENSION(D%NIJT,D%NKT,KSV) :: ZSVM_F ! scalar variables - - - REAL, DIMENSION(D%NIJT,D%NKT) :: ZTH_UP ! updraft THETA !REAL, DIMENSION(SIZE(PTHM,1)) :: ZT_UP ! updraft T !REAL, DIMENSION(SIZE(PTHM,1)) :: ZLVOCPEXN ! updraft L @@ -160,7 +156,7 @@ REAL, DIMENSION(D%NIJT) :: ZMIX1,ZMIX2 REAL, DIMENSION(D%NIJT) :: ZLUP ! Upward Mixing length from the ground -INTEGER :: JK,JIJ,JSV ! loop counters +INTEGER :: JK,JIJ ! loop counters INTEGER :: IIJB,IIJE ! physical horizontal domain indices INTEGER :: IKT,IKB,IKE,IKL LOGICAL, DIMENSION(D%NIJT) :: GTEST,GTESTLCL @@ -170,8 +166,6 @@ LOGICAL :: GLMIX LOGICAL, DIMENSION(D%NIJT) :: GWORK1 LOGICAL, DIMENSION(D%NIJT,D%NKT) :: GWORK2 -INTEGER :: ITEST - REAL, DIMENSION(D%NIJT) :: ZRC_UP, ZRI_UP, ZRV_UP, ZRSATW, ZRSATI REAL, DIMENSION(D%NIJT,D%NKT) :: ZZDZ diff --git a/src/common/turb/mode_ibm_mixinglength.F90 b/src/common/turb/mode_ibm_mixinglength.F90 index 94fb3cf9e..c1fc1a51a 100644 --- a/src/common/turb/mode_ibm_mixinglength.F90 +++ b/src/common/turb/mode_ibm_mixinglength.F90 @@ -58,8 +58,6 @@ SUBROUTINE IBM_MIXINGLENGTH(D,PLM,PLEPS,PMU,PHI,PTKE) REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(OUT) :: PMU REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(IN) :: PHI REAL, DIMENSION(D%NIT,D%NJT,D%NKT), INTENT(IN) :: PTKE - REAL, DIMENSION(D%NIT,D%NJT,D%NKT) :: ZALPHA,ZBETA - REAL, DIMENSION(D%NIT,D%NJT,D%NKT) :: ZLM,ZMU,ZLN ! ! IBM CAN NOT BE USED WITH AROME ! diff --git a/src/common/turb/mode_prandtl.F90 b/src/common/turb/mode_prandtl.F90 index 5cd31ef51..2a0039c57 100644 --- a/src/common/turb/mode_prandtl.F90 +++ b/src/common/turb/mode_prandtl.F90 @@ -151,7 +151,6 @@ USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t USE MODD_FIELD, ONLY: TFIELDMETADATA, TYPEREAL USE MODD_TURB_n, ONLY: TURB_t USE MODD_IO, ONLY: TFILEDATA -USE MODD_PARAMETERS, ONLY: JPVEXT_TURB ! USE MODE_EMOIST, ONLY: EMOIST USE MODE_ETHETA, ONLY: ETHETA @@ -220,9 +219,9 @@ REAL, DIMENSION(D%NIJT,D%NKT), INTENT(OUT) :: PEMOIST ! coefficient E_moist ! 0.2 declaration of local variables ! REAL, DIMENSION(D%NIJT,D%NKT) :: & - ZW1, ZW2, ZW3, & + ZW1, ZW2, & ! working variables - ZWORK1,ZWORK2,ZWORK3,ZWORK4, ZWORK5, ZWORK6,ZWORK7, & + ZWORK1,ZWORK2,ZWORK3,ZWORK4, & ZGXMM_PTH,ZGYMM_PTH,ZGXMM_PRM,ZGYMM_PRM, ZGXMM_PSV,ZGYMM_PSV ! working variables for explicit array ! @@ -231,7 +230,6 @@ INTEGER :: IKE ! vertical index value for the last inner mass point INTEGER:: JSV,JIJ,JK ! loop index INTEGER :: IIJB,IIJE,IKT,IKA,IKL -INTEGER :: JLOOP REAL :: ZMINVAL TYPE(TFIELDMETADATA) :: TZFIELD ! --------------------------------------------------------------------------- diff --git a/src/common/turb/mode_sbl.F90 b/src/common/turb/mode_sbl.F90 index 6ae740a9b..b5761ea72 100644 --- a/src/common/turb/mode_sbl.F90 +++ b/src/common/turb/mode_sbl.F90 @@ -299,7 +299,7 @@ END SUBROUTINE PAULSON_PSIM_0D ! SUBROUTINE LMO_2D(PUSTAR,PTHETA,PRV,PSFTH,PSFRV,LMO2D) USE MODD_CST - USE MODD_PARAMETERS, ONLY: JPVEXT_TURB,XUNDEF + USE MODD_PARAMETERS, ONLY: XUNDEF REAL, DIMENSION(:,:), INTENT(IN) :: PUSTAR REAL, DIMENSION(:,:), INTENT(IN) :: PTHETA REAL, DIMENSION(:,:), INTENT(IN) :: PRV @@ -330,7 +330,7 @@ END SUBROUTINE LMO_2D ! SUBROUTINE LMO_1D(PUSTAR,PTHETA,PRV,PSFTH,PSFRV,LMO1D) USE MODD_CST - USE MODD_PARAMETERS, ONLY: JPVEXT_TURB,XUNDEF + USE MODD_PARAMETERS, ONLY: XUNDEF REAL, DIMENSION(:), INTENT(IN) :: PUSTAR REAL, DIMENSION(:), INTENT(IN) :: PTHETA REAL, DIMENSION(:), INTENT(IN) :: PRV @@ -360,7 +360,7 @@ END SUBROUTINE LMO_1D ! SUBROUTINE LMO_0D(PUSTAR,PTHETA,PRV,PSFTH,PSFRV,LMO0D) USE MODD_CST - USE MODD_PARAMETERS, ONLY: JPVEXT_TURB,XUNDEF + USE MODD_PARAMETERS, ONLY: XUNDEF REAL, INTENT(IN) :: PUSTAR REAL, INTENT(IN) :: PTHETA REAL, INTENT(IN) :: PRV @@ -392,7 +392,7 @@ END SUBROUTINE LMO_0D ! SUBROUTINE USTAR_2D(PU,PV,PZ,PZ0,PLMO,USTAR2D) USE MODD_CST - USE MODD_PARAMETERS, ONLY: JPVEXT_TURB,XUNDEF + USE MODD_PARAMETERS, ONLY: XUNDEF REAL, DIMENSION(:,:), INTENT(IN) :: PU REAL, DIMENSION(:,:), INTENT(IN) :: PV REAL, DIMENSION(:,:), INTENT(IN) :: PZ @@ -436,7 +436,7 @@ END SUBROUTINE USTAR_2D ! SUBROUTINE USTAR_1D(PU,PV,PZ,PZ0,PLMO,USTAR1D) USE MODD_CST - USE MODD_PARAMETERS, ONLY: JPVEXT_TURB,XUNDEF + USE MODD_PARAMETERS, ONLY: XUNDEF REAL, DIMENSION(:), INTENT(IN) :: PU REAL, DIMENSION(:), INTENT(IN) :: PV REAL, DIMENSION(:), INTENT(IN) :: PZ @@ -480,7 +480,7 @@ END SUBROUTINE USTAR_1D ! SUBROUTINE USTAR_0D(PU,PV,PZ,PZ0,PLMO,USTAR0D) USE MODD_CST - USE MODD_PARAMETERS, ONLY: JPVEXT_TURB,XUNDEF + USE MODD_PARAMETERS, ONLY: XUNDEF REAL, INTENT(IN) :: PU REAL, INTENT(IN) :: PV REAL, INTENT(IN) :: PZ diff --git a/src/common/turb/mode_sbl_phy.F90 b/src/common/turb/mode_sbl_phy.F90 index c3d8be4f0..72a416d08 100644 --- a/src/common/turb/mode_sbl_phy.F90 +++ b/src/common/turb/mode_sbl_phy.F90 @@ -143,7 +143,7 @@ END SUBROUTINE BUSINGER_PHIE SUBROUTINE LMO(D,CST,PUSTAR,PTHETA,PRV,PSFTH,PSFRV,PLMO) USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t USE MODD_CST, ONLY: CST_t - USE MODD_PARAMETERS, ONLY: JPVEXT_TURB,XUNDEF + USE MODD_PARAMETERS, ONLY: XUNDEF ! TYPE(DIMPHYEX_t), INTENT(IN) :: D TYPE(CST_t), INTENT(IN) :: CST diff --git a/src/common/turb/mode_tke_eps_sources.F90 b/src/common/turb/mode_tke_eps_sources.F90 index 2b8bb97ab..45c54331a 100644 --- a/src/common/turb/mode_tke_eps_sources.F90 +++ b/src/common/turb/mode_tke_eps_sources.F90 @@ -132,14 +132,13 @@ USE MODE_SHUMAN_PHY, ONLY: MZM_PHY, MZF_PHY, DZF_PHY, DZM_PHY USE YOMHOOK, ONLY: LHOOK, DR_HOOK ! USE MODD_ARGSLIST_ll, ONLY: LIST_ll -USE MODD_BUDGET, ONLY: TBUDGETCONF_t, NBUDGET_TKE, NBUDGET_TH, TBUDGETDATA +USE MODD_BUDGET, ONLY: TBUDGETCONF_t, NBUDGET_TKE, TBUDGETDATA USE MODD_CST, ONLY: CST_t USE MODD_CTURB, ONLY: CSTURB_t USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t USE MODD_FIELD, ONLY: TFIELDMETADATA, TYPEREAL USE MODD_IO, ONLY: TFILEDATA USE MODD_LES, ONLY: TLES_t -USE MODD_PARAMETERS, ONLY: JPVEXT_TURB USE MODD_TURB_n, ONLY: TURB_t ! USE MODE_BUDGET_PHY, ONLY: BUDGET_STORE_ADD_PHY, BUDGET_STORE_END_PHY, BUDGET_STORE_INIT_PHY diff --git a/src/common/turb/mode_tm06.F90 b/src/common/turb/mode_tm06.F90 index d5f9ea2de..21452a8c4 100644 --- a/src/common/turb/mode_tm06.F90 +++ b/src/common/turb/mode_tm06.F90 @@ -47,7 +47,7 @@ SUBROUTINE TM06(D,CST,PTHVREF,PBL_DEPTH,PZZ,PSFTH,PMWTH,PMTH2) ! USE MODD_CST, ONLY: CST_t USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t -USE MODD_PARAMETERS, ONLY: XUNDEF,JPVEXT_TURB +USE MODD_PARAMETERS, ONLY: XUNDEF ! ! IMPLICIT NONE diff --git a/src/common/turb/mode_tridiag.F90 b/src/common/turb/mode_tridiag.F90 index 6c15c7dc2..ce755096c 100644 --- a/src/common/turb/mode_tridiag.F90 +++ b/src/common/turb/mode_tridiag.F90 @@ -114,7 +114,6 @@ SUBROUTINE TRIDIAG(D,PVARM,PA,PTSTEP,PEXPL,PIMPL, & ! !* 0. DECLARATIONS ! -USE MODD_PARAMETERS, ONLY: JPVEXT_TURB USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t ! IMPLICIT NONE diff --git a/src/common/turb/mode_tridiag_thermo.F90 b/src/common/turb/mode_tridiag_thermo.F90 index 23d959b9b..6c77d7772 100644 --- a/src/common/turb/mode_tridiag_thermo.F90 +++ b/src/common/turb/mode_tridiag_thermo.F90 @@ -119,9 +119,7 @@ SUBROUTINE TRIDIAG_THERMO(D,PVARM,PF,PDFDDTDZ,PTSTEP,PIMPL, & USE PARKIND1, ONLY : JPRB USE YOMHOOK , ONLY : LHOOK, DR_HOOK USE MODD_DIMPHYEX, ONLY : DIMPHYEX_t -USE MODD_PARAMETERS, ONLY : JPVEXT_TURB ! -USE MODI_SHUMAN, ONLY : MZM USE MODE_SHUMAN_PHY, ONLY: MZM_PHY ! IMPLICIT NONE diff --git a/src/common/turb/mode_turb_hor_dyn_corr.F90 b/src/common/turb/mode_turb_hor_dyn_corr.F90 index 32270e64e..7acf5b2c9 100644 --- a/src/common/turb/mode_turb_hor_dyn_corr.F90 +++ b/src/common/turb/mode_turb_hor_dyn_corr.F90 @@ -88,7 +88,6 @@ USE MODI_GRADIENT_U USE MODI_GRADIENT_V USE MODI_GRADIENT_W USE MODI_SHUMAN -USE MODE_COEFJ, ONLY: COEFJ USE MODI_LES_MEAN_SUBGRID USE MODE_TRIDIAG_W, ONLY: TRIDIAG_W ! diff --git a/src/common/turb/mode_turb_hor_sv_flux.F90 b/src/common/turb/mode_turb_hor_sv_flux.F90 index b5544d926..a84139fe5 100644 --- a/src/common/turb/mode_turb_hor_sv_flux.F90 +++ b/src/common/turb/mode_turb_hor_sv_flux.F90 @@ -75,7 +75,6 @@ USE MODI_GRADIENT_U USE MODI_GRADIENT_V USE MODI_GRADIENT_W USE MODI_SHUMAN -USE MODE_COEFJ, ONLY: COEFJ USE MODI_LES_MEAN_SUBGRID ! USE MODI_SECOND_MNH diff --git a/src/common/turb/mode_turb_hor_uv.F90 b/src/common/turb/mode_turb_hor_uv.F90 index 717ef5907..e0ad7d63d 100644 --- a/src/common/turb/mode_turb_hor_uv.F90 +++ b/src/common/turb/mode_turb_hor_uv.F90 @@ -74,7 +74,6 @@ USE MODI_GRADIENT_U USE MODI_GRADIENT_V USE MODI_GRADIENT_W USE MODI_SHUMAN -USE MODE_COEFJ, ONLY: COEFJ USE MODI_LES_MEAN_SUBGRID ! USE MODI_SECOND_MNH diff --git a/src/common/turb/mode_turb_hor_uw.F90 b/src/common/turb/mode_turb_hor_uw.F90 index 1885d3d9e..918c5fac1 100644 --- a/src/common/turb/mode_turb_hor_uw.F90 +++ b/src/common/turb/mode_turb_hor_uw.F90 @@ -78,7 +78,6 @@ USE MODI_GRADIENT_U USE MODI_GRADIENT_V USE MODI_GRADIENT_W USE MODI_SHUMAN -USE MODE_COEFJ, ONLY: COEFJ USE MODI_LES_MEAN_SUBGRID ! USE MODI_SECOND_MNH diff --git a/src/common/turb/mode_turb_hor_vw.F90 b/src/common/turb/mode_turb_hor_vw.F90 index 2fe089f60..c6cfd8294 100644 --- a/src/common/turb/mode_turb_hor_vw.F90 +++ b/src/common/turb/mode_turb_hor_vw.F90 @@ -77,7 +77,6 @@ USE MODI_GRADIENT_U USE MODI_GRADIENT_V USE MODI_GRADIENT_W USE MODI_SHUMAN -USE MODE_COEFJ, ONLY: COEFJ USE MODI_LES_MEAN_SUBGRID ! USE MODI_SECOND_MNH diff --git a/src/common/turb/mode_turb_ver.F90 b/src/common/turb/mode_turb_ver.F90 index 8553a63ea..7fbabc4a6 100644 --- a/src/common/turb/mode_turb_ver.F90 +++ b/src/common/turb/mode_turb_ver.F90 @@ -219,13 +219,10 @@ USE MODD_CTURB, ONLY: CSTURB_t USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t USE MODD_FIELD, ONLY: TFIELDMETADATA, TYPEREAL USE MODD_IO, ONLY: TFILEDATA -USE MODD_PARAMETERS, ONLY: JPVEXT_TURB USE MODD_LES, ONLY: TLES_t USE MODD_TURB_n, ONLY: TURB_t USE MODD_NEB_n, ONLY: NEB_t ! -USE MODE_EMOIST, ONLY: EMOIST -USE MODE_ETHETA, ONLY: ETHETA USE MODE_GRADIENT_M_PHY, ONLY: GZ_M_W_PHY USE MODE_IO_FIELD_WRITE_PHY, ONLY: IO_FIELD_WRITE_PHY USE MODE_PRANDTL, ONLY: PSI_SV, PSI3, PHI3, PRANDTL diff --git a/src/common/turb/mode_turb_ver_dyn_flux.F90 b/src/common/turb/mode_turb_ver_dyn_flux.F90 index acda739bf..8814e1d66 100644 --- a/src/common/turb/mode_turb_ver_dyn_flux.F90 +++ b/src/common/turb/mode_turb_ver_dyn_flux.F90 @@ -214,7 +214,7 @@ USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t USE MODD_FIELD, ONLY: TFIELDMETADATA, TYPEREAL USE MODD_IO, ONLY: TFILEDATA USE MODD_LES, ONLY: TLES_t -USE MODD_PARAMETERS, ONLY: JPVEXT_TURB, XUNDEF +USE MODD_PARAMETERS, ONLY: XUNDEF USE MODD_TURB_n, ONLY: TURB_t ! USE MODE_GRADIENT_U_PHY, ONLY : GZ_U_UW_PHY, GX_U_M_PHY @@ -317,7 +317,7 @@ REAL, DIMENSION(D%NIJT,D%NKT) :: & ZKEFF, & ! effectif diffusion coeff = LT * SQRT( TKE ) ZWORK1,ZWORK2,& ZWORK3,ZWORK4,& - ZWORK5,ZWORK6! working var. for shuman operators (array syntax) + ZWORK5 ! working var. for shuman operators (array syntax) ! INTEGER :: IIJE,IIJB,IKB,IKE,IKA,IKU ! index value for the mass points of the domain INTEGER :: IKT ! array size in k direction diff --git a/src/common/turb/mode_turb_ver_sv_corr.F90 b/src/common/turb/mode_turb_ver_sv_corr.F90 index 3e4604d23..d0756b1fb 100644 --- a/src/common/turb/mode_turb_ver_sv_corr.F90 +++ b/src/common/turb/mode_turb_ver_sv_corr.F90 @@ -60,7 +60,6 @@ USE MODD_CST, ONLY: CST_t USE MODD_CTURB, ONLY: CSTURB_t USE MODD_TURB_n, ONLY: TURB_t USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t -USE MODD_PARAMETERS, ONLY: JPVEXT_TURB USE MODD_LES, ONLY: TLES_t ! USE MODE_SHUMAN_PHY, ONLY: MZF_PHY diff --git a/src/common/turb/mode_turb_ver_sv_flux.F90 b/src/common/turb/mode_turb_ver_sv_flux.F90 index 3655723bf..e78333ce7 100644 --- a/src/common/turb/mode_turb_ver_sv_flux.F90 +++ b/src/common/turb/mode_turb_ver_sv_flux.F90 @@ -219,11 +219,9 @@ USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t USE MODD_FIELD, ONLY: TFIELDMETADATA, TYPEREAL USE MODD_IO, ONLY: TFILEDATA USE MODD_LES, ONLY: TLES_t -USE MODD_PARAMETERS, ONLY: JPVEXT_TURB, NMNHNAMELGTMAX +USE MODD_PARAMETERS, ONLY: NMNHNAMELGTMAX USE MODD_TURB_n, ONLY: TURB_t ! -USE MODE_EMOIST, ONLY: EMOIST -USE MODE_ETHETA, ONLY: ETHETA USE MODE_GRADIENT_W_PHY, ONLY: GZ_W_M_PHY USE MODE_GRADIENT_M_PHY, ONLY: GZ_M_W_PHY USE MODE_IO_FIELD_WRITE_PHY, ONLY: IO_FIELD_WRITE_PHY diff --git a/src/common/turb/mode_turb_ver_thermo_corr.F90 b/src/common/turb/mode_turb_ver_thermo_corr.F90 index d4f9ec5d6..15bb4f073 100644 --- a/src/common/turb/mode_turb_ver_thermo_corr.F90 +++ b/src/common/turb/mode_turb_ver_thermo_corr.F90 @@ -311,14 +311,11 @@ REAL, DIMENSION(MERGE(D%NIJT,0,OCOMPUTE_SRC),& ! ! REAL, DIMENSION(D%NIJT,D%NKT) :: & - ZA, & ! work variable for wrc ZFLXZ, & ! vertical flux of the treated variable - ZSOURCE, & ! source of evolution for the treated variable ZKEFF, & ! effectif diffusion coeff = LT * SQRT( TKE ) ZF, & ! Flux in dTh/dt =-dF/dz (evaluated at t-1)(or rt instead of Th) ZDFDDTDZ, & ! dF/d(dTh/dz) ZDFDDRDZ, & ! dF/d(dr/dz) - Z3RDMOMENT, & ! 3 order term in flux or variance equation ! Estimate of full level length and dissipation length scale in case TURBN%LHARATU PLMF, & ! estimate full level length scale from half levels (sub optimal) PLEPSF, & ! estimate full level diss length scale from half levels (sub optimal) diff --git a/src/common/turb/mode_turb_ver_thermo_flux.F90 b/src/common/turb/mode_turb_ver_thermo_flux.F90 index c1d10b037..9d65e0a16 100644 --- a/src/common/turb/mode_turb_ver_thermo_flux.F90 +++ b/src/common/turb/mode_turb_ver_thermo_flux.F90 @@ -239,7 +239,7 @@ USE MODD_DIMPHYEX, ONLY: DIMPHYEX_t USE MODD_FIELD, ONLY: TFIELDMETADATA, TYPEREAL USE MODD_IO, ONLY: TFILEDATA USE MODD_LES, ONLY: TLES_t -USE MODD_PARAMETERS, ONLY: JPVEXT_TURB, JPHEXT, XUNDEF +USE MODD_PARAMETERS, ONLY: XUNDEF USE MODD_TURB_n, ONLY: TURB_t ! USE MODE_GRADIENT_W_PHY, ONLY: GZ_W_M_PHY @@ -352,7 +352,6 @@ REAL, DIMENSION(D%NIJT), INTENT(IN),OPTIONAL :: PSSRFL_C ! O-A interface flu REAL, DIMENSION(D%NIJT,D%NKT) :: & ZA, & ! work variable for wrc or LES computation ZFLXZ, & ! vertical flux of the treated variable - ZSOURCE, & ! source of evolution for the treated variable ZKEFF, & ! effectif diffusion coeff = LT * SQRT( TKE ) ZF, & ! Flux in dTh/dt =-dF/dz (evaluated at t-1)(or rt instead of Th) ZDFDDTDZ, & ! dF/d(dTh/dz) @@ -375,10 +374,6 @@ INTEGER :: IIJB, IIJE INTEGER :: IKL ! REAL :: ZTIME1, ZTIME2 -REAL :: ZFLPROV -INTEGER :: JKM ! vertical index loop -INTEGER :: JSW -REAL :: ZSWA ! index for time flux interpolation ! INTEGER :: IIU, IJU LOGICAL :: GUSERV ! flag to use water diff --git a/src/common/turb/turb.F90 b/src/common/turb/turb.F90 index 255611d2d..27165edd3 100644 --- a/src/common/turb/turb.F90 +++ b/src/common/turb/turb.F90 @@ -244,7 +244,7 @@ USE MODE_SHUMAN_PHY, ONLY: MZF_PHY,MXF_PHY,MYF_PHY USE YOMHOOK , ONLY: LHOOK, DR_HOOK ! USE MODD_BUDGET, ONLY: NBUDGET_U, NBUDGET_V, NBUDGET_W, NBUDGET_TH, NBUDGET_RV, NBUDGET_RC, & - NBUDGET_RR, NBUDGET_RI, NBUDGET_RS, NBUDGET_RG, NBUDGET_RH, NBUDGET_SV1, & + NBUDGET_RI, NBUDGET_SV1, & TBUDGETDATA, TBUDGETCONF_t USE MODD_CST, ONLY: CST_t USE MODD_CTURB, ONLY: CSTURB_t @@ -488,7 +488,6 @@ REAL :: ZCOEF_AMPL_CEI_NUL! Ordonnate at the origin of the ! amplification straight line (for routine CLOUD_MODIF_LM) ! INTEGER :: IIJB,IIJE,IKB,IKE ! index value for the -INTEGER :: IINFO_ll ! return code of parallel routine ! Beginning and the End of the physical domain for the mass points INTEGER :: IKT,IKA,IKU ! array size in k direction INTEGER :: IKL -- GitLab