From 11537f9898108816fab41f52e966bc7d8c2774cd Mon Sep 17 00:00:00 2001
From: Quentin Rodier <quentin.rodier@meteo.fr>
Date: Tue, 29 Jun 2021 16:40:17 +0200
Subject: [PATCH] Quentin 29/06/2021: minor change merge error to the same
SURFEX depot file
---
src/SURFEX/isba_meb.F90 | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/SURFEX/isba_meb.F90 b/src/SURFEX/isba_meb.F90
index a00c18bc1..eaf29e0ff 100644
--- a/src/SURFEX/isba_meb.F90
+++ b/src/SURFEX/isba_meb.F90
@@ -78,14 +78,14 @@ USE MODD_DIAG_MISC_ISBA_n, ONLY : DIAG_MISC_ISBA_t
!
USE MODD_SURF_PAR, ONLY : XUNDEF
USE MODD_CSTS, ONLY : XCPD, XDAY, XRHOLW, XLVTT, XLSTT
-USE MODD_MEB_PAR, ONLY : XLITTER_HYD_Z4, XLITTER_HYD_Z5, XSW_WGHT_VIS, XSW_WGHT_NIR
+USE MODD_MEB_PAR, ONLY : XSW_WGHT_VIS, XSW_WGHT_NIR
USE MODD_ISBA_PAR, ONLY : XRS_MAX, XLIMH
USE MODD_DATA_COVER_PAR, ONLY : NVT_SNOW
!
USE MODD_TYPE_DATE_SURF, ONLY : DATE_TIME
!
USE MODE_THERMOS
-USE MODE_MEB, ONLY : MEBLITTER_THRM, SNOW_INTERCEPT_EFF
+USE MODE_MEB, ONLY : SNOW_INTERCEPT_EFF
!
USE MODI_WET_LEAVES_FRAC
USE MODI_VEG
@@ -1643,8 +1643,11 @@ SUBROUTINE PREP_MEB_SOIL(OMEB_LITTER,PSOILHCAPZ,PSOILCONDZ,KK,PK,PEK,PD_GL,&
PDZGL,PTGL,PSOILHCAPL,PSOILCONDL,PWSATL,PWFCL,PWSFC,&
PWISFC,PCTSFC,PCT,PFROZEN1,PFROZEN1SFC)
!
-USE MODD_CSTS, ONLY : XRHOLW,XRHOLI, XCL, XCI
-USE MODD_ISBA_PAR, ONLY : XWGMIN, XOMSPH
+USE MODD_CSTS, ONLY : XRHOLW, XCL
+USE MODD_ISBA_PAR, ONLY : XWGMIN
+USE MODD_MEB_PAR, ONLY : XLITTER_HYD_Z4, XLITTER_HYD_Z5
+!
+USE MODE_MEB, ONLY : MEBLITTER_THRM
!
IMPLICIT NONE
!
--
GitLab