Changeset 11493

Timestamp:

2019-09-02T20:03:21+02:00 (4 years ago)

Author:

smueller

Message:

Revision of the method for determining the test revision in the identictest test to bring it in line with the method used in other tests (ticket #2302)

File:

• utils/CI/fix_ticket2302_sette/sette_rpt.sh (modified) (2 diffs)

utils/CI/fix_ticket2302_sette/sette_rpt.sh

@@ -15 +15 @@
     dorv=`ls -1rt $vdir/$nam/$mach/ | tail -1l `
     dorv=`echo $dorv | sed -e 's:.*/::'`
+    dorv2=`ls -1rt $vdir/$nam2/$mach/ | tail -1l `
+    dorv2=`echo $dorv2 | sed -e 's:.*/::'`
   else
     dorv=$lastchange
+    dorv2=$lastchange
   fi
 }
@@ -364 +367 @@
 function identictest(){
 #
-#  checks AGRIF does not corrupe results with no AGRIF zoom. Expects ORCA2AGUL/AGRIFNOZ and ORCA2AGUL_NAGR/AGRIFNO  run directories
-# Compares solver.stat files for each
+# Checks AGRIF does not corrupt results with no AGRIF zoom by comparing run.stat files
 #
   vdir=$1
-  dir1=$2
-  dir2=$3
+  nam=$2
+  nam2=$3
   pass=$4
 #
-  if [ -d $vdir/$dir1 ] && [ -d $vdir/$dir2 ]; then
-    dorv1=`ls -1rt $vdir/$dir1/$mach/ | tail -1l `
-    dorv1=`echo $dorv1 | sed -e 's:.*/::'`
-    dorv2=`ls -1rt $vdir/$dir2/$mach/ | tail -1l `
-    dorv2=`echo $dorv2 | sed -e 's:.*/::'`
-
-    rep1=`ls -1rt $vdir/$dir1/$mach/$dorv1/ |  tail -1l`
-#clem    rep2=`ls -1rt $vdir/$dir2/$mach/$dorv2/ |  tail -1l`
-    rep2=`ls -1rt $vdir/$dir1/$mach/$dorv1/ |  tail -1l`
-    f1s=$vdir/$dir1/$mach/$dorv1/$rep1/run.stat
-    f2s=$vdir/$dir2/$mach/$dorv2/$rep2/run.stat
-
-    done_oce=0
-
-    if  [ -f $f1s ] && [ -f $f2s ] ; then
+  get_dorv
+#
+  rep=`ls -1rt $vdir/$nam/$mach/$dorv/ |  tail -1l`
+  f1s=${vdir}/${nam}/${mach}/${dorv}/${rep}/run.stat
+  f2s=${vdir}/${nam2}/${mach}/${dorv2}/${rep}/run.stat
+#
+  if  [ -f $f1s ] && [ -f $f2s ] ; then
       cmp -s $f1s $f2s
       if [ $? == 0 ]; then
-        if [ $pass == 0 ]; then 
-          printf "%-5s %s %-5s %s %s %s\n" $rep1 "AGRIF vs" $rep2 "NOAGRIF run.stat    unchanged  -    passed : " $dorv1 $dorv2
-        fi
-      else
-        get_ktdiff $f1s $f2s
-        printf "\e[38;5;196m%-5s %s %-5s %s %s %s %s %-5s %s\e[0m\n" $rep1 "AGRIF vs" $rep2 "NOAGRIF run.stat    changed  -     FAILED : " $dorv1 $dorv2 " (results are different after " $ktdiff " time steps)"
-#
-# Offer view of differences on the second pass
-#
-        if [ $pass == 1 ]; then
-          echo "<return> to view run.stat differences"
-          read y
-          sdiff $f1s $f2s
-          done_oce=1
-          echo "<return> to continue"
-          read y
-        fi
-      fi
-    else
-      printf "%-27s %-27s %s\n" $dir1 $dir2 " incomplete test"
-    fi
+          if [ $pass == 0 ]; then 
+         printf "%-5s %s %-5s %s %s %s\n" $rep "AGRIF vs" $rep "NOAGRIF run.stat    unchanged  -    passed : " $dorv $dorv2
+          fi
+      else
+          get_ktdiff $f1s $f2s
+          printf "\e[38;5;196m%-5s %s %-5s %s %s %s %s %-5s %s\e[0m\n" $rep "AGRIF vs" $rep "NOAGRIF run.stat    changed  -     FAILED : " $dorv $dorv2 " (results are different after " $ktdiff " time steps)"
+#
+# Offer view of differences on the second pass
+#
+          if [ $pass == 1 ]; then
+         echo "<return> to view run.stat differences"
+         read y
+         sdiff $f1s $f2s
+         echo "<return> to continue"
+         read y
+          fi
+      fi
   else
-    printf "%-27s %-27s %s\n" $dir1 $dir2 " incomplete test"
+      printf "%-27s %-27s %s\n" $nam $nam2 " incomplete test"
   fi
 }