From 77c1fae5970f59020fb795c646d985fb3199f3c2 Mon Sep 17 00:00:00 2001 From: VIE Benoit <vie@sxphynh> Date: Thu, 8 Sep 2022 17:12:12 +0200 Subject: [PATCH] bugfix --- src/MNH/lima_mixed_fast_processes.f90 | 12 ++++++------ src/MNH/lima_rain_accr_snow.f90 | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/MNH/lima_mixed_fast_processes.f90 b/src/MNH/lima_mixed_fast_processes.f90 index b3cfaa7e1..7b817fdd0 100644 --- a/src/MNH/lima_mixed_fast_processes.f90 +++ b/src/MNH/lima_mixed_fast_processes.f90 @@ -914,13 +914,13 @@ IF( IGACC>0 .AND. LRAIN) THEN ! WHERE ( GACC(:) ) ZZW1(:,2) = PCRT1D(:) * & !! coef of RRACCS - XFRACCSS*( PCST1D(:) )*( PRHODREF(:)**(-XCEXVT-1.) ) & + XFRACCSS*( PCST1D(:) )*( PRHODREF(:)**(-XCEXVT+1.) ) & *( XLBRACCS1/((PLBDAS(:)**2) ) + & XLBRACCS2/( PLBDAS(:) * PLBDAR(:) ) + & XLBRACCS3/( (PLBDAR(:)**2)) )/PLBDAR(:)**3 ! ZZNW1(:,2) = PCRT1D(:) * & !! coef of CRACCS - XFNRACCSS*( PCST1D(:) )*( PRHODREF(:)**(-XCEXVT-1.) ) & + XFNRACCSS*( PCST1D(:) )*( PRHODREF(:)**(-XCEXVT+1.) ) & *( XLBNRACCS1/((PLBDAS(:)**2) ) + & XLBNRACCS2/( PLBDAS(:) * PLBDAR(:) ) + & XLBNRACCS3/( (PLBDAR(:)**2)) ) @@ -991,13 +991,13 @@ IF( IGACC>0 .AND. LRAIN) THEN WHERE ( GACC(:) .AND. (PRSS1D(:)>XRTMIN(5)/PTSTEP) .AND. (PCSS1D(:)>XCTMIN(5)/PTSTEP) ) ZZW1(:,2) = MAX( MIN( PRRS1D(:),ZZW1(:,2)-ZZW1(:,4) ) , 0. ) ! RRACCSG ZZNW1(:,2) = MAX( MIN( PCRS1D(:),ZZNW1(:,2)-ZZNW1(:,4) ) , 0. ) ! NRACCSG - ZZW1(:,3) = MIN( PRSS1D(:),XFSACCRG*ZZW(:)* PCST1D(:) * & ! RSACCRG - ( PLBDAS(:)**(-XBS) )*( PRHODREF(:)**(-XCEXVT-1.) ) & + ZZW1(:,3) = MIN( PRSS1D(:),PCRT1D(:)*XFSACCRG*ZZW(:)* PCST1D(:) * & ! RSACCRG + PLBDAS(:)**(-XBS) * ( PRHODREF(:)**(-XCEXVT+1.) ) & *( XLBSACCR1/((PLBDAR(:)**2) ) + & XLBSACCR2/( PLBDAR(:) * PLBDAS(:) ) + & XLBSACCR3/( (PLBDAS(:)**2)) ) ) - ZZNW1(:,3) = MIN( PCSS1D(:),XFNSACCRG*ZZNW(:)* PCST1D(:) * & ! NSACCRG - ( PRHODREF(:)**(-XCEXVT-1.) ) & + ZZNW1(:,3) = MIN( PCSS1D(:),PCRT1D(:)*XFNSACCRG*ZZNW(:)* PCST1D(:) * & ! NSACCRG + ( PRHODREF(:)**(-XCEXVT+1.) ) & *( XLBNSACCR1/((PLBDAR(:)**2) ) + & XLBNSACCR2/( PLBDAR(:) * PLBDAS(:) ) + & XLBNSACCR3/( (PLBDAS(:)**2)) ) ) diff --git a/src/MNH/lima_rain_accr_snow.f90 b/src/MNH/lima_rain_accr_snow.f90 index 8973de927..7be5e1b4c 100644 --- a/src/MNH/lima_rain_accr_snow.f90 +++ b/src/MNH/lima_rain_accr_snow.f90 @@ -276,7 +276,7 @@ WHERE( GACC ) XFNRACCSS * PCST(:) * PRHODREF(:)**(1-XCEXVT) & *( XLBNRACCS1/( PLBDS(:)**2 ) + & XLBNRACCS2/( PLBDS(:) * PLBDR(:) ) + & - XLBNRACCS3/( PLBDR(:)**2 ) ) / PLBDR(:)**XBR + XLBNRACCS3/( PLBDR(:)**2 ) ) ! ! 1.3.6 raindrop accretion-conversion of the large sized aggregates @@ -289,7 +289,7 @@ WHERE( GACC ) XLBSACCR3/( PLBDS(:)**2 ) ) ! ZZWC5(:)= XFNSACCRG * ZZW3(:) * PCRT(:) * & ! RSACCRG - PCST(:) * PLBDS(:)**(-XBS) * PRHODREF(:)**(1-XCEXVT) * & + PCST(:) * PRHODREF(:)**(1-XCEXVT) * & ( XLBNSACCR1/( PLBDR(:)**2 ) + & XLBNSACCR2/( PLBDR(:) * PLBDS(:) ) + & XLBNSACCR3/( PLBDS(:)**2 ) ) -- GitLab