diff --git a/src/SURFEX/init_seafluxn.F90 b/src/SURFEX/init_seafluxn.F90 index 685f000ecf62659c9f2c68a8aa8439365aed8b93..c061dd767c65b4a89078983c143ef4d93285832a 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 aee1adc91a2947890a6a5ce3dce4015141ba6529..7816b75befabd5671e17955f52d799f0d8c29f4d 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.