From 4ed805fc3a7d599ced8b56fd7e93096150d1975e Mon Sep 17 00:00:00 2001 From: Quentin Rodier <quentin.rodier@meteo.fr> Date: Wed, 26 Feb 2020 12:08:39 +0100 Subject: [PATCH] Christine 26/02/2020: missing condition for budget on RC and SV in drag_veg; missing allocation of INPRC and ACPRC with deposition; correction of typo on budget SV CEVA_BU_RSV instead of REVA_BU_RSV --- src/MNH/drag_veg.f90 | 7 +++++-- src/MNH/ini_micron.f90 | 8 ++++---- src/MNH/rain_c2r2_khko.f90 | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/MNH/drag_veg.f90 b/src/MNH/drag_veg.f90 index ec75de6d9..0e4268c2d 100644 --- a/src/MNH/drag_veg.f90 +++ b/src/MNH/drag_veg.f90 @@ -70,6 +70,7 @@ SUBROUTINE DRAG_VEG(PTSTEP,PUT,PVT,PTKET,ODEPOTREE, PVDEPOTREE, & !! C.Lac 07/2016 : Add droplet deposition !! C.Lac 10/2017 : Correction on deposition !! C.Lac 11/2019 : Correction in the drag formula and application to building in addition to tree + !! C.Lac 02/2020 : Correction missing condition for budget on RC and SV !!--------------------------------------------------------------- ! ! @@ -285,8 +286,10 @@ SUBROUTINE DRAG_VEG(PTSTEP,PUT,PVT,PTKET,ODEPOTREE, PVDEPOTREE, & ! IF (LBUDGET_U) CALL BUDGET (PRUS,1,'DRAG_BU_RU') IF (LBUDGET_V) CALL BUDGET (PRVS,2,'DRAG_BU_RV') - IF (LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2),7,'DEPOTR_BU_RRC') - IF (LBUDGET_SV) CALL BUDGET (PSVS(:,:,:,NSV_C2R2BEG+1),14+(NSV_C2R2BEG-1),'DEPOTR_BU_RSV') + IF (ODEPOTREE) THEN + IF (LBUDGET_RC) CALL BUDGET (PRRS(:,:,:,2),7,'DEPOTR_BU_RRC') + IF (LBUDGET_SV) CALL BUDGET (PSVS(:,:,:,NSV_C2R2BEG+1),14+(NSV_C2R2BEG-1),'DEPOTR_BU_RSV') + END IF ! !* 3. Computations of TKE tendency due to canopy drag ! ------------------------------------------------ diff --git a/src/MNH/ini_micron.f90 b/src/MNH/ini_micron.f90 index e77c68926..ecdcce161 100644 --- a/src/MNH/ini_micron.f90 +++ b/src/MNH/ini_micron.f90 @@ -52,7 +52,7 @@ END MODULE MODI_INI_MICRO_n !! C.LAc 10/2016 Add budget for droplet deposition !! Philippe Wautelet: 05/2016-04/2018: new data structures and calls for I/O !! P.Wautelet 01/2019: bug: add missing allocations -!! +!! C.Lac 02/2020: add missing allocation of INPRC and ACPRC with deposition !! -------------------------------------------------------------------------- ! !* 0. DECLARATIONS @@ -161,9 +161,9 @@ ELSE ALLOCATE(XACPRR(0,0)) END IF ! -IF (( CCLOUD(1:3) == 'ICE' .AND.LSEDIC) .OR. & - ((CCLOUD=='C2R2' .OR. CCLOUD=='C3R5' .OR. CCLOUD=='KHKO').AND.LSEDC) .OR. & - ( CCLOUD=='LIMA' .AND.MSEDC)) THEN +IF (( CCLOUD(1:3) == 'ICE' .AND.(LSEDIC .OR. LDEPOSC)) .OR. & + ((CCLOUD=='C2R2' .OR. CCLOUD=='C3R5' .OR. CCLOUD=='KHKO').AND.(LSEDC .OR. LDEPOC)) .OR. & + ( CCLOUD=='LIMA' .AND.(MSEDC .OR. MDEPOC))) THEN ALLOCATE(XINPRC(IIU,IJU)) ALLOCATE(XACPRC(IIU,IJU)) XINPRC(:,:)=0.0 diff --git a/src/MNH/rain_c2r2_khko.f90 b/src/MNH/rain_c2r2_khko.f90 index 33f070d10..9f190775b 100644 --- a/src/MNH/rain_c2r2_khko.f90 +++ b/src/MNH/rain_c2r2_khko.f90 @@ -1720,7 +1720,7 @@ ENDIF IF (LBUDGET_RV) CALL BUDGET (PRVS(:,:,:)*PRHODJ(:,:,:),6 ,'REVA_BU_RRV') IF (LBUDGET_RR) CALL BUDGET (PRRS(:,:,:)*PRHODJ(:,:,:),8 ,'REVA_BU_RRR') IF (LBUDGET_TH) CALL BUDGET (PTHS(:,:,:)*PRHODJ(:,:,:),4 ,'REVA_BU_RTH') -IF (LBUDGET_SV) CALL BUDGET (PCRS(:,:,:)*PRHODJ(:,:,:),15+(NSV_C2R2BEG-1),'CEVA_BU_RSV') +IF (LBUDGET_SV) CALL BUDGET (PCRS(:,:,:)*PRHODJ(:,:,:),15+(NSV_C2R2BEG-1),'REVA_BU_RSV') ! END SUBROUTINE C2R2_KHKO_EVAPORATION ! -- GitLab