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

Quentin 27/01/2023: rename ADAP mixing length to HM21 (PHYEX part)

parent 270a15ff
No related branches found
No related tags found
No related merge requests found
...@@ -533,7 +533,7 @@ ZEXPL = 1.- TURBN%XIMPL ...@@ -533,7 +533,7 @@ ZEXPL = 1.- TURBN%XIMPL
ZRVORD= CST%XRV / CST%XRD ZRVORD= CST%XRV / CST%XRD
! !
!Copy data into ZTHLM and ZRM only if needed !Copy data into ZTHLM and ZRM only if needed
IF (TURBN%CTURBLEN=='BL89' .OR. TURBN%CTURBLEN=='RM17' .OR. TURBN%CTURBLEN=='ADAP' .OR. TURBN%LRMC01) THEN IF (TURBN%CTURBLEN=='BL89' .OR. TURBN%CTURBLEN=='RM17' .OR. TURBN%CTURBLEN=='HM21' .OR. TURBN%LRMC01) THEN
ZTHLM(IIJB:IIJE,1:IKT) = PTHLT(IIJB:IIJE,1:IKT) ZTHLM(IIJB:IIJE,1:IKT) = PTHLT(IIJB:IIJE,1:IKT)
ZRM(IIJB:IIJE,1:IKT,:) = PRT(IIJB:IIJE,1:IKT,:) ZRM(IIJB:IIJE,1:IKT,:) = PRT(IIJB:IIJE,1:IKT,:)
END IF END IF
...@@ -748,7 +748,7 @@ SELECT CASE (TURBN%CTURBLEN) ...@@ -748,7 +748,7 @@ SELECT CASE (TURBN%CTURBLEN)
!* 3.3 Grey-zone combined RM17 & Deardorff mixing lengths !* 3.3 Grey-zone combined RM17 & Deardorff mixing lengths
! -------------------------------------------------- ! --------------------------------------------------
CASE ('ADAP') CASE ('HM21')
CALL GZ_U_UW_PHY(D,PUT,PDZZ,ZWORK1) CALL GZ_U_UW_PHY(D,PUT,PDZZ,ZWORK1)
CALL MZF_PHY(D,ZWORK1,ZWORK2) CALL MZF_PHY(D,ZWORK1,ZWORK2)
CALL MXF_PHY(D,ZWORK2,ZDUDZ) CALL MXF_PHY(D,ZWORK2,ZDUDZ)
...@@ -851,8 +851,8 @@ IF (TURBN%LRMC01) THEN ...@@ -851,8 +851,8 @@ IF (TURBN%LRMC01) THEN
CALL RMC01(D,CST,CSTURB,TURBN%CTURBLEN,PZZ,PDXX,PDYY,PDZZ,PDIRCOSZW,PSBL_DEPTH,ZLMO,ZLM,ZLEPS) CALL RMC01(D,CST,CSTURB,TURBN%CTURBLEN,PZZ,PDXX,PDYY,PDZZ,PDIRCOSZW,PSBL_DEPTH,ZLMO,ZLM,ZLEPS)
END IF END IF
! !
!RMC01 is only applied on RM17 in ADAP !RMC01 is only applied on RM17 in HM21
IF (TURBN%CTURBLEN=='ADAP') THEN IF (TURBN%CTURBLEN=='HM21') THEN
!$mnh_expand_array(JIJ=IIJB:IIJE,JK=1:IKT) !$mnh_expand_array(JIJ=IIJB:IIJE,JK=1:IKT)
ZLEPS(IIJB:IIJE,1:IKT) = MIN(ZLEPS(IIJB:IIJE,1:IKT),ZLMW(IIJB:IIJE,1:IKT)*TURBN%XCADAP) ZLEPS(IIJB:IIJE,1:IKT) = MIN(ZLEPS(IIJB:IIJE,1:IKT),ZLMW(IIJB:IIJE,1:IKT)*TURBN%XCADAP)
!$mnh_end_expand_array(JIJ=IIJB:IIJE,JK=1:IKT) !$mnh_end_expand_array(JIJ=IIJB:IIJE,JK=1:IKT)
...@@ -1951,7 +1951,7 @@ ELSE ...@@ -1951,7 +1951,7 @@ ELSE
! !
!* 3.1 BL89 mixing length !* 3.1 BL89 mixing length
! ------------------ ! ------------------
CASE ('BL89','RM17','ADAP') CASE ('BL89','RM17','HM21')
ZSHEAR(:,:)=0. ZSHEAR(:,:)=0.
CALL BL89(D,CST,CSTURB,PZZ,PDZZ,PTHVREF,ZTHLM,KRR,ZRM,PTKET,ZSHEAR,ZLM_CLOUD,OOCEAN,HPROGRAM) CALL BL89(D,CST,CSTURB,PZZ,PDZZ,PTHVREF,ZTHLM,KRR,ZRM,PTKET,ZSHEAR,ZLM_CLOUD,OOCEAN,HPROGRAM)
! !
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment