Changeset 5485


Ignore:
Timestamp:
2015-06-24T22:02:14+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:
1 added
3 edited

Legend:

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

    r5432 r5485  
    1 # Ada super-computer configuration 
     1# Ada configuration 
    22 
    33# Available softwares: 
     
    88 
    99# Job commands: LoadLeveler 
    10 JOB_SUBM=llsubmit 
     10JOB_SUBM="llsubmit ${NEMO_TRUS}/batch/${CFG_ARCH}.sh | grep -o 'ada.*'" 
    1111JOB_LIST=llq 
    12 JOB_VIEW='llq -xl' 
     12JOB_INFO='llq -xl' 
     13JOB_TIME='' 
    1314JOB_DELE=llcancel                           
    1415 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting.sh

    r5483 r5485  
    100100#--------------------------------------------------- 
    101101print_step 'Test job state' 
    102 if   [[ $( diff time.step ${REFE_DIR}/time.step ) || \ 
    103         ! -e ocean.output || $( grep 'E R R O R' ocean.output ) ]]; then 
     102if   [[ ! -e time.step || $( grep -q 'E R R O R' ocean.output ) ]]; then 
    104103    comments 'E R R O R' 
    105104    get_out $STATUS $STEP 
  • branches/2015/dev_r5092_CNRS_SETTE/NEMOGCM/TRUST/trusting_func.sh

    r5483 r5485  
    66 
    77    if [ "$state" == 'E R R O R' ]; then 
    8    if [ -e ocean.output ]; then 
     8   if [ -e time.step ]; then 
    99       last_time_step=$( cat time.step | tr -d [:space:] ) 
    1010       STEP='nemo.exe crashed at '${last_time_step} && export STEP 
    11        line=$( grep -m1 -A5 "$state" ocean.output | tr -d '\n' ) 
    1211   else 
    1312       STEP='nemo.exe crashed at initialization'    && export STEP 
    14        return 
    15    fi 
    16     fi 
    17  
    18     if [ $( diff -q model.log ${REFE_DIR}/model.log ) ]; then 
     13   fi 
     14    fi 
     15 
     16    [ -e ocean.output ] && line=$( grep -m1 -A5 "$state" ocean.output | tr -d '\n' ) 
     17    if [[ -e ${REFE_DIR}/model.log && $( diff -q model.log ${REFE_DIR}/model.log ) ]]; then 
    1918   line=$( diff model.log ${REFE_DIR}/model.log  | tr -d '\n' ) 
    2019    fi 
     
    3534 
    3635diff_restart() { 
     36 
     37    if   [ ! -e  ${REFE_DIR}/time.step ]                 ; then 
     38   echo "Seems that there is no restart files for comparison: no time.step in ${REFE_DIR}" 
     39   return 
     40    elif [ $( diff -q time.step ${REFE_DIR}/time.step ) ]; then 
     41   printf "Seems that the trusting test ends at a different time step: " 
     42   printf "${TEST_DIR} $( cat ${TEST_DIR}/time.step | tr -d [:space:] ) != " 
     43   printf "${REFE_DIR} $( cat ${REFE_DIR}/time.step | tr -d [:space:] )  \n" 
     44   return 
     45    fi 
     46 
    3747    last_time_step=$( cat ${REFE_DIR}/time.step | tr -d [:space:] ) 
    3848    echo 'Last time step of standard run: '${last_time_step} 
     
    4353 
    4454   for comp in restart restart_ice restart_trc; do 
    45        file=${base_name}${comp} && printf "$file'.nc': " 
     55       file=${base_name}${comp} && printf "$file.nc: " 
    4656 
    4757       nb_dom=$( find -name "${file}_[0-9]*.nc" | wc -l | awk '{print $1}' ) 
     
    5161       fi 
    5262 
     63       if [ -e ${REFE_DIR}/$file.nc ]; then 
    5364       # UNIX `cmp` not suitable (filename & timestamp in .nc file) 
    54        nc_diff=$( $CDO diffn $file'.nc' ${REFE_DIR}/$file'.nc' 2> /dev/null | tail -1 ) 
    55        if [ ! -z "${nc_diff}" ]; then 
    56       export STATUS='FAILED' STEP='Restart files different' 
    57       printf "$CDO diffn ${nc_diff}\n" 
     65      nc_diff=$( $CDO diffn $file.nc ${REFE_DIR}/$file.nc 2> /dev/null | tail -1 ) 
     66 
     67      if [ ! -z "${nc_diff}" ]; then 
     68          export STATUS='FAILED' STEP="$file.nc different" 
     69          printf "$CDO ${nc_diff}\n" 
     70      else 
     71          printf "identical\n" 
     72      fi 
     73 
    5874       else 
    59       printf "identical\n" 
     75      printf "No previous $file.nc found for comparison\n" 
    6076       fi 
    6177 
     
    6480    else 
    6581   export STATUS='FAILED'; STEP='No restart files found at last time step' 
    66    printf "no restart files found for comparison\n" 
     82   printf "No $file.nc found for comparison\n" 
    6783    fi 
    6884 
     
    7187diff_textfiles() { 
    7288    for file in ocean.output $( ls *.stat ); do 
    73    diff $file ${REFE_DIR}/$file 
    74    [ $? -ne 0 ] && export STATUS='FAILED' STEP='ASCII output file diff' 
     89 
     90   if [ -e ${REFE_DIR}/$file ]; then 
     91       diff $file ${REFE_DIR}/$file 
     92       [ $? -ne 0 ] && export STATUS='FAILED' STEP="$file different" 
     93   else 
     94       printf "No previous $file found for comparison\n" 
     95   fi 
     96 
    7597    done 
    7698} 
     
    193215   printf "Input files\n\n"   > mesg_09_inputfiles_${CFG_USER}_${CFG_ARCH}.txt 
    194216   printf "Real CPU time\n\n" > mesg_10_realcputime_${CFG_USER}_${CFG_ARCH}.txt 
    195    printf "Comments\n\n"      > mesg_11_comments_${CFG_USER}_${CFG_ARCH}.txt 
     217 
     218   if [ ! -e mesg_11_comments_${CFG_USER}_${CFG_ARCH}.txt ]; then 
     219       printf "Comments\n\n"      > mesg_11_comments_${CFG_USER}_${CFG_ARCH}.txt 
     220   fi 
     221 
    196222   #tar -czf ${REFE_DIR}/trusting_${DATESTR}_${CFG_USER}_${CFG_ARCH}.tar.gz * 
    197223    fi 
Note: See TracChangeset for help on using the changeset viewer.