From aadf089220e77f9aaa384e3b7ee72021fcb5e1ed Mon Sep 17 00:00:00 2001
From: Quentin Rodier <quentin.rodier@meteo.fr>
Date: Tue, 10 Dec 2024 13:31:14 +0100
Subject: [PATCH] Quentin 10/12/2024: clean aerosols module use in LIMA before
inclusion in PHYEX
---
src/PHYEX/micro/lima_warm_nucl.f90 | 6 +++---
src/PHYEX/micro/mode_init_aerosol_properties.f90 | 12 +++++++-----
src/PHYEX/micro/mode_lima_ccn_activation.f90 | 7 +++----
src/PHYEX/micro/rain_c2r2_khko.f90 | 6 +++---
4 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/PHYEX/micro/lima_warm_nucl.f90 b/src/PHYEX/micro/lima_warm_nucl.f90
index 3708626bf..5f5fc5942 100644
--- a/src/PHYEX/micro/lima_warm_nucl.f90
+++ b/src/PHYEX/micro/lima_warm_nucl.f90
@@ -116,16 +116,16 @@ END MODULE MODI_LIMA_WARM_NUCL
!* 0. DECLARATIONS
! ------------
!
-USE MODD_CH_AEROSOL
+USE MODD_CH_AEROSOL, ONLY: LORILAM
USE MODD_CST
-USE MODD_DUST
+USE MODD_DUST, ONLY: LDUST
use modd_field, only: TFIELDMETADATA, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_LUNIT_n, ONLY: TLUOUT
USE MODD_PARAMETERS, ONLY : JPHEXT, JPVEXT
USE MODD_PARAM_LIMA
USE MODD_PARAM_LIMA_WARM
-USE MODD_SALT
+USE MODD_SALT, ONLY: LSALT
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
diff --git a/src/PHYEX/micro/mode_init_aerosol_properties.f90 b/src/PHYEX/micro/mode_init_aerosol_properties.f90
index a3aa65c68..78cab4f1c 100644
--- a/src/PHYEX/micro/mode_init_aerosol_properties.f90
+++ b/src/PHYEX/micro/mode_init_aerosol_properties.f90
@@ -52,11 +52,13 @@ USE MODD_PARAM_LIMA, ONLY : NMOD_CCN, HINI_CCN, HTYPE_CCN, &
NIMM, NMOD_IMM, NINDICE_CCN_IMM, &
PARAM_LIMA_ALLOCATE, PARAM_LIMA_DEALLOCATE
!
-USE MODD_CH_AEROSOL
-USE MODD_SALT
-USE MODD_CSTS_SALT
-USE MODD_DUST
-USE MODD_CSTS_DUST
+USE MODD_CH_AEROSOL, ONLY: LORILAM, XINISIGI, XINISIGJ, XINIRADIUSJ, CRGUNIT, XRHOI, &
+ NCARB, NSOA, NSP, &
+ JP_AER_OC, JP_AER_H2O, JP_AER_DST, JP_AER_BC, JP_AER_OC, JP_AER_SO4
+USE MODD_SALT, ONLY: LSALT, NMODE_SLT, XINISIG_SLT, CRGUNITS, XINIRADIUS_SLT
+USE MODD_CSTS_SALT, ONLY: XDENSITY_SALT
+USE MODD_DUST, ONLY: LDUST, JPDUSTORDER, XINIRADIUS, NMODE_DST, CRGUNITD, XINISIG
+USE MODD_CSTS_DUST, ONLY: XDENSITY_DUST
use mode_msg
!
USE MODI_GAMMA
diff --git a/src/PHYEX/micro/mode_lima_ccn_activation.f90 b/src/PHYEX/micro/mode_lima_ccn_activation.f90
index 9a4a943d3..bffe7cdad 100644
--- a/src/PHYEX/micro/mode_lima_ccn_activation.f90
+++ b/src/PHYEX/micro/mode_lima_ccn_activation.f90
@@ -77,10 +77,9 @@ USE MODD_PARAM_LIMA_WARM, ONLY: XWMIN, NAHEN, NHYP, XAHENINTP1, XAHENINTP2, XCST
XHYPINTP1, XHYPINTP2, XTMIN, XHYPF32, XPSI3, XAHENG, XAHENG2, XPSI1, &
XLBC, XLBEXC
USE MODD_NEB_n, ONLY: LSUBG_COND
-USE MODD_CH_AEROSOL
-USE MODD_DUST
-USE MODD_SALT
-USE MODD_NSV
+USE MODD_CH_AEROSOL, ONLY: LORILAM
+USE MODD_DUST, ONLY: LDUST
+USE MODD_SALT, ONLY: LSALT
USE MODI_CH_AER_ACTIVATION
diff --git a/src/PHYEX/micro/rain_c2r2_khko.f90 b/src/PHYEX/micro/rain_c2r2_khko.f90
index cf61ff365..f159b6e05 100644
--- a/src/PHYEX/micro/rain_c2r2_khko.f90
+++ b/src/PHYEX/micro/rain_c2r2_khko.f90
@@ -223,10 +223,10 @@ END MODULE MODI_RAIN_C2R2_KHKO
use modd_budget, only: lbudget_th, lbudget_rv, lbudget_rc, lbudget_rr, lbudget_sv, &
NBUDGET_TH, NBUDGET_RV, NBUDGET_RC, NBUDGET_RR, NBUDGET_SV1, &
tbudgets
-USE MODD_CH_AEROSOL
+USE MODD_CH_AEROSOL, ONLY: LORILAM
USE MODD_CONF
USE MODD_CST
-USE MODD_DUST
+USE MODD_DUST, ONLY: LDUST
use modd_field, only: tfieldmetadata, TYPEREAL
USE MODD_IO, ONLY: TFILEDATA
USE MODD_NSV, ONLY : NSV_C2R2BEG
@@ -234,7 +234,7 @@ USE MODD_PARAM_C2R2
USE MODD_PARAMETERS
USE MODD_RAIN_C2R2_DESCR
USE MODD_RAIN_C2R2_KHKO_PARAM
-USE MODD_SALT
+USE MODD_SALT, ONLY: LSALT
use mode_budget, only: Budget_store_init, Budget_store_end
USE MODE_IO_FIELD_WRITE, only: IO_Field_write
--
GitLab