Changeset 5523


Ignore:
Timestamp:
2015-07-01T11:42:47+02:00 (5 years ago)
Author:
nicolasmartin
Message:

dev_r5092_CNRS_SETTE First release for Curie

Location:
branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting.sh

    r5521 r5523  
    66NEMO_TRUS=$( pwd $( dirname $0 ) ) 
    77DEBUG=0; PUBLISH=0 
    8 ST='FAILED'# 'FAILED' by default 
     8ST='FAILED' # 'FAILED' by default 
    99 
    1010# Get options for replacing some initials settings 
     
    7070print_step "Compiling ${REFE_CONF} configuration" 
    7171cd ${NEMO_CONF} 
    72 [ -d ${TEST_CONF} ] && ./makenemo -n ${TEST_CONF} clean 
     72[ -d ${TEST_CONF} ] && ./makenemo -n ${TEST_CONF} clean       >& /dev/null 
    7373./makenemo -n ${TEST_CONF} -r ${REFE_CONF} -m $ARCH -j $NPROC >& /dev/null 
    7474[ ! -e ${TEST_CONF}/BLD/bin/nemo.exe ] && get_out 2 
    7575 
    76 # Get namelists, xml & forced files for running 
     76# Get namelists, xml & forcing files for running 
    7777#--------------------------------------------------- 
    7878print_step "Preparing job by copying ${REFE_CONF} input files" 
     
    111111 
    112112ST='OK' # 'OK' by default 
     113 
    113114# Inspect output text files 
    114115#--------------------------------------------------- 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting_func.sh

    r5521 r5523  
    1313 
    1414    if [[ -e ${REFE_DIR}/model.log && $( diff -q model.log ${REFE_DIR}/model.log ) ]]; then 
    15    line=$( diff model.log ${REFE_DIR}/model.log  | tr -d '\n' ) 
     15   line=$( diff model.log ${REFE_DIR}/model.log  | grep '<' ) 
    1616    fi 
    1717 
     
    4444    echo 'Last time step of standard run: '${LAST_TIME_STEP} 
    4545 
    46     if [    $( find -name "*${LAST_TIME_STEP}_restart*.nc" -print -quit ) \ 
    47     && $( diff -q     time.step ${REFE_DIR}/time.step              )  ]; then 
     46    if [ $( find -name "*${LAST_TIME_STEP}_restart*.nc" -print -quit ) ]; then 
    4847   base_name=$( find -name "*${LAST_TIME_STEP}_restart*.nc" -print -quit | awk -F/ '{print $NF}' \ 
    4948                | sed "s/^\(.*\)$LAST_TIME_STEP\_restart.*/\1$LAST_TIME_STEP\_/"                  ) 
     
    5352 
    5453       nb_dom=$( find -name "${file}_[0-9]*.nc" | wc -l | awk '{print $1}' ) 
    55        if [ ${nb_dom} -gt 1 ]; then 
     54       if   [ ${nb_dom} -gt 1 ]; then 
    5655      ${NEMO_TRBD}/rebuild_nemo -t $NPROC $file ${nb_dom}  > /dev/null 
    5756      [ $? -eq 0 ] && rm -f ${base_name}_${comp}_[0-9]*.nc > /dev/null 
     57       elif [ ${nb_dom} -eq 0 ]; then 
     58      export ST='FAILED' && get_out 10 
    5859       fi 
    5960 
     
    7071 
    7172       else 
    72       export ST='FAILED' 
     73      export ST='FAILED' && get_out 9 
    7374       fi 
    7475 
     
    114115 
    115116    # If -v|--version option has been set, modify svn command 
    116     if [[    $( echo ${NEMO_VERS} | grep  "HEAD\|up\|update"   ) \ 
    117      || $( echo ${NEMO_VERS} | tr -d '[:alpha:][:punct:]' )  ]]; then 
    118     rev=$( echo ${NEMO_VERS} | tr -d '[:alpha:][:punct:]' ) || rev='HEAD' 
    119    svn_cmd='svn update -r '$rev  
     117    if   [ $( echo ${NEMO_VERS} | grep  "HEAD\|up\|update"   ) ]; then 
     118   svn_cmd='svn update -r HEAD' 
     119    elif [ $( echo ${NEMO_VERS} | tr -d '[:alpha:][:punct:]' ) ]; then 
     120   svn_cmd='svn update -r '$( echo ${NEMO_VERS} | tr -d '[:alpha:][:punct:]' ) 
    120121    else 
    121122   svn_cmd='svn '${svn_opt} 
Note: See TracChangeset for help on using the changeset viewer.