diff --git a/src/MNH/ini_lima_cold_mixed.f90 b/src/MNH/ini_lima_cold_mixed.f90 index abb53777f96a231dc44fb2648b51b543264c3ee9..c638491cc25c244d41cb87a68b682b50f3175f29 100644 --- a/src/MNH/ini_lima_cold_mixed.f90 +++ b/src/MNH/ini_lima_cold_mixed.f90 @@ -982,13 +982,13 @@ XCIBUINTP_G = XALPHAG / LOG(ZRATE_G) XCIBUINTP1_G = 1.0 + XCIBUINTP_G * LOG(XDCGLIM_CIBU_MIN/(XGAMINC_BOUND_CIBU_GMIN)**(1.0/XALPHAG)) ! ! For ZNI_CIBU -XFACTOR_CIBU_NI = XLBS * (XPI / 4.0) * XCCG * (ZRHO00**XCEXVT) +XFACTOR_CIBU_NI = XNS * (XPI / 4.0) * XCCG * (ZRHO00**XCEXVT) XMOMGG_CIBU_1 = MOMG(XALPHAG,XNUG,2.0+XDG) XMOMGG_CIBU_2 = MOMG(XALPHAG,XNUG,2.0) XMOMGS_CIBU_1 = MOMG(XALPHAS,XNUS,XDS) ! ! For ZRI_CIBU -XFACTOR_CIBU_RI = XLBS * XAS * (XPI / 4.0) * XCCG * (ZRHO00**XCEXVT) +XFACTOR_CIBU_RI = XNS * XAS * (XPI / 4.0) * XCCG * (ZRHO00**XCEXVT) XMOMGS_CIBU_2 = MOMG(XALPHAS,XNUS,XBS) XMOMGS_CIBU_3 = MOMG(XALPHAS,XNUS,XBS+XDS) ! diff --git a/src/MNH/lima_collisional_ice_breakup.f90 b/src/MNH/lima_collisional_ice_breakup.f90 index ffcb69c7c7187ecd369e6f619d12cb130adacf62..c5afbb5914fe20f4a7c18761b3fa0e1c6318391a 100644 --- a/src/MNH/lima_collisional_ice_breakup.f90 +++ b/src/MNH/lima_collisional_ice_breakup.f90 @@ -331,7 +331,7 @@ IF (ICIBU > 0) THEN ! 1.3.3 To compute final "CIBU" contributions ! ZFRAG_CIBU(:) = UNPACK ( VECTOR=ZFRAGMENTS(:),MASK=GCIBU,FIELD=0.0 ) - ZNI_CIBU(:) = ZFRAG_CIBU(:) * (XFACTOR_CIBU_NI * PRST(:) * PRHODREF(:) / (PRHODREF(:)**(XCEXVT-1.0))) * & + ZNI_CIBU(:) = ZFRAG_CIBU(:) * (XFACTOR_CIBU_NI * PRST(:) / (PRHODREF(:)**XCEXVT)) * & (XCG * ZINTG_GRAUPEL_1(:) * ZINTG_SNOW_1(:) * & PLBDS(:)**(XBS) * PLBDG(:)**(XCXG-(XDG+2.0)) & - XCS * ZINTG_GRAUPEL_2(:) * ZINTG_SNOW_2(:) * & @@ -343,7 +343,7 @@ IF (ICIBU > 0) THEN DEALLOCATE(ZFRAGMENTS) ! ! Max value of rs removed by CIBU - ZRI_CIBU(:) = (XFACTOR_CIBU_RI * PRST(:) * PRHODREF(:) / (PRHODREF(:)**(XCEXVT+1.0))) * & + ZRI_CIBU(:) = (XFACTOR_CIBU_RI * PRST(:) / (PRHODREF(:)**XCEXVT)) * & (XCG * ZINTG_GRAUPEL_1(:) * ZINTG_SNOW_3(:) * & PLBDG(:)**(XCXG-(XDG+2.0)) & - XCS * ZINTG_GRAUPEL_2(:) * ZINTG_SNOW_4(:) * & diff --git a/src/MNH/lima_mixed_fast_processes.f90 b/src/MNH/lima_mixed_fast_processes.f90 index b70d24fc81a315d2e74fe562a43446cdaf65dfdd..b8a9fcc32d6cb5938ef38bcbcdb132103c1832ad 100644 --- a/src/MNH/lima_mixed_fast_processes.f90 +++ b/src/MNH/lima_mixed_fast_processes.f90 @@ -686,7 +686,7 @@ IF (ICIBU > 0) THEN ALLOCATE(ZFRAG_CIBU(SIZE(PZT))) ! ZFRAG_CIBU(:) = UNPACK ( VECTOR=ZFRAGMENTS(:),MASK=GCIBU,FIELD=0.0 ) - ZNI_CIBU(:) = ZFRAG_CIBU(:) * (XFACTOR_CIBU_NI * PRST1D(:) * PRHODREF(:) / (PRHODREF(:)**(XCEXVT-1.0))) * & + ZNI_CIBU(:) = ZFRAG_CIBU(:) * (XFACTOR_CIBU_NI * PRST1D(:) / (PRHODREF(:)**XCEXVT)) * & (XCG * ZINTG_GRAUPEL_1(:) * ZINTG_SNOW_1(:) * & PLBDAS(:)**(XBS) * PLBDAG(:)**(XCXG-(XDG+2.0)) & - XCS * ZINTG_GRAUPEL_2(:) * ZINTG_SNOW_2(:) * & @@ -699,7 +699,7 @@ IF (ICIBU > 0) THEN ! ! Max value of rs removed by CIBU ALLOCATE(ZRI_CIBU(SIZE(PZT))) - ZRI_CIBU(:) = (XFACTOR_CIBU_RI * PRST1D(:) * PRHODREF(:) / (PRHODREF(:)**(XCEXVT+1.0))) * & + ZRI_CIBU(:) = (XFACTOR_CIBU_RI * PRST1D(:) / (PRHODREF(:)**XCEXVT)) * & (XCG * ZINTG_GRAUPEL_1(:) * ZINTG_SNOW_3(:) * & PLBDAG(:)**(XCXG-(XDG+2.0)) & - XCS * ZINTG_GRAUPEL_2(:) * ZINTG_SNOW_4(:) * &