- Timestamp:
- 2021-05-19T13:42:44+02:00 (3 years ago)
- Location:
- utils/CI/sette_ticket2673
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
utils/CI/sette_ticket2673/sette.sh
r14884 r14887 29 29 export USING_MPMD='yes' # Default: yes => run with detached XIOS servers ; use -A to run in attached (SPMD) mode 30 30 # Note: yes also ensures key_xios but -A will not remove it 31 export SETTE_SUB_VAL=" "31 export SETTE_SUB_VAL="MAIN" # Default subdirectory below NEMO_VALIDATION_DIR 32 32 33 33 # Parse command-line arguments … … 182 182 fi 183 183 fi 184 if [ ! -z $SETTE_SUB_VAL ] ; then 185 if [ ! -d $NEMO_VALIDATION_DIR/$SETTE_SUB_VAL ] && [ ${dry_run} -eq 0 ] ; then 186 mkdir $NEMO_VALIDATION_DIR/$SETTE_SUB_VAL 187 fi 188 export NEMO_VALIDATION_DIR=$NEMO_VALIDATION_DIR/$SETTE_SUB_VAL 189 fi 184 if [ ! -d $NEMO_VALIDATION_DIR/$SETTE_SUB_VAL ] && [ ${dry_run} -eq 0 ] ; then 185 mkdir $NEMO_VALIDATION_DIR/$SETTE_SUB_VAL 186 fi 187 export NEMO_VALIDATION_DIR=$NEMO_VALIDATION_DIR/$SETTE_SUB_VAL 190 188 191 189 if [ ${#SETTE_TEST_CONFIGS[@]} -eq 0 ]; then -
utils/CI/sette_ticket2673/sette_rpt.sh
r14874 r14887 472 472 # overwrite revision (later) or compiler 473 473 if [ $# -gt 0 ]; then 474 while getopts r:R:c:v: h option; do474 while getopts r:R:c:v:V:h option; do 475 475 case $option in 476 476 c) mach=$OPTARG;; … … 478 478 R) refrev=$OPTARG;; 479 479 v) SETTE_SUB_VAL=$OPTARG;; 480 V) SETTE_SUB_VAL2=$OPTARG 481 if [ -d ${NEMO_VALIDATION_DIR}/${SETTE_SUB_VAL2} ] ; then 482 export NEMO_VALIDATION_REF=${NEMO_VALIDATION_DIR}/${SETTE_SUB_VAL2} 483 else 484 echo "Requested comparison subdirectory: ${NEMO_VALIDATION_DIR}/${SETTE_SUB_VAL2} does not exist" 485 fi 486 ;; 480 487 h | *) echo '' 481 488 echo 'sette_rpt.sh : ' … … 486 493 echo ' display sette results for the specified revision (set old for the latest revision available for each config)' 487 494 echo ' -R REFERENCE REVISION_number :' 488 echo ' compare sette results against the specified re ference revision (use to over-ride value set in param.cfg)'495 echo ' compare sette results against the specified revision (use to over-ride value set in param.cfg)' 489 496 echo ' -v sub_dir :' 490 497 echo ' validation sub-directory below NEMO_VALIDATION_DIR' 498 echo ' -V sub_dir2 :' 499 echo ' 2nd validation sub-directory below NEMO_VALIDATION_DIR' 500 echo ' if set the comparison is between two subdirectory trees beneath NEMO_VALIDATION_DIR' 491 501 echo '' 492 502 exit 42;; … … 500 510 if [ ! -z $SETTE_SUB_VAL ] ; then 501 511 export NEMO_VALIDATION_DIR=$NEMO_VALIDATION_DIR/$SETTE_SUB_VAL 502 if [ -d $NEMO_VALIDATION_REF/$SETTE_SUB_VAL ] ; then512 if [ -d $NEMO_VALIDATION_REF/$SETTE_SUB_VAL ] && [ -z $SETTE_SUB_VAL2 ] ; then 503 513 while true; do 504 514 read -p "$NEMO_VALIDATION_REF/$SETTE_SUB_VAL exists. Do you wish to use it as a reference? " yn 505 515 case $yn in 506 516 [Yy]* ) export $NEMO_VALIDATION_REF/$SETTE_SUB_VAL; break;; 507 [Nn]* ) exit;; 517 [Nn]* ) echo "Ok, continuing with ${NEMO_VALIDATION_REF}/MAIN as the reference directory" 518 export NEMO_VALIDATION_REF=${NEMO_VALIDATION_REF}/MAIN 519 break 520 ;; 508 521 * ) echo "Please answer yes or no.";; 509 522 esac 510 523 done 511 524 fi 525 else 526 export NEMO_VALIDATION_DIR=${NEMO_VALIDATION_DIR}/MAIN 527 export ${NEMO_VALIDATION_REF}/MAIN 512 528 fi 513 529 NEMO_VALID=${NEMO_VALIDATION_DIR}
Note: See TracChangeset
for help on using the changeset viewer.