diff --git a/src/MNH/ini_lima_warm.f90 b/src/MNH/ini_lima_warm.f90 index e01c3e5269ba49a25901220e8e33cd5f02f64033..2f92fad58936446b355d6d780f79fc2647953d37 100644 --- a/src/MNH/ini_lima_warm.f90 +++ b/src/MNH/ini_lima_warm.f90 @@ -167,7 +167,7 @@ XNR = 1.0/(XAR*MOMG(XALPHAR,XNUR,XBR)) IF (NMOM_R.EQ.1) THEN XCCR = 8.E6 XCXR = -1. - XLBEXR = 1.0/XBR + XLBEXR = 1.0/(XCXR-XBR) XLBR = ( XAR*XCCR*MOMG(XALPHAR,XNUR,XBR) )**(-XLBEXR) ELSE XLBR = XAR*ZGAMR(2) diff --git a/src/MNH/lima.f90 b/src/MNH/lima.f90 index 2437451e8ac56558dc265834d0d91054026096ff..0ea99d7a70da0e5b890f38716706d22dc53c64ab 100644 --- a/src/MNH/lima.f90 +++ b/src/MNH/lima.f90 @@ -702,7 +702,7 @@ end if ZRT_SUM = (ZRVS + ZRCS + ZRRS + ZRIS + ZRSS + ZRGS + ZRHS)*PTSTEP ZCPT = XCPD + (XCPV * ZRVS + XCL * (ZRCS + ZRRS) + XCI * (ZRIS + ZRSS + ZRGS + ZRHS))*PTSTEP IF (LWARM .AND. LSEDC) CALL LIMA_SEDIMENTATION(IIB, IIE, IIT, IJB, IJE, IJT, IKB, IKE, IKTB, IKTE, IKT, KKL, & - 'L', NMOM_C, 2, 1, PTSTEP, PDZZ, PRHODREF, PPABST, ZT, ZRT_SUM, ZCPT, ZRCS, ZCCS, PINPRC) + 'L', 2, 2, 1, PTSTEP, PDZZ, PRHODREF, PPABST, ZT, ZRT_SUM, ZCPT, ZRCS, ZCCS, PINPRC) ZRT_SUM = (ZRVS + ZRCS + ZRRS + ZRIS + ZRSS + ZRGS + ZRHS)*PTSTEP ZCPT = XCPD + (XCPV * ZRVS + XCL * (ZRCS + ZRRS) + XCI * (ZRIS + ZRSS + ZRGS + ZRHS))*PTSTEP IF (LWARM .AND. LRAIN) CALL LIMA_SEDIMENTATION(IIB, IIE, IIT, IJB, IJE, IJT, IKB, IKE, IKTB, IKTE, IKT, KKL, & diff --git a/src/MNH/lima_droplets_accretion.f90 b/src/MNH/lima_droplets_accretion.f90 index f7e518b647e0d83a32aa283fe810e7c53de6772c..c7a4232fdaf6fc57a7051f15d3c2c6e58afea091 100644 --- a/src/MNH/lima_droplets_accretion.f90 +++ b/src/MNH/lima_droplets_accretion.f90 @@ -133,7 +133,7 @@ ELSE IF (NMOM_C.EQ.1 .AND. NMOM_R.EQ.1) THEN GACCR(:) = PRRT(:)>XRTMIN(3) .AND. & PRCT(:)>XRTMIN(2) WHERE ( GACCR(:) ) - P_RC_ACCR(:) = XFCACCR * PRCT(:) & + P_RC_ACCR(:) = - XFCACCR * PRCT(:) & * PLBDR(:)**XEXCACCR & * PRHODREF(:)**(-XCEXVT) END WHERE diff --git a/src/MNH/lima_rain_evaporation.f90 b/src/MNH/lima_rain_evaporation.f90 index f4c0df7d033880a071937fc0c696bacc2899879a..c7211f2fcd62960a43373cb63f19c38314ea6d0f 100644 --- a/src/MNH/lima_rain_evaporation.f90 +++ b/src/MNH/lima_rain_evaporation.f90 @@ -150,8 +150,7 @@ ELSE ! ! Compute the function G(T) ! - ZZW2(:) = 1. / ( XRHOLW*((((PLV(:)/PT(:))**2)/(XTHCO*XRV)) + & ! G - (XRV*PT(:))/(XDIVA*PEVSAT(:)))) + ZZW2(:) = 1. / ( XRHOLW*((((PLV(:)/PT(:))**2)/(XTHCO*XRV)) + (XRV*PT(:))/(XDIVA*PEVSAT(:)))) !G ! ! Compute the evaporation tendency !