diff --git a/src/MNH/ini_segn.f90 b/src/MNH/ini_segn.f90 index 05ab6e943602372e74ccac25ceafd0cff825b1ec..503eebc7247e3a16cc2f6c5c4974a614aae97e1f 100644 --- a/src/MNH/ini_segn.f90 +++ b/src/MNH/ini_segn.f90 @@ -164,6 +164,7 @@ END MODULE MODI_INI_SEG_n !! 10/02/15 remove ABORT in parallel case for SPAWNING !! J.Escobar : 15/09/2015 : WENO5 & JPHEXT <> 1 !! 01/2015 add GLNOX_EXPLICIT (C. Barthe) +!! 04/2016 add ABORT if CINIFILEPGD is not specified (G.Delautier) !------------------------------------------------------------------------------- ! !* 0. DECLARATIONS @@ -179,6 +180,7 @@ USE MODD_PARAMETERS USE MODD_DYN USE MODD_REF, ONLY : LBOUSS USE MODD_IO_ll, ONLY : GSMONOPROC +USE MODD_PARAM_n, ONLY : CSURF ! USE MODE_FMREAD USE MODE_FM @@ -324,6 +326,13 @@ IF (GFOUND) THEN CALL INIT_NAM_LUNITn READ(UNIT=ILUSEG,NML=NAM_LUNITn) CALL UPDATE_NAM_LUNITn + IF (LEN_TRIM(CINIFILEPGD)==0 .AND. CSURF=='EXTE') THEN + WRITE(ILUOUT,*) 'Error in namelist NAM_LUNITn : you need to specify CINIFILEPGD' + !callabortstop + CALL CLOSE_ll(HLUOUT,IOSTAT=IRESP) + CALL ABORT + STOP + ENDIF END IF IF (CPROGRAM=='MESONH') THEN @@ -354,6 +363,7 @@ IF (CPROGRAM=='MESONH') THEN !callabortstop CALL CLOSE_ll(HLUOUT,IOSTAT=IRESP) CALL ABORT + STOP ENDIF ENDIF END IF diff --git a/src/SURFEX/read_nam_prep_surfn.F90 b/src/SURFEX/read_nam_prep_surfn.F90 index e665f12725acce223fd5f44705bdd6f985c2cb4d..ae6c33f039c3b5b309ac0d8c3b956099e5808e52 100644 --- a/src/SURFEX/read_nam_prep_surfn.F90 +++ b/src/SURFEX/read_nam_prep_surfn.F90 @@ -2,6 +2,10 @@ !SURFEX_LIC This is part of the SURFEX software governed by the CeCILL-C licence !SURFEX_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt !SURFEX_LIC for details. version 1. +!! ------------- +!! MODIFICATIONS +!! ------------- +!! 04/2016 add ABORT if CINIFILEPGD is not specified (G.Delautier) ! ######### SUBROUTINE READ_NAM_PREP_SURF_n(HPROGRAM) ! ####################################################### @@ -15,6 +19,7 @@ USE MODI_TEST_NAM_VAR_SURF USE MODI_GET_LUOUT USE MODI_OPEN_NAMELIST USE MODI_CLOSE_NAMELIST +USE MODI_ABOR1_SFX USE MODE_POS_SURF ! ! @@ -52,6 +57,9 @@ IF (GFOUND) READ(UNIT=ILUNAM,NML=NAM_PREP_SURF_ATM) ! CALL TEST_NAM_VAR_SURF(ILUOUT,'CFILETYPE', CFILETYPE, ' ','GRIB ','MESONH','ASCII ','LFI ') CALL TEST_NAM_VAR_SURF(ILUOUT,'CFILEPGDTYPE', CFILEPGDTYPE, ' ','GRIB ','MESONH','ASCII ','LFI ') + IF (LEN_TRIM(CFILEPGD)==0) THEN + CALL ABOR1_SFX('Namelist NAM_PREP_SURF_ATM : you need to specify CFILEPGD ') + ENDIF IF (LHOOK) CALL DR_HOOK('READ_NAM_PREP_SURF_N',1,ZHOOK_HANDLE) ! END SUBROUTINE READ_NAM_PREP_SURF_n