Changeset 12431

Timestamp:

2020-02-21T11:49:23+01:00 (3 years ago)

Author:

mathiot

Message:

add option to specify the compiler used in sette_rpt.sh and to specify the number of pass in param.cfg

Location:

utils/CI/sette_ticket2304

Files:

• param.cfg (modified) (1 diff)
• sette_rpt.sh (modified) (3 diffs)

utils/CI/sette_ticket2304/param.cfg

@@ -74 +74 @@
 TEST_CONFIGS=${SETTE_TEST_CONFIGS:-"ORCA2_ICE_PISCES ORCA2_OFF_PISCES AMM12 AGRIF SPITZ12 GYRE_PISCES SAS ORCA2_ICE_OBS ICE_AGRIF OVERFLOW LOCK_EXCHANGE VORTEX ISOMIP"}
 # ------------------------------------------------------------------------------------------
+#
+# reporting  
+# Set number of passes (default only 1). For a second pass, set '0 1'
+RPT_PASSES=${SETTE_RPT_NPASSES:-'0'} 

utils/CI/sette_ticket2304/sette_rpt.sh

@@ -427 +427 @@
   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
@@ -442 +437 @@
 [ `${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) lastchange=$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
 
 echo ""
@@ -456 +468 @@
 # 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
 #