Skip to content
Snippets Groups Projects
Commit e6dc58be authored by RODIER Quentin's avatar RODIER Quentin
Browse files

Quentin 13/04/2022: bugfix KSIZE/KPROMA now computed in physical points only

parent ea46fb02
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/mesonh/ext/resolved_cloud.f90
+ 26
− 24
View file @ e6dc58be
...@@ -773,17 +773,18 @@ SELECT CASE ( HCLOUD ) ...@@ -773,17 +773,18 @@ SELECT CASE ( HCLOUD )
PHLI_HRI=PHLI_HRI, PHLI_HCF=PHLI_HCF ) PHLI_HRI=PHLI_HRI, PHLI_HCF=PHLI_HCF )
ENDIF ENDIF
IF (LRED) THEN IF (LRED) THEN
LLMICRO(:,:,:)=PRT(:,:,:,2)>XRTMIN(2) .OR. & LLMICRO(:,:,:) = .FALSE.
PRT(:,:,:,3)>XRTMIN(3) .OR. & LLMICRO(IIB:IIE,IJB:IJE,IKB:IKE)=PRT(IIB:IIE,IJB:IJE,IKB:IKE,2)>XRTMIN(2) .OR. &
PRT(:,:,:,4)>XRTMIN(4) .OR. & PRT(IIB:IIE,IJB:IJE,IKB:IKE,3)>XRTMIN(3) .OR. &
PRT(:,:,:,5)>XRTMIN(5) .OR. & PRT(IIB:IIE,IJB:IJE,IKB:IKE,4)>XRTMIN(4) .OR. &
PRT(:,:,:,6)>XRTMIN(6) PRT(IIB:IIE,IJB:IJE,IKB:IKE,5)>XRTMIN(5) .OR. &
LLMICRO(:,:,:)=LLMICRO(:,:,:) .OR. & PRT(IIB:IIE,IJB:IJE,IKB:IKE,6)>XRTMIN(6)
PRS(:,:,:,2)>ZRSMIN(2) .OR. & LLMICRO(IIB:IIE,IJB:IJE,IKB:IKE)=LLMICRO(IIB:IIE,IJB:IJE,IKB:IKE) .OR. &
PRS(:,:,:,3)>ZRSMIN(3) .OR. & PRS(IIB:IIE,IJB:IJE,IKB:IKE,2)>ZRSMIN(2) .OR. &
PRS(:,:,:,4)>ZRSMIN(4) .OR. & PRS(IIB:IIE,IJB:IJE,IKB:IKE,3)>ZRSMIN(3) .OR. &
PRS(:,:,:,5)>ZRSMIN(5) .OR. & PRS(IIB:IIE,IJB:IJE,IKB:IKE,4)>ZRSMIN(4) .OR. &
PRS(:,:,:,6)>ZRSMIN(6) PRS(IIB:IIE,IJB:IJE,IKB:IKE,5)>ZRSMIN(5) .OR. &
PRS(IIB:IIE,IJB:IJE,IKB:IKE,6)>ZRSMIN(6)
CALL RAIN_ICE_RED (YLDIMPHYEX,CST, PARAM_ICE, RAIN_ICE_PARAM, RAIN_ICE_DESCR,TBUCONF,& CALL RAIN_ICE_RED (YLDIMPHYEX,CST, PARAM_ICE, RAIN_ICE_PARAM, RAIN_ICE_DESCR,TBUCONF,&
COUNT(LLMICRO), COUNT(LLMICRO), & COUNT(LLMICRO), COUNT(LLMICRO), &
OSEDIC, .FALSE.,CSEDIM, HSUBG_AUCV, CSUBG_AUCV_RI,& OSEDIC, .FALSE.,CSEDIM, HSUBG_AUCV, CSUBG_AUCV_RI,&
...@@ -866,19 +867,20 @@ SELECT CASE ( HCLOUD ) ...@@ -866,19 +867,20 @@ SELECT CASE ( HCLOUD )
PHLI_HRI=PHLI_HRI, PHLI_HCF=PHLI_HCF ) PHLI_HRI=PHLI_HRI, PHLI_HCF=PHLI_HCF )
ENDIF ENDIF
IF (LRED) THEN IF (LRED) THEN
LLMICRO(:,:,:)=PRT(:,:,:,2)>XRTMIN(2) .OR. & LLMICRO(:,:,:) = .FALSE.
PRT(:,:,:,3)>XRTMIN(3) .OR. & LLMICRO(IIB:IIE,IJB:IJE,IKB:IKE)=PRT(IIB:IIE,IJB:IJE,IKB:IKE,2)>XRTMIN(2) .OR. &
PRT(:,:,:,4)>XRTMIN(4) .OR. & PRT(IIB:IIE,IJB:IJE,IKB:IKE,3)>XRTMIN(3) .OR. &
PRT(:,:,:,5)>XRTMIN(5) .OR. & PRT(IIB:IIE,IJB:IJE,IKB:IKE,4)>XRTMIN(4) .OR. &
PRT(:,:,:,6)>XRTMIN(6) .OR. & PRT(IIB:IIE,IJB:IJE,IKB:IKE,5)>XRTMIN(5) .OR. &
PRT(:,:,:,7)>XRTMIN(7) PRT(IIB:IIE,IJB:IJE,IKB:IKE,6)>XRTMIN(6) .OR. &
LLMICRO(:,:,:)=LLMICRO(:,:,:) .OR. & PRT(IIB:IIE,IJB:IJE,IKB:IKE,7)>XRTMIN(7)
PRS(:,:,:,2)>ZRSMIN(2) .OR. & LLMICRO(IIB:IIE,IJB:IJE,IKB:IKE)=LLMICRO(IIB:IIE,IJB:IJE,IKB:IKE) .OR. &
PRS(:,:,:,3)>ZRSMIN(3) .OR. & PRS(IIB:IIE,IJB:IJE,IKB:IKE,2)>ZRSMIN(2) .OR. &
PRS(:,:,:,4)>ZRSMIN(4) .OR. & PRS(IIB:IIE,IJB:IJE,IKB:IKE,3)>ZRSMIN(3) .OR. &
PRS(:,:,:,5)>ZRSMIN(5) .OR. & PRS(IIB:IIE,IJB:IJE,IKB:IKE,4)>ZRSMIN(4) .OR. &
PRS(:,:,:,6)>ZRSMIN(6) .OR. & PRS(IIB:IIE,IJB:IJE,IKB:IKE,5)>ZRSMIN(5) .OR. &
PRS(:,:,:,7)>ZRSMIN(7) PRS(IIB:IIE,IJB:IJE,IKB:IKE,6)>ZRSMIN(6) .OR. &
PRS(IIB:IIE,IJB:IJE,IKB:IKE,7)>ZRSMIN(7)
CALL RAIN_ICE_RED (YLDIMPHYEX,CST, PARAM_ICE, RAIN_ICE_PARAM, RAIN_ICE_DESCR,TBUCONF,& CALL RAIN_ICE_RED (YLDIMPHYEX,CST, PARAM_ICE, RAIN_ICE_PARAM, RAIN_ICE_DESCR,TBUCONF,&
COUNT(LLMICRO), COUNT(LLMICRO), & COUNT(LLMICRO), COUNT(LLMICRO), &
OSEDIC, .FALSE., CSEDIM, HSUBG_AUCV, CSUBG_AUCV_RI,& OSEDIC, .FALSE., CSEDIM, HSUBG_AUCV, CSUBG_AUCV_RI,&
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Documentation | Mentions légales | CGU | Accessibilité : non conforme