From 936c8b9b9136262b3a67ee281e8c91713b69db33 Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Thu, 11 Feb 2021 11:47:37 +0100
Subject: [PATCH] Philippe 11/02/2021: budgets: add missing term SCAV for
NSV_LIMA_SCAVMASS budget
(cherry picked from commit f3926a78e2669cfaf23ea27f8abde7519f828592)
---
src/MNH/ini_budget.f90 | 6 ++++++
src/MNH/lima_precip_scavenging.f90 | 5 +++++
2 files changed, 11 insertions(+)
diff --git a/src/MNH/ini_budget.f90 b/src/MNH/ini_budget.f90
index 9d357c6a9..0bdaadb6d 100644
--- a/src/MNH/ini_budget.f90
+++ b/src/MNH/ini_budget.f90
@@ -172,6 +172,7 @@ END MODULE MODI_INI_BUDGET
! P. Wautelet 02/02/2021: budgets: add missing source terms for SV budgets in LIMA
! P. Wautelet 03/02/2021: budgets: add new source if LIMA splitting: CORR2
! P. Wautelet 10/02/2021: budgets: add missing sources for NSV_C2R2BEG+3 budget
+! P. Wautelet 11/02/2021: budgets: add missing term SCAV for NSV_LIMA_SCAVMASS budget
!-------------------------------------------------------------------------------
!
!* 0. DECLARATIONS
@@ -3574,6 +3575,11 @@ ELSEIF (JSV >= NSV_LIMA_BEG .AND. JSV <= NSV_LIMA_END) THEN
ILAST_PROC_NBR = ILAST_PROC_NBR + 1
YWORK2(12+JSV,ILAST_PROC_NBR)= 'NECON_'
IPROACTV(12+JSV,ILAST_PROC_NBR) = NNECONSV
+ IF (OSCAV) THEN
+ ILAST_PROC_NBR = ILAST_PROC_NBR + 1
+ YWORK2(12+JSV,ILAST_PROC_NBR)= 'SCAV_'
+ IPROACTV(12+JSV,ILAST_PROC_NBR) = 1
+ END IF
ELSE IF (JSV == NSV_LIMA_NI) THEN
! Pristine ice crystals conc.
diff --git a/src/MNH/lima_precip_scavenging.f90 b/src/MNH/lima_precip_scavenging.f90
index 6a74259a2..933c6362b 100644
--- a/src/MNH/lima_precip_scavenging.f90
+++ b/src/MNH/lima_precip_scavenging.f90
@@ -103,6 +103,7 @@ END MODULE MODI_LIMA_PRECIP_SCAVENGING
! P. Wautelet 03/2020: use the new data structures and subroutines for budgets
! P. Wautelet 03/06/2020: bugfix: correct array starts for PSVT and PRSVS
! P. Wautelet 11/02/2021: bugfix: ZRTMIN was of wrong size (replaced by a scalar)
+! P. Wautelet 11/02/2021: budgets: add missing term SCAV for NSV_LIMA_SCAVMASS budget
!-------------------------------------------------------------------------------
!
!* 0.DECLARATIONS
@@ -574,6 +575,10 @@ IF (LBUDGET_SV) THEN
12+NSV_LIMA_IFN_FREE+JL-1,'SCAV_BU_RSV')
END DO
END IF
+ IF ( LAERO_MASS ) THEN
+ CALL BUDGET ( PRSVS(:,:,:,NSV_LIMA_SCAVMASS), &
+ 12+NSV_LIMA_SCAVMASS, 'SCAV_BU_RSV')
+ END IF
END IF
!
!------------------------------------------------------------------------------
--
GitLab