Changeset 12569 for utils/CI/sette/sette_rpt.sh

Timestamp:

2020-03-18T12:22:56+01:00 (4 years ago)

Author:

mathiot

Message:

ticket #2304: merge branch sette_ticket2304 into sette (thank you Simon for the review and all the suggestions you made). It include synchronisation and cleaning option between the REF config and the _ST config to ease the work when the reference configurations are changed and display bug in sette_check_avail_rev

File:

• utils/CI/sette/sette_rpt.sh (modified) (7 diffs)

utils/CI/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=`ls -1rt $vdir/$nam2/$mach/ 2>/dev/null | tail -1l `
     dorv2=`echo $dorv2 | sed -e 's:.*/::'`
   else
@@ -211 +211 @@
       else
         get_ktdiff $f1t $f2t
-        printf "\e[38;5;196m%-27s %s %s %s %-5s %s\e[0m\n" $nam  " tracer.stat    reproducibility FAILED : " $dorv " (results are different after " $ktdiff " time steps)"
+        printf "\e[38;5;196m%-27s %s %s %s %-5s %s\e[0m\n" $nam  " tracer.stat reproducibility FAILED : " $dorv " (results are different after " $ktdiff " time steps)"
 #
 # Offer view of differences on the second pass
@@ -283 +283 @@
         fi
       else
-        printf "%-20s %s %s\n" $nam  " run.stat    files are DIFFERENT "
+        get_ktdiff $f1s $f2s
+        printf "%-20s %s %s %-5s %s\n" $nam  " run.stat    files are DIFFERENT (results are different after " $ktdiff " time steps)"
 #
 # Offer view of differences on the second pass
@@ -306 +307 @@
         fi
       else
-        printf "%-20s %s %s\n" $nam  " tracer.stat files are DIFFERENT "
+        get_ktdiff $f1t $f2t
+        printf "%-20s %s %s %-5s %s\n" $nam  " tracer.stat files are DIFFERENT (results are different after " $ktdiff " time steps) "
 #
 # Offer view of differences on the second pass
@@ -418 +420 @@
   NEMO_VALID=${NEMO_VALIDATION_DIR}
   NEMO_VALID_REF=${NEMO_VALIDATION_REF}
-  LANG=en_US
 #
   if [ ! -d $NEMO_VALID ]; then
@@ -425 +426 @@
   fi
 #
-# Directory to run the tests
-  CONFIG_DIR0=${MAIN_DIR}/cfgs
-  TOOLS_DIR=${MAIN_DIR}/tools
-  NPROC=32
-  SAS_RESTART_DIR=${CONFIG_DIR0}/ORCA2_SAS_ICE_ST
 #
 # Show current revision tag and branch name
 #
 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}'`
+lastchange=`${SVN_CMD} info ${MAIN_DIR} | grep 'Last Changed Rev' | awk '{print $NF}'`
+revision=`${SVN_CMD} info ${MAIN_DIR} | grep 'Revision' | awk '{print $NF}'`
+branchname=`${SVN_CMD} info ${MAIN_DIR} | grep ^URL | awk -F ipsl/forge/projets/nemo/svn/ '{print $NF}'`
 echo "Current code is : $branchname @ r$revision  ( last change @ r$lastchange )"
 [ `${SVN_CMD} status -q ${MAIN_DIR}/{cfg,tests,src} | wc -l` -ge 1 ] && lastchange=${lastchange}+
 
-# overwrite revision is argument 1 present
-[[ $# -eq 1 ]] && lastchange=$1
+# overwrite revision or compiler
+  if [ $# -gt 0 ]; then
+    while getopts r:c:h option; do 
+       case $option in
+          c) mach=$OPTARG;;
+          r) rev=$OPTARG;;
+          h | *) echo ''
+                 echo 'sette_rpt.sh : ' 
+                 echo '     display result for the latest change'
+                 echo ' -c COMPILER_name :'
+                 echo '     display result for the specified compiler'
+                 echo ' -r REVISION_number :'
+                 echo '     display sette results for the specified revision (set old for the latest revision available for each config)'
+                 echo ''
+                 exit 42;;
+       esac
+    done
+    shift $((OPTIND - 1))
+fi
+
+# if $1 (remaining arguments)
+if [[ ! -z $1 ]] ; then rev=$1 ; fi
+
+# by default use the current lastchanged revision
+lastchange=${rev:-$lastchange}
 
 echo ""
@@ -454 +473 @@
 # The script also needs the date or revision tag. Currently this is taken from the latest sub-directory found in each directory
 #  
-for pass in  0 1 
+for pass in  $RPT_PASSES 
 do
 #