Changeset 9221


Ignore:
Timestamp:
2018-01-12T18:42:42+01:00 (3 years ago)
Author:
mathiot
Message:

add extra print in sette_rpt to detect missing config validation directory

Location:
branches/2017/dev_merge_2017/NEMOGCM/SETTE
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/new_sette_rpt.sh

    r8864 r9221  
    106106    dorv=`echo $dorv | sed -e 's:.*/::'` 
    107107    f1o=$vdir/$nam/$mach/$dorv/LONG/ocean.output 
    108     f1s=$vdir/$nam/$mach/$dorv/LONG/solver.stat 
     108    f1s=$vdir/$nam/$mach/$dorv/LONG/run.stat 
    109109    f1t=$vdir/$nam/$mach/$dorv/LONG/tracer.stat 
    110110    f2o=$vdir/$nam/$mach/$dorv/SHORT/ocean.output 
    111     f2s=$vdir/$nam/$mach/$dorv/SHORT/solver.stat 
     111    f2s=$vdir/$nam/$mach/$dorv/SHORT/run.stat 
    112112    f2t=$vdir/$nam/$mach/$dorv/SHORT/tracer.stat 
    113113 
     
    129129      if [ $? == 0 ]; then 
    130130        if [ $pass == 0 ]; then  
    131           printf "%-20s %s %s\n" $nam  " solver.stat restartability  passed : " $dorv 
     131          printf "%-20s %s %s\n" $nam  " run.stat restartability  passed : " $dorv 
    132132        fi 
    133133      else 
    134         printf "%-20s %s %s\n" $nam  " solver.stat restartability  FAILED : " $dorv  
     134        printf "%-20s %s %s\n" $nam  " run.stat restartability  FAILED : " $dorv  
    135135# 
    136136# Offer view of differences on the second pass 
    137137# 
    138138        if [ $pass == 1 ]; then 
    139           echo "<return> to view solver.stat differences" 
     139          echo "<return> to view run.stat differences" 
    140140          read y 
    141141          sdiff f1.tmp$$ $f2s 
     
    183183    fi 
    184184    rm f1.tmp$$ 
     185  else 
     186    printf "%-20s %s %s\n" $nam  " directory is MISSING : " $dorv 
    185187  fi 
    186188} 
     
    200202    rep2=`ls -1rt $vdir/$nam/$mach/$dorv/ | grep REPRO | tail -1l` 
    201203    f1o=$vdir/$nam/$mach/$dorv/$rep1/ocean.output 
    202     f1s=$vdir/$nam/$mach/$dorv/$rep1/solver.stat 
     204    f1s=$vdir/$nam/$mach/$dorv/$rep1/run.stat 
    203205    f1t=$vdir/$nam/$mach/$dorv/$rep1/tracer.stat 
    204206    f2o=$vdir/$nam/$mach/$dorv/$rep2/ocean.output 
    205     f2s=$vdir/$nam/$mach/$dorv/$rep2/solver.stat 
     207    f2s=$vdir/$nam/$mach/$dorv/$rep2/run.stat 
    206208    f2t=$vdir/$nam/$mach/$dorv/$rep2/tracer.stat 
    207209 
     
    221223      if [ $? == 0 ]; then  
    222224        if [ $pass == 0 ]; then   
    223           printf "%-20s %s %s\n" $nam  " solver.stat reproducibility passed : " $dorv 
     225          printf "%-20s %s %s\n" $nam  " run.stat reproducibility passed : " $dorv 
    224226        fi 
    225227      else 
    226         printf "%-20s %s %s\n" $nam  " solver.stat reproducibility FAILED : " $dorv 
     228        printf "%-20s %s %s\n" $nam  " run.stat reproducibility FAILED : " $dorv 
    227229# 
    228230# Offer view of differences on the second pass 
    229231# 
    230232        if [ $pass == 1 ]; then 
    231           echo "<return> to view solver.stat differences" 
     233          echo "<return> to view run.stat differences" 
    232234          read y 
    233235          sdiff f1.tmp$$ $f2s 
     
    271273      fi 
    272274    fi 
     275  else 
     276    printf "%-20s %s %s\n" $nam  " directory is MISSING : " $dorv  
    273277  fi 
    274278} 
     
    277281# 
    278282#  checks AGRIF does not corrupe results with no AGRIF zoom. Expects ORCA2AGUL/AGRIFNOZ and ORCA2AGUL_NAGR/AGRIFNO  run directories 
    279 # Compares solver.stat files for each 
     283# Compares run.stat files for each 
    280284# 
    281285  vdir=$1 
     
    292296    rep1=`ls -1rt $vdir/$dir1/$mach/$dorv1/ |  tail -2l | head -1 ` 
    293297    rep2=`ls -1rt $vdir/$dir2/$mach/$dorv2/ |  tail -1l` 
    294     f1s=$vdir/$dir1/$mach/$dorv1/$rep1/solver.stat 
    295     f2s=$vdir/$dir2/$mach/$dorv2/$rep2/solver.stat 
     298    f1s=$vdir/$dir1/$mach/$dorv1/$rep1/run.stat 
     299    f2s=$vdir/$dir2/$mach/$dorv2/$rep2/run.stat 
    296300 
    297301    if  [ ! -f $f1s ] && [ ! -f $f2s ] ; then  
     
    306310      if [ $? == 0 ]; then 
    307311        if [ $pass == 0 ]; then  
    308           printf "%-20s %s %s %s %s\n" $rep1 $rep2  " AGRIF: solver.stat unchanged - test  passed : " $dorv1 $dorv2 
     312          printf "%-20s %s %s %s %s\n" $rep1 $rep2  " AGRIF: run.stat unchanged - test  passed : " $dorv1 $dorv2 
    309313        fi 
    310314      else 
    311         printf "%-20s %s %s %s %s\n" $rep1 $rep2  " for AGRIF, solver.stat test FAILED : " $dorv1 $dorv2 
     315        printf "%-20s %s %s %s %s\n" $rep1 $rep2  " for AGRIF, run.stat test FAILED : " $dorv1 $dorv2 
    312316# 
    313317# Offer view of differences on the second pass 
    314318# 
    315319        if [ $pass == 1 ]; then 
    316           echo "<return> to view solver.stat differences" 
     320          echo "<return> to view run.stat differences" 
    317321          read y 
    318322          sdiff $f1s $f2s 
  • branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_rpt.sh

    r9019 r9221  
    184184    fi 
    185185    rm f1.tmp$$ 
     186  else 
     187    printf "%-20s %s %s\n" $nam  " directory is MISSING : " $dorv 
    186188  fi 
    187189} 
     
    273275      fi 
    274276    fi 
     277  else 
     278    printf "%-20s %s %s\n" $nam  " directory is MISSING : " $dorv 
    275279  fi 
    276280} 
Note: See TracChangeset for help on using the changeset viewer.