Changeset 10687 for NEMO/branches/2019/fix_sette_ticket2239/sette_rpt.sh

Timestamp:

2019-02-15T13:05:30+01:00 (5 years ago)

Author:

mathiot

Message:

first commit on sette changes suggested in ticket2239

File:

• NEMO/branches/2019/fix_sette_ticket2239/sette_rpt.sh (modified) (6 diffs)

NEMO/branches/2019/fix_sette_ticket2239/sette_rpt.sh

@@ -275 +275 @@
   fi
 }
+function runcmpres(){
+#
+# compare *.stat file with reference file from a previous sette test or previous version
+# store in NEMO_VALID_REF at revision NEMO_REV_REF
+# Compares end of stat files from each
+#
+  vdir=$1
+  nam=$2
+  vdirref=$3
+  dorvref=$4
+  pass=$5
+#
+  if [ -d $vdir/$nam ]; then
+    dorv=`ls -1rt $vdir/$nam/$mach/ | tail -1l `
+    dorv=`echo $dorv | sed -e 's:.*/::'`
+    f1s=$vdir/$nam/$mach/$dorv/LONG/run.stat
+    f1t=$vdir/$nam/$mach/$dorv/LONG/tracer.stat
+    f2s=$vdirref/$nam/$mach/$dorvref/LONG/run.stat
+    f2t=$vdirref/$nam/$mach/$dorvref/LONG/tracer.stat
+    if  [ ! -f $f1s ] && [ ! -f $f1t ] ; then
+      printf "%-20s %s\n" $nam " incomplete test";
+      return;
+    fi
+    if  [ ! -f $f2s ] && [ ! -f $f2t ] ; then
+      printf "%-20s %s\n" $nam " incomplete test";
+      return;
+    fi
+#
+    done_oce=0
+
+    if  [ -f $f1s ] && [ -f $f2s ] ; then
+      cmp -s $f1s $f2s
+      if [ $? == 0 ]; then
+        if [ $pass == 0 ]; then
+          printf "%-20s %s %s\n" $nam  " run.stat    before/after are similar "
+        fi
+      else
+        printf "%-20s %s %s\n" $nam  " run.stat    before/after are DIFFERENT "
+#
+# Offer view of differences on the second pass
+#
+        if [ $pass == 1 ]; then
+          echo "<return> to view run.stat differences"
+          read y
+          sdiff f1.tmp$$ $f2s
+          done_oce=1
+          echo "<return> to continue"
+          read y
+        fi
+      fi
+    fi
+    # Check tracer.stat files (if they exist)
+#
+    if  [ -f $f1t ] && [ -f $f2t ] ; then
+      cmp -s $f1t $f2t
+      if [ $? == 0 ]; then
+        if [ $pass == 0 ]; then          
+          printf "%-20s %s %s\n" $nam  " tracer.stat before/after are similar "
+        fi
+      else
+        printf "%-20s %s %s\n" $nam  " tracer.stat before/after are DIFFERENT "
+#
+# Offer view of differences on the second pass
+#
+        if [ $pass == 1 ]; then
+          echo "<return> to view tracer.stat differences"
+          read y
+          sdiff $f1t $f2t
+        fi
+      fi
+    fi
+  fi
+}
 
 function runtest(){
@@ -296 +369 @@
     f1o=$vdir/$nam/$mach/$dorv/$rep1/ocean.output
     if  [ ! -f $f1o ] ; then
-      printf "%-27s %s %s\n" $nam " ocean.output is MISSING            : " $dorv
+      if [ $pass == 0 ]; then printf "%-27s %s %s\n" $nam " ocean.output is MISSING            : " $dorv ; fi
       return;
     else 
@@ -312 +385 @@
     fi
   else
-    printf "%-27s %s %s\n" $nam  " directory is MISSING               : " $dorv
+    if [ $pass == 0 ]; then printf "%-27s %s %s\n" $nam  " directory is MISSING               : " $dorv ; fi
   fi
 }
@@ -376 +449 @@
 #########################################################################################
 #
-  mach=`grep "COMPILER=" ./sette.sh | sed -e 's/COMPILER=//'`
-  NEMO_VALID=`grep "NEMO_VALIDATION_DIR=" ./param.cfg | sed -e 's/NEMO_VALIDATION_DIR=//'`
-  NEMO_VALID=`eval "echo $NEMO_VALID"`
+# LOAD param variable (COMPILER, NEMO_VALIDATION_DIR, SVN_CMD)
+  . ./param.cfg
+
+  mach=${COMPILER}
+  NEMO_VALID=${NEMO_VALIDATION_DIR}
+  NEMO_VALID_REF=${NEMO_VALIDATION_REF}
+  LANG=en_US
 #
   if [ ! -d $NEMO_VALID ]; then
@@ -395 +472 @@
 # Show current revision tag and branch name
 #
-cmd="svn"
-[ ! -d "$MAIN_DIR/.svn" ] && cmd="git $cmd"
-echo $cmd 
-echo "$MAIN_DIR/.svn"
-lastchange=`$cmd info ${MAIN_DIR} | grep -i "Last Changed Rev:" | sed -e "s/ //g" | cut -d ":" -f 2`
-revision=`$cmd info | grep Revision | cut -d ":" -f 2 | tr -d ' '`
-branchname=`$cmd info | grep URL | rev | cut -d "/" -f 3 | rev`
+echo ""
+lastchange=`LC_MESSAGES=${LANG} ${SVN_CMD} info ${MAIN_DIR} | grep 'Last Changed Rev' | awk '{print $NF}'`
+revision=`LC_MESSAGES=${LANG} ${SVN_CMD} info ${MAIN_DIR} | grep 'Revision' | awk '{print $NF}'`
+branchname=`LC_MESSAGES=${LANG} ${SVN_CMD} info ${MAIN_DIR} | grep ^URL | awk -F ipsl/forge/projets/nemo/svn/ '{print $NF}'`
 echo "SETTE validation report : $branchname @ r$revision  ( last change @ r$lastchange )"
 #
@@ -450 +524 @@
  dir2=WAGRIF_DEMO_ST
  identictest $NEMO_VALID $dir1 $dir2 $pass 
+#
+# before/after tests
+#
+ if [ $NEMO_VALID_REF != "/path/to/reference/sette/results" ]; then
+   echo ''
+   echo 'check result differences between :'
+   echo "$NEMO_VALID at rev $revision"
+   echo 'and'
+   echo "$NEMO_VALID_REF at rev $NEMO_REV_REF"
+   for repro_test in WGYRE_PISCES_ST WORCA2_ICE_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WISOMIP_ST WORCA2_SAS_ICE_ST WAGRIF_DEMO_ST WSPITZ12_ST WISOMIP_ST WVORTEX_ST WICE_AGRIF_ST
+   do
+     runcmpres $NEMO_VALID $repro_test $NEMO_VALID_REF $NEMO_REV_REF $pass
+   done
+ else
+   echo ''
+   echo 'Result are not compare with any other revision. To do it please fill NEMO_VALID_REF and NEMO_REV_REF in param.cfg'
+   echo ''
+ fi
 
 done
 #
-
 exit