Changeset 5459


Ignore:
Timestamp:
2015-06-22T14:19:53+02:00 (5 years ago)
Author:
nicolasmartin
Message:

dev_r5092_CNRS_SETTE Ping pong updates between Curie & Ada to finalize

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

    r5455 r5459  
    5757. ${ARCH_ENV} > /dev/null 
    5858get_soft_rel 
    59 cat env.log 
     59cat arch_env.log 
    6060 
    6161# XIOS compiling 
     
    6363print_step 'Compiling XIOS' 
    6464cd ${DIR_XIOS} 
    65 ./make_xios --full --arch $ARCH -job $NPROC #>& /dev/null 
     65#./make_xios --full --arch $ARCH -job $NPROC #>& /dev/null 
    6666[ ! -e ${DIR_XIOS}/lib/libxios.a ] && get_out $STATUS $STEP 
    6767 
     
    7070print_step "Compiling ${CONF_REF} configuration" 
    7171cd ${NEMO_CONF} 
    72 [ -d ${TEST_CONF} ] && ./makenemo -n ${TEST_CONF} clean 
     72#[ -d ${TEST_CONF} ] && ./makenemo -n ${TEST_CONF} clean 
    7373./makenemo -n ${TEST_CONF} -r ${REFE_CONF} -m $ARCH -j $NPROC #>& /dev/null 
    7474[ ! -e ${TEST_CONF}/BLD/bin/nemo.exe ] && get_out $STATUS $STEP 
     
    113113sleep ${time_increment} 
    114114 
    115 if (( ${time_elapsed} = ${TIME_LIMI} )); then 
     115if [ ${time_elapsed} -eq ${TIME_LIMI} ]; then 
    116116    print_step 'Killing job' 
    117117    ${JOB_DELE} ${JOB_ID} &> /dev/null 
     
    126126    comments 'E R R O R' 
    127127    get_out $STATUS $STEP 
    128 else 
    129     STATUS='OK' 
     128fi 
    130129 
    131     # Inspect output text files 
    132     #--------------------------------------------------- 
    133     print_step 'Test ASCII output files diff' 
    134     for file in ocean.output solver.stat tracer.stat; do 
    135    diff $file ${REFE_DIR}/$file 
    136    [ $? -ne 0 ] && get_out 'FAILED' 'ASCII output file differ' 
    137     done 
     130STATUS='OK' 
     131# Inspect output text files 
     132#--------------------------------------------------- 
     133print_step 'Test ASCII output files diff' 
     134for file in ocean.output solver.stat tracer.stat; do 
     135    diff $file ${REFE_DIR}/$file 
     136    [ $? -ne 0 ] && get_out 'FAILED' 'ASCII output file diff' 
     137done 
    138138 
    139     # Inspect output NetCDF files 
    140     #--------------------------------------------------- 
    141     print_step 'Test last restart NetCDF files diff' 
    142     diff_restart 
    143     [ $? -ne 0 ] && get_out 'FAILED' "$CDO diff failed" 
     139# Inspect output NetCDF files 
     140#--------------------------------------------------- 
     141print_step 'Test last restart NetCDF files diff' 
     142diff_restart 
     143[ $? -ne 0 ] && get_out 'FAILED' "$CDO diff failed" 
    144144 
    145     # Get computation duration 
    146     #--------------------------------------------------- 
    147     print_step 'Get real CPU time' 
    148     get_cpu_time 
     145# Get computation duration 
     146#--------------------------------------------------- 
     147print_step 'Get real CPU time' 
     148get_cpu_time 
    149149 
    150     comments 'W A R N I N G' 
    151 fi 
     150# Get comments (ocean.output & diff arch_env.log) 
     151#--------------------------------------------------- 
     152comments 'W A R N I N G' 
    152153 
    153154# End 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting_func.sh

    r5455 r5459  
    99       last_time_step=$( cat ${TEST_DIR}/time.step | tr -d [:space:] ) 
    1010       STEP='nemo.exe crashed at '${last_time_step} && export STEP 
    11        line=$( grep -m1 "$state" ocean.output | tr -d '\n' ) 
     11       line=$( grep -m1 -A5 "$state" ocean.output | tr -d '\n' ) 
    1212   else 
    1313       STEP='nemo.exe crashed at initialization'    && export STEP 
     
    1616    fi 
    1717 
    18     if [ $( diff -q env.log ${REFE_DIR}/env.log ) ]; then 
    19    line=$( diff env.log ${REFE_DIR}/env.log  | tr -d '\n' ) 
     18    if [ $( diff -q arch_env.log ${REFE_DIR}/arch_env.log ) ]; then 
     19   line=$( diff arch_env.log ${REFE_DIR}/arch_env.log  | tr -d '\n' ) 
    2020    fi 
    2121 
     
    8181   [ -z "${arch_rel}"  ] && arch_rel=$( echo $PATH          | sed  "s#.*$rel/\([^/]*\).*#\1#" ) 
    8282   [ $rel == $COMPILER ] && arch_rel=$( $rel --version      | grep -m1 -o ' [0-9.]* '         ) 
    83    echo $rel ${arch_rel} >> env.log 
     83   echo $rel ${arch_rel} >> arch_env.log 
    8484    done 
    8585 
    86     sed -n 3p env.log | sed 'i\Compiler'    > mesg_05_compiler_${CFG_USER}_${CFG_ARCH}.txt 
    87     sed -n 4p env.log | sed 'i\MPI libs'    > mesg_06_mpi_${CFG_USER}_${CFG_ARCH}.txt 
    88     sed -n 5p env.log | sed 'i\NetCDF libs' > mesg_07_netcdf_${CFG_USER}_${CFG_ARCH}.txt 
     86    sed -n 3p arch_env.log | sed 'i\Compiler'    > mesg_05_compiler_${CFG_USER}_${CFG_ARCH}.txt 
     87    sed -n 4p arch_env.log | sed 'i\MPI libs'    > mesg_06_mpi_${CFG_USER}_${CFG_ARCH}.txt 
     88    sed -n 5p arch_env.log | sed 'i\NetCDF libs' > mesg_07_netcdf_${CFG_USER}_${CFG_ARCH}.txt 
    8989} 
    9090 
     
    107107   # For time being, just get revision number from XIOS 
    108108   if [ $dir == ${DIR_XIOS} ]; then 
    109        echo 'XIOS '$( svn info $dir | awk '(NR == 5) {print $NF}' ) >> env.log 
     109       echo 'XIOS '$( svn info $dir | awk '(NR == 5) {print $NF}' ) >> arch_env.log 
    110110       continue 
    111111   fi 
     
    162162   touch mesg_08_inputfiles_${CFG_USER}_${CFG_ARCH}.txt mesg_09_realcputime_${CFG_USER}_${CFG_ARCH}.txt \ 
    163163         mesg_10_comments_${CFG_USER}_${CFG_ARCH}.txt 
    164    tar -czf ${REFE_DIR}/trusting_${DATE_STR}_${CFG_USER}_${CFG_ARCH}.tar.gz * 
     164   #tar -czf ${REFE_DIR}/trusting_${DATE_STR}_${CFG_USER}_${CFG_ARCH}.tar.gz * 
    165165    fi 
    166166 
Note: See TracChangeset for help on using the changeset viewer.