From b210c3550793a09129025a98e156b307b0ae79ce Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Mon, 28 Jun 2021 10:28:28 +0200
Subject: [PATCH] Philippe 28/06/2021: budgets: rename source term CDEPI in
DEPI
---
src/MNH/ice_adjust_elec.f90 | 32 ++++++++++++++++----------------
src/MNH/ini_budget.f90 | 16 ++++++++--------
src/MNH/lima.f90 | 6 +++---
src/MNH/resolved_cloud.f90 | 4 ++--
4 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/MNH/ice_adjust_elec.f90 b/src/MNH/ice_adjust_elec.f90
index e6342ea11..2aa614e7c 100644
--- a/src/MNH/ice_adjust_elec.f90
+++ b/src/MNH/ice_adjust_elec.f90
@@ -305,15 +305,15 @@ ZT0 = XTT ! Usefull if LPRETREATMENT=T or LNEW_ADJUST=T
ZT00 = XTT-40. ! Usefull if LPRETREATMENT=T or LNEW_ADJUST=T
!
!-------------------------------------------------------------------------------
-if ( lbudget_th ) call Budget_store_init( tbudgets(NBUDGET_TH), 'CDEPI', pths(:, :, :) * prhodj(:, :, :) )
-if ( lbudget_rv ) call Budget_store_init( tbudgets(NBUDGET_RV), 'CDEPI', prvs(:, :, :) * prhodj(:, :, :) )
-if ( lbudget_rc ) call Budget_store_init( tbudgets(NBUDGET_RC), 'CDEPI', prcs(:, :, :) * prhodj(:, :, :) )
-if ( lbudget_ri ) call Budget_store_init( tbudgets(NBUDGET_RI), 'CDEPI', pris(:, :, :) * prhodj(:, :, :) )
+if ( lbudget_th ) call Budget_store_init( tbudgets(NBUDGET_TH), 'DEPI', pths(:, :, :) * prhodj(:, :, :) )
+if ( lbudget_rv ) call Budget_store_init( tbudgets(NBUDGET_RV), 'DEPI', prvs(:, :, :) * prhodj(:, :, :) )
+if ( lbudget_rc ) call Budget_store_init( tbudgets(NBUDGET_RC), 'DEPI', prcs(:, :, :) * prhodj(:, :, :) )
+if ( lbudget_ri ) call Budget_store_init( tbudgets(NBUDGET_RI), 'DEPI', pris(:, :, :) * prhodj(:, :, :) )
if ( lbudget_sv ) then
- call Budget_store_init( tbudgets(NBUDGET_SV1 - 1 + nsv_elecbeg ), 'CDEPI', pqpis(:, :, :) * prhodj(:, :, :) )
- call Budget_store_init( tbudgets(NBUDGET_SV1 - 1 + nsv_elecend ), 'CDEPI', pqnis(:, :, :) * prhodj(:, :, :) )
- call Budget_store_init( tbudgets(NBUDGET_SV1 - 1 + nsv_elecbeg + 1 ), 'CDEPI', pqcs (:, :, :) * prhodj(:, :, :) )
- call Budget_store_init( tbudgets(NBUDGET_SV1 - 1 + nsv_elecbeg + 3 ), 'CDEPI', pqis (:, :, :) * prhodj(:, :, :) )
+ call Budget_store_init( tbudgets(NBUDGET_SV1 - 1 + nsv_elecbeg ), 'DEPI', pqpis(:, :, :) * prhodj(:, :, :) )
+ call Budget_store_init( tbudgets(NBUDGET_SV1 - 1 + nsv_elecend ), 'DEPI', pqnis(:, :, :) * prhodj(:, :, :) )
+ call Budget_store_init( tbudgets(NBUDGET_SV1 - 1 + nsv_elecbeg + 1 ), 'DEPI', pqcs (:, :, :) * prhodj(:, :, :) )
+ call Budget_store_init( tbudgets(NBUDGET_SV1 - 1 + nsv_elecbeg + 3 ), 'DEPI', pqis (:, :, :) * prhodj(:, :, :) )
end if
!
!* 2. COMPUTE QUANTITIES WITH THE GUESS OF THE FUTURE INSTANT
@@ -630,15 +630,15 @@ ENDIF
!* 6. STORE THE BUDGET TERMS
! ----------------------
!
-if ( lbudget_th ) call Budget_store_end( tbudgets(NBUDGET_TH), 'CDEPI', pths(:, :, :) * prhodj(:, :, :) )
-if ( lbudget_rv ) call Budget_store_end( tbudgets(NBUDGET_RV), 'CDEPI', prvs(:, :, :) * prhodj(:, :, :) )
-if ( lbudget_rc ) call Budget_store_end( tbudgets(NBUDGET_RC), 'CDEPI', prcs(:, :, :) * prhodj(:, :, :) )
-if ( lbudget_ri ) call Budget_store_end( tbudgets(NBUDGET_RI), 'CDEPI', pris(:, :, :) * prhodj(:, :, :) )
+if ( lbudget_th ) call Budget_store_end( tbudgets(NBUDGET_TH), 'DEPI', pths(:, :, :) * prhodj(:, :, :) )
+if ( lbudget_rv ) call Budget_store_end( tbudgets(NBUDGET_RV), 'DEPI', prvs(:, :, :) * prhodj(:, :, :) )
+if ( lbudget_rc ) call Budget_store_end( tbudgets(NBUDGET_RC), 'DEPI', prcs(:, :, :) * prhodj(:, :, :) )
+if ( lbudget_ri ) call Budget_store_end( tbudgets(NBUDGET_RI), 'DEPI', pris(:, :, :) * prhodj(:, :, :) )
if ( lbudget_sv ) then
- call Budget_store_end( tbudgets(NBUDGET_SV1 - 1 + nsv_elecbeg ), 'CDEPI', pqpis(:, :, :) * prhodj(:, :, :) )
- call Budget_store_end( tbudgets(NBUDGET_SV1 - 1 + nsv_elecend ), 'CDEPI', pqnis(:, :, :) * prhodj(:, :, :) )
- call Budget_store_end( tbudgets(NBUDGET_SV1 - 1 + nsv_elecbeg + 1 ), 'CDEPI', pqcs (:, :, :) * prhodj(:, :, :) )
- call Budget_store_end( tbudgets(NBUDGET_SV1 - 1 + nsv_elecbeg + 3 ), 'CDEPI', pqis (:, :, :) * prhodj(:, :, :) )
+ call Budget_store_end( tbudgets(NBUDGET_SV1 - 1 + nsv_elecbeg ), 'DEPI', pqpis(:, :, :) * prhodj(:, :, :) )
+ call Budget_store_end( tbudgets(NBUDGET_SV1 - 1 + nsv_elecend ), 'DEPI', pqnis(:, :, :) * prhodj(:, :, :) )
+ call Budget_store_end( tbudgets(NBUDGET_SV1 - 1 + nsv_elecbeg + 1 ), 'DEPI', pqcs (:, :, :) * prhodj(:, :, :) )
+ call Budget_store_end( tbudgets(NBUDGET_SV1 - 1 + nsv_elecbeg + 3 ), 'DEPI', pqis (:, :, :) * prhodj(:, :, :) )
end if
!------------------------------------------------------------------------------
!
diff --git a/src/MNH/ini_budget.f90 b/src/MNH/ini_budget.f90
index 116455605..b7c106947 100644
--- a/src/MNH/ini_budget.f90
+++ b/src/MNH/ini_budget.f90
@@ -1236,7 +1236,7 @@ if ( lbu_rth ) then
tzsource%lavailable = hcloud(1:3) == 'ICE' .and. lred .and. ladj_before .and. celec == 'NONE'
call Budget_source_add( tbudgets(NBUDGET_TH), tzsource )
- tzsource%cmnhname = 'CDEPI'
+ tzsource%cmnhname = 'DEPI'
tzsource%clongname = 'deposition on ice'
tzsource%lavailable = hcloud(1:3) == 'ICE' .and. ( .not. lred .or. ( lred .and. ladj_after ) .or. celec /= 'NONE')&
.or. (hcloud == 'LIMA' .and. lptsplit)
@@ -1548,7 +1548,7 @@ if ( tbudgets(NBUDGET_RV)%lenabled ) then
tzsource%lavailable = hcloud(1:3) == 'ICE' .and. lred .and. celec == 'NONE'
call Budget_source_add( tbudgets(NBUDGET_RV), tzsource )
- tzsource%cmnhname = 'CDEPI'
+ tzsource%cmnhname = 'DEPI'
tzsource%clongname = 'deposition on ice'
tzsource%lavailable = hcloud(1:3) == 'ICE' .and. ( .not. lred .or. ( lred .and. ladj_after ) .or. celec /= 'NONE')&
.or. (hcloud == 'LIMA' .and. lptsplit)
@@ -1819,7 +1819,7 @@ if ( tbudgets(NBUDGET_RC)%lenabled ) then
tzsource%lavailable = hcloud == 'LIMA'
call Budget_source_add( tbudgets(NBUDGET_RC), tzsource )
- tzsource%cmnhname = 'CDEPI'
+ tzsource%cmnhname = 'DEPI'
tzsource%clongname = 'condensation/deposition on ice'
tzsource%lavailable = hcloud(1:3) == 'ICE' .and. ( .not. lred .or. ( lred .and. ladj_after ) .or. celec /= 'NONE' )
call Budget_source_add( tbudgets(NBUDGET_RC), tzsource )
@@ -2299,7 +2299,7 @@ if ( tbudgets(NBUDGET_RI)%lenabled ) then
tzsource%lavailable = hcloud == 'LIMA'
call Budget_source_add( tbudgets(NBUDGET_RI), tzsource )
- tzsource%cmnhname = 'CDEPI'
+ tzsource%cmnhname = 'DEPI'
tzsource%clongname = 'condensation/deposition on ice'
tzsource%lavailable = hcloud(1:3) == 'ICE' .and. ( .not. lred .or. ( lred .and. ladj_after ) .or. celec /= 'NONE')&
.or. (hcloud == 'LIMA' .and. lptsplit)
@@ -3564,7 +3564,7 @@ SV_BUDGETS: do jsv = 1, ksv
tzsource%lavailable = lwarm_ice
call Budget_source_add( tbudgets(ibudget), tzsource )
- tzsource%cmnhname = 'CDEPI'
+ tzsource%cmnhname = 'DEPI'
tzsource%clongname = 'condensation/deposition on ice'
tzsource%lavailable = .true.
call Budget_source_add( tbudgets(ibudget), tzsource )
@@ -3632,7 +3632,7 @@ SV_BUDGETS: do jsv = 1, ksv
tzsource%lavailable = lsedic_ice
call Budget_source_add( tbudgets(ibudget), tzsource )
- tzsource%cmnhname = 'CDEPI'
+ tzsource%cmnhname = 'DEPI'
tzsource%clongname = 'condensation/deposition on ice'
tzsource%lavailable = .true.
call Budget_source_add( tbudgets(ibudget), tzsource )
@@ -3767,7 +3767,7 @@ SV_BUDGETS: do jsv = 1, ksv
tzsource%lavailable = .true.
call Budget_source_add( tbudgets(ibudget), tzsource )
- tzsource%cmnhname = 'CDEPI'
+ tzsource%cmnhname = 'DEPI'
tzsource%clongname = 'condensation/deposition on ice'
tzsource%lavailable = .true.
call Budget_source_add( tbudgets(ibudget), tzsource )
@@ -3965,7 +3965,7 @@ SV_BUDGETS: do jsv = 1, ksv
tzsource%lavailable = lwarm_ice
call Budget_source_add( tbudgets(ibudget), tzsource )
- tzsource%cmnhname = 'CDEPI'
+ tzsource%cmnhname = 'DEPI'
tzsource%clongname = 'condensation/deposition on ice'
tzsource%lavailable = .true.
call Budget_source_add( tbudgets(ibudget), tzsource )
diff --git a/src/MNH/lima.f90 b/src/MNH/lima.f90
index 1ba30a399..1b6dc87de 100644
--- a/src/MNH/lima.f90
+++ b/src/MNH/lima.f90
@@ -1648,7 +1648,7 @@ if ( lbu_enable ) then
call Budget_store_add( tbudgets(NBUDGET_TH), 'HONC', ztot_th_honc (:, :, :) * zrhodjontstep(:, :, :) )
call Budget_store_add( tbudgets(NBUDGET_TH), 'HONR', ztot_th_honr (:, :, :) * zrhodjontstep(:, :, :) )
call Budget_store_add( tbudgets(NBUDGET_TH), 'DEPS', ztot_th_deps (:, :, :) * zrhodjontstep(:, :, :) )
- call Budget_store_add( tbudgets(NBUDGET_TH), 'CDEPI', ztot_th_depi (:, :, :) * zrhodjontstep(:, :, :) )
+ call Budget_store_add( tbudgets(NBUDGET_TH), 'DEPI', ztot_th_depi (:, :, :) * zrhodjontstep(:, :, :) )
call Budget_store_add( tbudgets(NBUDGET_TH), 'DEPG', ztot_th_depg (:, :, :) * zrhodjontstep(:, :, :) )
call Budget_store_add( tbudgets(NBUDGET_TH), 'IMLT', ztot_th_imlt (:, :, :) * zrhodjontstep(:, :, :) )
call Budget_store_add( tbudgets(NBUDGET_TH), 'BERFI', ztot_th_berfi(:, :, :) * zrhodjontstep(:, :, :) )
@@ -1663,7 +1663,7 @@ if ( lbu_enable ) then
if ( lbudget_rv ) then
call Budget_store_add( tbudgets(NBUDGET_RV), 'REVA', -ztot_rr_evap (:, :, :) * zrhodjontstep(:, :, :) )
call Budget_store_add( tbudgets(NBUDGET_RV), 'DEPS', -ztot_rs_deps (:, :, :) * zrhodjontstep(:, :, :) )
- call Budget_store_add( tbudgets(NBUDGET_RV), 'CDEPI', -ztot_ri_depi (:, :, :) * zrhodjontstep(:, :, :) )
+ call Budget_store_add( tbudgets(NBUDGET_RV), 'DEPI', -ztot_ri_depi (:, :, :) * zrhodjontstep(:, :, :) )
call Budget_store_add( tbudgets(NBUDGET_RV), 'DEPG', -ztot_rg_depg (:, :, :) * zrhodjontstep(:, :, :) )
call Budget_store_add( tbudgets(NBUDGET_RV), 'CORR2', ztot_rv_corr2(:, :, :) * zrhodjontstep(:, :, :) )
end if
@@ -1705,7 +1705,7 @@ if ( lbu_enable ) then
call Budget_store_add( tbudgets(NBUDGET_RI), 'BERFI', -ztot_rc_berfi(:, :, :) * zrhodjontstep(:, :, :) )
call Budget_store_add( tbudgets(NBUDGET_RI), 'HMS', ztot_ri_hms (:, :, :) * zrhodjontstep(:, :, :) )
call Budget_store_add( tbudgets(NBUDGET_RI), 'CFRZ', ztot_ri_cfrz (:, :, :) * zrhodjontstep(:, :, :) )
- call Budget_store_add( tbudgets(NBUDGET_RI), 'CDEPI', ztot_ri_depi (:, :, :) * zrhodjontstep(:, :, :) )
+ call Budget_store_add( tbudgets(NBUDGET_RI), 'DEPI', ztot_ri_depi (:, :, :) * zrhodjontstep(:, :, :) )
call Budget_store_add( tbudgets(NBUDGET_RI), 'WETG', ztot_ri_wetg (:, :, :) * zrhodjontstep(:, :, :) )
call Budget_store_add( tbudgets(NBUDGET_RI), 'DRYG', ztot_ri_dryg (:, :, :) * zrhodjontstep(:, :, :) )
call Budget_store_add( tbudgets(NBUDGET_RI), 'HMG', ztot_ri_hmg (:, :, :) * zrhodjontstep(:, :, :) )
diff --git a/src/MNH/resolved_cloud.f90 b/src/MNH/resolved_cloud.f90
index 2dd7d2b7d..aa2e2070c 100644
--- a/src/MNH/resolved_cloud.f90
+++ b/src/MNH/resolved_cloud.f90
@@ -802,7 +802,7 @@ SELECT CASE ( HCLOUD )
!
IF (.NOT. LRED .OR. (LRED .AND. LADJ_AFTER) ) THEN
CALL ICE_ADJUST (1, IKU, 1, KRR, CFRAC_ICE_ADJUST, CCONDENS, CLAMBDA3, &
- 'CDEPI', OSUBG_COND, OSIGMAS, CSUBG_MF_PDF, &
+ 'DEPI', OSUBG_COND, OSIGMAS, CSUBG_MF_PDF, &
PTSTEP, PSIGQSAT, &
PRHODJ, PEXNREF, PRHODREF, PSIGS, PMFCONV, PPABST, ZZZ, &
ZEXN, PCF_MF, PRC_MF, PRI_MF, &
@@ -900,7 +900,7 @@ SELECT CASE ( HCLOUD )
!
IF (.NOT. LRED .OR. (LRED .AND. LADJ_AFTER) ) THEN
CALL ICE_ADJUST (1, IKU, 1, KRR, CFRAC_ICE_ADJUST, CCONDENS, CLAMBDA3, &
- 'CDEPI', OSUBG_COND, OSIGMAS, CSUBG_MF_PDF, &
+ 'DEPI', OSUBG_COND, OSIGMAS, CSUBG_MF_PDF, &
PTSTEP, PSIGQSAT, &
PRHODJ, PEXNREF, PRHODREF, PSIGS, PMFCONV, PPABST, ZZZ, &
ZEXN, PCF_MF, PRC_MF, PRI_MF, &
--
GitLab