Changeset 5670


Ignore:
Timestamp:
2015-08-05T15:50:17+02:00 (5 years ago)
Author:
nicolasmartin
Message:

dev_r5092_CNRS_SETTE Correct last config rename

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

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/config/martin.cfg

    r5644 r5670  
    55[ -z "${REFE_CONF}" ] && REFE_CONF='ORCA2_LIM_PISCES' 
    66[ -z "${NEMO_TARF}" ] && NEMO_TARF='ORCA2_LIM_nemo_v3.6.tar' 
    7 [ -z "${TEST_CONF}" ] && TEST_CONF='O2L3P_trust' 
     7[ -z "${TEST_CONF}" ] && TEST_CONF='O2LP_trust' 
    88NEMO_HOME=$CCCWORKDIR/NEMO/${NEMO_BRAN}/NEMOGCM 
    99NEMO_FORC=$CCCWORKDIR/NEMO/FORC 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting_func.sh

    r5669 r5670  
    163163    echo 'Last time step of standard run: '${TIME_STEP} 
    164164 
    165     if [ $( find -regex ".*_0+${TIME_STEP}_restart.*\.nc" -print -quit ) ]; then 
    166    base_name=$( find -regex ".*_0+${TIME_STEP}_restart.*\.nc" -print -quit | awk -F/ '{print $NF}' \ 
    167                 | sed "s/^\(.*\)$TIME_STEP\_restart.*/\1$TIME_STEP\_/"                              ) 
     165    if [ $( find -regex ".*_0+$TIME_STEP_restart.*\.nc" -print -quit ) ]; then 
     166   base_name=$( find -regex ".*_0+$TIME_STEP_restart.*\.nc" -print -quit \ 
     167                | cut -d/ -f2 | sed "s/^\(.*$TIME_STEP\)\_restart.*/\1\_/" ) 
    168168 
    169169   for comp in restart restart_ice restart_trc; do 
    170170       file=${base_name}${comp} 
    171171 
    172        nb_dom=$( find -name "${file}_[0-9]*.nc" | wc -l | awk '{print $1}' ) 
     172       nb_dom=$( find -name "${file}_[0-9]*.nc" | wc -l | awk '{ print $1 }' ) 
    173173       if   [ ${nb_dom} -gt 1 ]; then 
    174174      ${NEMO_TRBD}/rebuild_nemo -t $NPROC $file ${nb_dom} > /dev/null 
     
    180180       if [ -e ${REFE_DIR}/$file.nc ]; then 
    181181       ## UNIX `cmp` not suitable (filename & timestamp in .nc file) 
    182       diff_rcd=$( $CDO diffn $file.nc ${REFE_DIR}/$file.nc 2> /dev/null               \ 
    183                   | awk '/records/ {print $0}' | sed 's/differ$/differ,/' | tr -d '\n'  ) 
    184  
    185       if [[ ! -z ${diff_rcd} && $( echo ${diff_rcd} | awk '{print $1}') -ne 0 ]]; then 
     182      diff_rcd=$( $CDO diffn $file.nc ${REFE_DIR}/$file.nc 2> /dev/null      \ 
     183                  | awk '/records/ {print $0}' | sed '2 s/^/,/' | tr -d '\n'  ) 
     184 
     185      if [[ ! -z ${diff_rcd} && $( echo ${diff_rcd} | awk '{ print $1 }') -ne 0 ]]; then 
    186186          export ST='FAILED' 
    187187          files_list+=$file' ' 
Note: See TracChangeset for help on using the changeset viewer.