From c5edebdbb2ae605f11367ad188f5a9fc391f2d0b Mon Sep 17 00:00:00 2001
From: JorisP <pianezze.joris@gmail.com>
Date: Wed, 10 Jul 2024 16:03:03 +0200
Subject: [PATCH] Bugfix when using Meso-NH and oceanic coupling
---
src/SURFEX/init_seafluxn.F90 | 6 +++---
src/SURFEX/sfx_oasis_read_nam.F90 | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/SURFEX/init_seafluxn.F90 b/src/SURFEX/init_seafluxn.F90
index 685f000ec..c061dd767 100644
--- a/src/SURFEX/init_seafluxn.F90
+++ b/src/SURFEX/init_seafluxn.F90
@@ -422,7 +422,7 @@ IF (LCPL_SEAICE.AND.LSEAICE_2FLX) SM%S%LHANDLE_SIC=.TRUE.
ALLOCATE(SM%S%XEMIS(ILU))
SM%S%XEMIS(:) = 0.0
!
-IF (.NOT.LCPL_SEA) THEN
+IF ((.NOT.LCPL_SEA).OR.(HPROGRAM=='MESONH')) THEN
!
CALL UPDATE_RAD_SEA(SM%S,PZENITH,XTTS,PDIR_ALB,PSCA_ALB,PEMIS,PTSRAD )
!
@@ -488,8 +488,8 @@ IF(HINIT=='ALL'.AND.(.NOT.SM%S%LHANDLE_SIC).AND.(.NOT.LCPL_SEAICE))THEN
SM%SD%DMI%LDIAG_MISC_SEAICE=.FALSE.
ENDIF
!
-IF(LCPL_SEA.AND.SM%SD%O%N2M<1)THEN
- CALL ABOR1_SFX('INIT_SEAFLUX_n: N2M must be set >0 in case of LCPL_SEA')
+IF((LCPL_SEA.OR.LCPL_WAVE).AND.((SM%SD%O%N2M<1).OR.(.NOT.SM%SD%O%LSURF_BUDGET)))THEN
+ CALL ABOR1_SFX('INIT_SEAFLUX_n: N2M must be set >0 and LSURF_BUDGET to T in case of LCPL_SEA or LCPL_WAVE')
ENDIF
!
CALL DIAG_SEAFLUX_INIT_n(SM%SD%GO, SM%SD%O, SM%SD%D, SM%SD%DC, OREAD_BUDGETC, SM%S, &
diff --git a/src/SURFEX/sfx_oasis_read_nam.F90 b/src/SURFEX/sfx_oasis_read_nam.F90
index aee1adc91..7816b75be 100644
--- a/src/SURFEX/sfx_oasis_read_nam.F90
+++ b/src/SURFEX/sfx_oasis_read_nam.F90
@@ -592,7 +592,7 @@ IF(LEN_TRIM(HFIELD)==0)THEN
!
IF(HTYP==YDIAG.OR.(KID==0.AND.HTYP/=YLAND))THEN
LSTOP=.FALSE.
- ELSEIF((KID==0).AND.(HTYP==YSEA))THEN
+ ELSEIF((KID==1).AND.(HTYP==YSEA))THEN
LSTOP=.FALSE.
ELSEIF((KID==1).AND.(HTYP==YWAVE))THEN
LSTOP=.FALSE.
--
GitLab