Changeset 8852


Ignore:
Timestamp:
2017-11-30T09:52:36+01:00 (3 years ago)
Author:
clevy
Message:

improve SETTE report reliability , ticket #1983

Location:
trunk/NEMOGCM/SETTE
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/SETTE/new_sette.sh

    r8849 r8852  
    143143# ORCA2AGR          :  9 & 10  AGRIF active with no zoom, compared to no AGRIF cpp key 
    144144 
    145 #for config in 1 2 3 4 5 6 7 8 9 10 
    146 for config in 9 10 
     145for config in 1 2 3 4 5 6 7 8 9 10 
    147146do 
    148147 
  • trunk/NEMOGCM/SETTE/new_sette_rpt.sh

    r8849 r8852  
    4242    cp SAS_00000240_restart_ice.nc $vdir/$nam/$mach/$dorv/LONG/. 
    4343    cp ../SHORT/SAS_00000240_restart_ice.nc $vdir/$nam/$mach/$dorv/SHORT/. 
    44  
    4544    f1o=$vdir/$nam/$mach/$dorv/LONG/SAS_00000240_restart_ice.nc 
    4645    f2o=$vdir/$nam/$mach/$dorv/SHORT/SAS_00000240_restart_ice.nc 
     
    5453  if  [  -f $f1o ] && [  -f $f2o ]; then 
    5554## Compare the two netcdf files 
    56     cdo diffn $f1o $f2o \ 
    57             > cdo_diff.out 2> /dev/null 
    58 ## echo cdo_diff.out 
     55    cdo diffn $f1o $f2o > cdo_diff.out 2> /dev/null 
    5956## Identical if first character of $dif ==0 
    6057    [ ! -s cdo_diff.out ] && continue 
    6158    dif=$( grep -om1 '[0-9]* of [0-9]* records differ' cdo_diff.out ) 
    62      
    63        if [ -n "$dif" ]; then 
    64                 difi=`echo $dif | cut -c -1` 
    65         fi   
    66    \rm cdo_diff.out  
    67  
    68      if [ $difi == 0 ]; then   
    69         if [ $pass == 0 ]; then 
    70           printf "%-20s %s %s\n" $nam  " SAS restart files are IDENTICAL :  passed : " $dorv 
    71         fi 
    72       else 
    73         printf "%-20s %s %s\n" $nam  " SAS restart files are DIFFERENT : FAILED : " $dorv  
     59# difi contains the first character of summary of cdo dif. if = 0, then 0 record differ between the 2 files     
     60    if [ -n "$dif" ]; then 
     61        difi=`echo $dif | cut -c -1` 
     62    fi 
     63    \rm cdo_diff.out  
     64 
     65    if [ $difi == 0 ]; then    
     66       if [ $pass == 0 ]; then 
     67         printf "%-20s %s %s\n" $nam  " ice restart files are IDENTICAL :  passed : " $dorv 
     68       fi 
     69    else 
     70       printf "%-20s %s %s\n" $nam  " ice restart files are DIFFERENT : FAILED : " $dorv  
    7471        # 
    7572   # Offer view of differences on the second pass 
     
    8380          #read y 
    8481        fi 
    85       fi 
    86     fi 
     82    fi 
     83  else 
     84      printf "%-20s %s\n" $nam " incomplete test"; 
     85      return; 
     86  fi 
    8787# 
    8888fi 
Note: See TracChangeset for help on using the changeset viewer.