From 4f39572b071117a33bc32ca0fd8020f300edfe98 Mon Sep 17 00:00:00 2001
From: Quentin Rodier <quentin.rodier@meteo.fr>
Date: Mon, 2 Oct 2023 11:34:44 +0200
Subject: [PATCH] Quentin 02/10/2023: fix merge conflict for PFT manual transfo
---
src/common/turb/mode_bl_depth_diag.F90 | 7 ++++---
src/common/turb/th_r_from_thl_rt.func.h | 7 +------
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/common/turb/mode_bl_depth_diag.F90 b/src/common/turb/mode_bl_depth_diag.F90
index 4725a1124..8035cbee8 100644
--- a/src/common/turb/mode_bl_depth_diag.F90
+++ b/src/common/turb/mode_bl_depth_diag.F90
@@ -87,12 +87,13 @@ DO JIJ=IIJB,IIJE
IF (PSURF(JIJ)/=0.) THEN
DO JK=IKB,IKE,IKL
IF (PZZ(JIJ,JK-IKL)>PZS(JIJ)) THEN
- ZFLX = PSURF(JIJ) * PFTOP_O_FSURF
- IF ( (PFLUX(JIJ,JK)-ZFLX)*(PFLUX(JIJ,JK-IKL)-ZFLX) <= 0. ) THEN
- BL_DEPTH_DIAG3D(JIJ) = (PZZ (JIJ,JK-IKL) - PZS(JIJ)) &
+ ZFLX = PSURF(JIJ) * PFTOP_O_FSURF
+ IF ( (PFLUX(JIJ,JK)-ZFLX)*(PFLUX(JIJ,JK-IKL)-ZFLX) <= 0. ) THEN
+ BL_DEPTH_DIAG3D(JIJ) = (PZZ (JIJ,JK-IKL) - PZS(JIJ)) &
+ (PZZ (JIJ,JK) - PZZ (JIJ,JK-IKL)) &
* (ZFLX - PFLUX(JIJ,JK-IKL) ) &
/ (PFLUX(JIJ,JK) - PFLUX(JIJ,JK-IKL) )
+ END IF
END IF
END DO
END IF
diff --git a/src/common/turb/th_r_from_thl_rt.func.h b/src/common/turb/th_r_from_thl_rt.func.h
index 4c2ce06d9..e12388815 100644
--- a/src/common/turb/th_r_from_thl_rt.func.h
+++ b/src/common/turb/th_r_from_thl_rt.func.h
@@ -180,13 +180,8 @@ DO II=1,JITER
& PBUF(JIJ, IDRSATODTI)*PFRAC_ICE(JIJ))
!Computation of new PRL, PRI and PRV
-<<<<<<< HEAD
- !Correction term applied to (PRV(J)-PBUF(J, IRVSAT)) is computed assuming that
- !PBUF(J, ILVOCPEXN), PBUF(J, ILSOCPEXN) and PBUF(J, ICPH) don't vary too much with T. It takes into account
-=======
!Correction term applied to (PRV(JIJ)-PBUF(JIJ, IRVSAT)) is computed assuming that
- !PBUF(JIJ, ILVOCPEXN), PBUF(JIJ, ILSOCPEXN) and PBUF(JIJ, ICPH) don't vary to much with T. It takes into account
->>>>>>> 1322004e (Normalize use of J, IE and IB to JIJ, IIJE, IIJB in include .h file)
+ !PBUF(JIJ, ILVOCPEXN), PBUF(JIJ, ILSOCPEXN) and PBUF(JIJ, ICPH) don't vary too much with T. It takes into account
!the variation (estimated linear) of Qsat with T
PBUF(JIJ, IRLTEMP)=(PRV(JIJ)-PBUF(JIJ, IRVSAT))/ &
&(1 + PBUF(JIJ, IDRSATODT)*PBUF(JIJ, IEXN)* &
--
GitLab