Changeset 15159 for utils/CI/sette/sette_eval.sh

Timestamp:

2021-07-29T18:33:12+02:00 (3 years ago)

Author:

acc

Message:

Some enhancements to SETTE scripts: Added a -N option to sette.sh to set ln_nnogather=.false. (where appropriate) and a -T <TEST_ROOT> option to sette_eval.sh where <TEST_ROOT> is either LONG, SHORT or REPRO (default:LONG). This option determines which set of results to compare between validation sets. In the case of REPRO, the first expanded match will be used for each configuration (e.g. REPRO_4_8)

File:

• utils/CI/sette/sette_eval.sh (modified) (9 diffs)

utils/CI/sette/sette_eval.sh

@@ -1 @@
-#!/bin/bash -f
+#!/bin/bash 
 # set -vx
 # simple SETTE result evaluator
@@ -14 +14 @@
 nrmiss=0
 nvmiss=0
+TESTD_ROOT=LONG
+
+function get_testd() {
+  sroot=$1/${TESTD_ROOT}
+  ls -1d "$sroot"* &> /dev/null
+  if [ $? -eq 0 ] ; then
+   TESTD=`ls -1d "$sroot"* | head -1l`
+   TESTD=`basename $TESTD`
+   if [ ! -d $1/$TESTD ] ; then
+     echo "TEST directory not found with rootname: "$TESTD_ROOT
+     exit
+   fi
+  else
+   TESTD=$TESTD_ROOT
+  fi
+}
 
 function get_dorv() {
@@ -72 +88 @@
 #
   if [ -d $vdir/$mach/$dorv/$nam ]; then
-    f1s=$vdir/$mach/$dorv/$nam/LONG/run.stat
-    f1t=$vdir/$mach/$dorv/$nam/LONG/tracer.stat
-    f2s=$vdirref/$mach/$dorvref/$nam/LONG/run.stat
-    f2t=$vdirref/$mach/$dorvref/$nam/LONG/tracer.stat
+    get_testd $vdir/$mach/$dorv/$nam
+    if  [ ! -d $vdir/$mach/$dorv/$nam/$TESTD ] ; then
+      printf "%-20s %s (%s)\n" $nam " not tested" $TESTD;
+      return;
+    fi
+    f1s=$vdir/$mach/$dorv/$nam/$TESTD/run.stat
+    f1t=$vdir/$mach/$dorv/$nam/$TESTD/tracer.stat
+    f2s=$vdirref/$mach/$dorvref/$nam/$TESTD/run.stat
+    f2t=$vdirref/$mach/$dorvref/$nam/$TESTD/tracer.stat
     if  [ ! -f $f1s ] && [ ! -f $f1t ] ; then
       printf "%-20s %s\n" $nam " incomplete test";
@@ -91 +112 @@
       if [ $? == 0 ]; then
         if [ $silent == 0 ]; then
-          printf "%-20s %s %s\n" $nam  " run.stat    files are identical "
+          printf "%-20s %s (%s)\n" $nam  " run.stat    files are identical " $TESTD
         fi
       else
         get_ktdiff $f1s $f2s
         if [ $silent == 0 ]; then
-         printf "%-20s %s %s %-5s %s\n" $nam  " run.stat    files are DIFFERENT (results are different after " $ktdiff " time steps)"
+         printf "%-20s %s %s %-5s (%s)\n" $nam  " run.stat    files are DIFFERENT (results are different after " $ktdiff " time steps) " $TESTD
         else
          errcnt=$(( $errcnt + 1 ))
@@ -109 +130 @@
       if [ $? == 0 ]; then
         if [ $silent == 0 ]; then          
-          printf "%-20s %s %s\n" $nam  " tracer.stat files are identical "
+          printf "%-20s %s (%s)\n" $nam  " tracer.stat files are identical " $TESTD
         fi
       else
         get_ktdiff2 $f1t $f2t
         if [ $silent == 0 ]; then          
-         printf "%-20s %s %s %-5s %s\n" $nam  " tracer.stat files are DIFFERENT (results are different after " $ktdiff " time steps) "
+         printf "%-20s %s %s %-5s (%s)\n" $nam  " tracer.stat files are DIFFERENT (results are different after " $ktdiff " time steps) " $TESTD
         else
          errcnt=$(( $errcnt + 1 ))
@@ -139 +160 @@
 # overwrite revision (later) or compiler
   if [ $# -gt 0 ]; then
-    while getopts r:R:c:v:V:qh option; do 
+    while getopts r:R:c:v:V:T:qh option; do 
        case $option in
           c) mach=$OPTARG;;
@@ -153 +174 @@
              fi
              ;;
+          T) TESTD_ROOT=$OPTARG;;
           h | *) echo ''
                  echo 'sette_eval.sh : ' 
@@ -162 +184 @@
                  echo ' -R REFERENCE REVISION_number :'
                  echo '     compare sette results against the specified revision (use to over-ride value set in param.cfg)'
+                 echo ' -T test_rootname :'
+                 echo '     root of test name to be checked. Valid choices ares: LONG, SHORT, REPRO. [default: LONG]'
                  echo ' -v sub_dir :'
                  echo '     validation sub-directory below NEMO_VALIDATION_DIR'
@@ -252 +276 @@
       echo ''
      fi
-     checklist=(GYRE_PISCES ORCA2_ICE_PISCES ORCA2_OFF_PISCES AMM12 ORCA2_SAS_ICE AGRIF_DEMO WED025 ISOMIP+ VORTEX ICE_AGRIF OVERFLOW LOCK_EXCHANGE SWG)
+     checklist=(GYRE_PISCES ORCA2_ICE_PISCES ORCA2_OFF_PISCES AMM12 ORCA2_SAS_ICE ORCA2_ICE_OBS AGRIF_DEMO WED025 ISOMIP+ VORTEX ICE_AGRIF OVERFLOW LOCK_EXCHANGE SWG) 
      for repro_test in ${checklist[@]}
      do