From 78389720383ca99f6517ab8882fbc37c6beedc7f Mon Sep 17 00:00:00 2001
From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr>
Date: Thu, 11 Feb 2021 11:47:42 +0100
Subject: [PATCH] Philippe 11/02/2021: budgets: add missing term SCAV for
NSV_LIMA_SCAVMASS budget
---
src/MNH/ini_budget.f90 | 6 ++++++
src/MNH/lima_precip_scavenging.f90 | 7 +++++++
2 files changed, 13 insertions(+)
diff --git a/src/MNH/ini_budget.f90 b/src/MNH/ini_budget.f90
index da40e7ec1..7f989cc1d 100644
--- a/src/MNH/ini_budget.f90
+++ b/src/MNH/ini_budget.f90
@@ -204,6 +204,7 @@ end subroutine Budget_preallocate
! 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
@@ -3191,6 +3192,11 @@ SV_BUDGETS: do jsv = 1, ksv
else if ( jsv == nsv_lima_scavmass ) then SV_LIMA
! Scavenged mass variable
+ gcond = lscav_lima .and. laero_mass_lima
+ tzsource%cmnhname = 'SCAV'
+ tzsource%clongname = 'scavenging'
+ call Budget_source_add( tbudgets(ibudget), tzsource, gcond, igroup )
+
gcond = lscav_lima .and. laero_mass_lima
tzsource%cmnhname = 'CEDS'
tzsource%clongname = 'adjustment to saturation'
diff --git a/src/MNH/lima_precip_scavenging.f90 b/src/MNH/lima_precip_scavenging.f90
index a2b54e334..aaabf3f29 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
@@ -264,6 +265,9 @@ if ( lbudget_sv ) then
idx = nsv_lima_ifn_free - 1 + jl
call Budget_store_init( tbudgets(NBUDGET_SV1 - 1 + idx), 'SCAV', prsvs(:, :, :, idx) )
end do
+ if ( laero_mass ) then
+ call Budget_store_init( tbudgets(NBUDGET_SV1 - 1 + nsv_lima_scavmass), 'SCAV', prsvs(:, :, :, nsv_lima_scavmass) )
+ end if
end if
!
!* 1. PRELIMINARY COMPUTATIONS
@@ -580,6 +584,9 @@ if ( lbudget_sv ) then
idx = nsv_lima_ifn_free - 1 + jl
call Budget_store_end( tbudgets(NBUDGET_SV1 - 1 + idx), 'SCAV', prsvs(:, :, :, idx) )
end do
+ if ( laero_mass ) then
+ call Budget_store_end( tbudgets(NBUDGET_SV1 - 1 + nsv_lima_scavmass), 'SCAV', prsvs(:, :, :, nsv_lima_scavmass) )
+ end if
end if
!------------------------------------------------------------------------------
!
--
GitLab