Ignore:
Timestamp:
2017-09-15T15:53:50+02:00 (4 years ago)
Author:
timgraham
Message:

Add non-zero exit calls for makenemo errors. See #1924 and #1585

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/CONFIG/makenemo

    r8328 r8526  
    221221   *) 
    222222       echo " \"$1\" BAD OPTION" 
    223        exit 
     223       exit 2 
    224224       ;; 
    225225 
     
    322322#- Clean links and librairies --- 
    323323#- Creating the good links, at first on OPA_SRC --- 
    324 . ${COMPIL_DIR}/Fmake_WORK.sh ${x_e} ${NEW_CONF} ${TAB[*]} || exit 
    325  
    326 . ${COMPIL_DIR}/Fmake_bld.sh ${CONFIG_DIR} ${NEW_CONF}  ${NEMO_TDIR} || exit 
     324. ${COMPIL_DIR}/Fmake_WORK.sh ${x_e} ${NEW_CONF} ${TAB[*]} || exit 3 
     325 
     326. ${COMPIL_DIR}/Fmake_bld.sh ${CONFIG_DIR} ${NEW_CONF}  ${NEMO_TDIR} || exit 3 
    327327 
    328328# build the complete list of the cpp keys of this configuration 
     
    362362#- At this stage cpp keys have been updated. we can check the arch file 
    363363#- When used for the first time, choose a compiler --- 
    364 . ${COMPIL_DIR}/Fcheck_archfile.sh arch_nemo.fcm cpp.fcm ${CMP_NAM} || exit 
     364. ${COMPIL_DIR}/Fcheck_archfile.sh arch_nemo.fcm cpp.fcm ${CMP_NAM} || exit 3 
    365365 
    366366#- At this stage the configuration has beeen chosen 
     
    370370#- We look after agrif 
    371371grep key_agrif ${COMPIL_DIR}/cpp.fcm && export AGRIFUSE=1 && export USEBLD=${USEBLD/xag/} 
    372 . ${COMPIL_DIR}/Fprep_agrif.sh ${NEW_CONF} ${NEMO_TDIR} || exit 
     372. ${COMPIL_DIR}/Fprep_agrif.sh ${NEW_CONF} ${NEMO_TDIR} || exit 3 
    373373 
    374374#- 
     
    385385    if [ ${#x_c} -eq 0 ]; then 
    386386       if [ "$AGRIFUSE" == 1 ]; then  
    387           fcm build --ignore-lock  -j 1 ${COMPIL_DIR}/bld_preproagr.cfg ||{ cd - ; exit ;} 
     387          fcm build --ignore-lock  -j 1 ${COMPIL_DIR}/bld_preproagr.cfg ||{ cd - ; exit 1 ;} 
    388388          echo "" 
    389389          echo "---------------------------------" 
     
    393393       fi 
    394394    fi 
    395     fcm build ${x_c} --ignore-lock -v ${x_v} -j ${NBR_PRC} ${COMPIL_DIR}/$USEBLD || cd - 
     395    fcm build ${x_c} --ignore-lock -v ${x_v} -j ${NBR_PRC} ${COMPIL_DIR}/$USEBLD ||{ cd - ; exit 1 ;} 
    396396    [ -f ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/nemo.exe ] && ln -sf ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/nemo.exe  ${CONFIG_DIR}/${NEW_CONF}/EXP00/opa 
    397397 
Note: See TracChangeset for help on using the changeset viewer.