- Timestamp:
- 2021-05-20T17:48:27+02:00 (3 years ago)
- Location:
- utils/CI/sette_ticket2673
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
utils/CI/sette_ticket2673/all_functions.sh
r14870 r14893 91 91 usage=" if value is a string ths is neede syntax : ./set_namelist namelist_name var_name \"new_value\" " 92 92 93 # sync MYSRC files (input CFG and CFG_ST )93 # sync MYSRC files (input CFG and CFG_STg; where g is an optional, single, alphanumeric character) 94 94 sync_config() { 95 95 if [ ${SYNC_CONFIGS} == "yes" ]; then … … 144 144 } 145 145 146 # clean _ST config (input CFG CFG_STTYPE (test or ref))146 # clean _STg config (input CFG CFG_STg TYPE (test or ref)) 147 147 clean_config() { 148 148 if [ ${CLEAN_CONFIGS} == "yes" ]; then … … 184 184 fi 185 185 [ `${SVN_CMD} status -q ${SETTE_DIR}/../{cfgs,tests,src} | wc -l` -ge 1 ] && REVISION_NB=${REVISION_NB}+ 186 export NEMO_VALID=${NEMO_VALIDATION_DIR}/${CMP_NAM}/${REVISION_NB}/${NEW_CONF/%_ST/}/${TEST_NAME} 186 # remove last _ST followed by zero or more alphanumeric characters 187 NEW_CONF1=$( echo $NEW_CONF | sed -e 's/_ST\([0-9a-zA-Z]*\)$//' ) 188 export NEMO_VALID=${NEMO_VALIDATION_DIR}/${CMP_NAM}/${REVISION_NB}/${NEW_CONF1}/${TEST_NAME} 187 189 } 188 190 -
utils/CI/sette_ticket2673/sette.sh
r14887 r14893 5 5 MAIN_DIR=$(dirname $SETTE_DIR) 6 6 export CMPL_CORES=8 # Number of threads to use for compiling 7 export SETTE_STG="_ST" # Base suffix to append to configuration name 7 8 dry_run=0 8 9 NO_REPORT=0 … … 33 34 # Parse command-line arguments 34 35 if [ $# -gt 0 ]; then 35 while getopts n:x:v: cdrshTqQteiACFX option; do36 while getopts n:x:v:g:cdrshTqQteiACFX option; do 36 37 case $option in 37 38 c) export SETTE_CLEAN_CONFIGS='yes' … … 56 57 echo "-n: Configuration ${SETTE_TEST_CONFIGS[@]} will be tested if it is available" 57 58 fi 59 echo "";; 60 g) case $OPTARG in 61 [0-9,a-z,A-Z] ) echo "-g: Using ${SETTE_STG}${OPTARG} as the configuration suffix";; 62 * ) echo "-g only accepts a single, alphanumeric character. Processing halted"; exit 42;; 63 esac 64 export SETTE_STG=${SETTE_STG}${OPTARG} 58 65 echo "";; 59 66 x) export SETTE_TEST_TYPES=(${OPTARG}) … … 109 116 echo ' TEST_type choices are: RESTART REPRO CORRUPT PHYSICS - anything else will COMPILE only' 110 117 echo '-v "subdir" optional validation record subdirectory to be created below NEMO_VALIDATION_DIR' 118 echo '-g "group_suffix" single character suffix to be appended to the standard _ST suffix used' 119 echo ' for SETTE-built configurations (needed if sette.sh invocations may overlap)' 111 120 echo '-r to execute without waiting to run sette_rpt.sh at the end (useful for chaining sette.sh invocations)' 112 121 echo '-d to perform a dryrun to simply report what settings will be used' -
utils/CI/sette_ticket2673/sette_reference-configurations.sh
r14878 r14893 135 135 # ----------- 136 136 if [ ${config} == "GYRE_PISCES" ] ; then 137 SETTE_CONFIG="GYRE_PISCES"${SETTE_STG} 137 138 if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 138 139 then … … 145 146 # 146 147 # syncronisation if target directory/file exist (not done by makenemo) 147 sync_config GYRE_PISCES GYRE_PISCES_ST'cfgs'148 clean_config GYRE_PISCES GYRE_PISCES_ST'cfgs'148 sync_config GYRE_PISCES ${SETTE_CONFIG} 'cfgs' 149 clean_config GYRE_PISCES ${SETTE_CONFIG} 'cfgs' 149 150 # 150 151 # GYRE uses linssh so remove key_qco if added by default 151 . ./makenemo -m ${CMP_NAM} -n GYRE_PISCES_ST-r GYRE_PISCES -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}"152 . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r GYRE_PISCES -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 152 153 fi 153 154 if [ ${config} == "GYRE_PISCES" ] && [ ${DO_RESTART} == "1" ] ; then … … 273 274 # ----------------- 274 275 if [ ${config} == "ORCA2_ICE_PISCES" ] ; then 276 SETTE_CONFIG="ORCA2_ICE_PISCES"${SETTE_STG} 275 277 if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 276 278 then … … 283 285 # 284 286 # syncronisation if target directory/file exist (not done by makenemo) 285 sync_config ORCA2_ICE_PISCES ORCA2_ICE_PISCES_ST'cfgs'286 clean_config ORCA2_ICE_PISCES ORCA2_ICE_PISCES_ST'cfgs'287 # 288 . ./makenemo -m ${CMP_NAM} -n ORCA2_ICE_PISCES_ST-r ORCA2_ICE_PISCES -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}"287 sync_config ORCA2_ICE_PISCES ${SETTE_CONFIG} 'cfgs' 288 clean_config ORCA2_ICE_PISCES ${SETTE_CONFIG} 'cfgs' 289 # 290 . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r ORCA2_ICE_PISCES -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 289 291 fi 290 292 if [ ${config} == "ORCA2_ICE_PISCES" ] && [ ${DO_RESTART} == "1" ] ; then … … 495 497 # ---------------- 496 498 if [ ${config} == "ORCA2_OFF_PISCES" ] ; then 499 SETTE_CONFIG="ORCA2_OFF_PISCES"${SETTE_STG} 497 500 if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 498 501 then … … 505 508 # 506 509 # syncronisation if target directory/file exist (not done by makenemo) 507 sync_config ORCA2_OFF_PISCESORCA2_OFF_PISCES_ST 'cfgs'508 clean_config ORCA2_OFF_PISCESORCA2_OFF_PISCES_ST 'cfgs'510 sync_config ${SETTE_CONFIG} ORCA2_OFF_PISCES_ST 'cfgs' 511 clean_config ${SETTE_CONFIG} ORCA2_OFF_PISCES_ST 'cfgs' 509 512 # 510 513 # ORCA2_OFF_PISCES uses linssh so remove key_qco if added by default 511 . ./makenemo -m ${CMP_NAM} -n ORCA2_OFF_PISCES_ST-r ORCA2_OFF_PISCES -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}"514 . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r ORCA2_OFF_PISCES -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 512 515 fi 513 516 if [ ${config} == "ORCA2_OFF_PISCES" ] && [ ${DO_RESTART} == "1" ] ; then … … 671 674 # ----- 672 675 if [ ${config} == "AMM12" ] ; then 676 SETTE_CONFIG="AMM12"${SETTE_STG} 673 677 if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 674 678 then … … 681 685 # 682 686 # syncronisation if target directory/file exist (not done by makenemo) 683 sync_config AMM12 AMM12_ST'cfgs'684 clean_config AMM12 AMM12_ST'cfgs'685 # 686 . ./makenemo -m ${CMP_NAM} -n AMM12_ST-r AMM12 -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}"687 sync_config AMM12 ${SETTE_CONFIG} 'cfgs' 688 clean_config AMM12 ${SETTE_CONFIG} 'cfgs' 689 # 690 . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r AMM12 -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 687 691 fi 688 692 if [ ${config} == "AMM12" ] && [ ${DO_RESTART} == "1" ] ; then … … 796 800 # --------- 797 801 if [ ${config} == "SAS" ] ; then 802 SETTE_CONFIG="ORCA2_SAS_ICE"${SETTE_STG} 798 803 if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 799 804 then … … 806 811 # 807 812 # syncronisation if target directory/file exist (not done by makenemo) 808 sync_config ORCA2_SAS_ICE ORCA2_SAS_ICE_ST'cfgs'809 clean_config ORCA2_SAS_ICE ORCA2_SAS_ICE_ST'cfgs'813 sync_config ORCA2_SAS_ICE ${SETTE_CONFIG} 'cfgs' 814 clean_config ORCA2_SAS_ICE ${SETTE_CONFIG} 'cfgs' 810 815 # 811 816 # ORCA2_SAS_ICE uses linssh so remove key_qco if added by default 812 . ./makenemo -m ${CMP_NAM} -n ORCA2_SAS_ICE_ST-r ORCA2_SAS_ICE -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}"817 . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r ORCA2_SAS_ICE -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 813 818 fi 814 819 if [ ${config} == "SAS" ] && [ ${DO_RESTART} == "1" ] ; then … … 935 940 ## Restartability not tested (ASM code not restartable while increments are being applied) 936 941 if [ ${config} == "ORCA2_ICE_OBS" ] ; then 942 SETTE_CONFIG="ORCA2_ICE_OBS"${SETTE_STG} 937 943 ## Reproducibility tests 938 944 if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] … … 945 951 # 946 952 # syncronisation if target directory/file exist (not done by makenemo) 947 sync_config ORCA2_ICE_PISCES ORCA2_ICE_OBS_ST'cfgs'948 clean_config ORCA2_ICE_PISCES ORCA2_ICE_OBS_ST'cfgs'949 # 950 . ./makenemo -m ${CMP_NAM} -n ORCA2_ICE_OBS_ST-r ORCA2_ICE_PISCES -d "OCE ICE" -j ${CMPL_CORES} add_key "key_asminc ${ADD_KEYS}" del_key "key_top ${DEL_KEYS}"953 sync_config ORCA2_ICE_PISCES ${SETTE_CONFIG} 'cfgs' 954 clean_config ORCA2_ICE_PISCES ${SETTE_CONFIG} 'cfgs' 955 # 956 . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r ORCA2_ICE_PISCES -d "OCE ICE" -j ${CMPL_CORES} add_key "key_asminc ${ADD_KEYS}" del_key "key_top ${DEL_KEYS}" 951 957 fi 952 958 if [ ${config} == "ORCA2_ICE_OBS" ] && [ ${DO_RESTART} == "1" ] ; then … … 1049 1055 # ----------- 1050 1056 if [ ${config} == "AGRIF" ] ; then 1057 SETTE_CONFIG="AGRIF_DEMO"${SETTE_STG} 1051 1058 if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 1052 1059 then … … 1062 1069 # 1063 1070 # syncronisation if target directory/file exist (not done by makenemo) 1064 sync_config AGRIF_DEMO AGRIF_DEMO_ST'cfgs'1065 clean_config AGRIF_DEMO AGRIF_DEMO_ST'cfgs'1071 sync_config AGRIF_DEMO ${SETTE_CONFIG} 'cfgs' 1072 clean_config AGRIF_DEMO ${SETTE_CONFIG} 'cfgs' 1066 1073 # 1067 1074 # AGRIF_DEMO does not yet support nn_hls=2 => key_loop_fusion can not be used 1068 . ./makenemo -m ${CMP_NAM} -n AGRIF_DEMO_ST-r AGRIF_DEMO -j ${CMPL_CORES} add_key "${ADD_KEYS/key_loop_fusion}" del_key "${DEL_KEYS}"1075 . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r AGRIF_DEMO -j ${CMPL_CORES} add_key "${ADD_KEYS/key_loop_fusion}" del_key "${DEL_KEYS}" 1069 1076 fi 1070 1077 if [ ${config} == "AGRIF" ] && [ ${DO_RESTART} == "1" ] ; then … … 1294 1301 ## test code corruption with AGRIF (phase 2) ==> Compile without key_agrif (to be compared with AGRIF_DEMO_ST/ORCA2) 1295 1302 if [ ${config} == "AGRIF" ] && [ ${DO_CORRUPT} == "1" ] ; then 1303 SETTE_CONFIG="AGRIF_DEMO_NOAGRIF"${SETTE_STG} 1296 1304 export TEST_NAME="ORCA2" 1297 1305 cd ${MAIN_DIR} 1298 1306 # 1299 1307 # syncronisation if target directory/file exist (not done by makenemo) 1300 sync_config AGRIF_DEMO AGRIF_DEMO_NOAGRIF_ST'cfgs'1301 clean_config AGRIF_DEMO AGRIF_DEMO_NOAGRIF_ST'cfgs'1308 sync_config AGRIF_DEMO ${SETTE_CONFIG} 'cfgs' 1309 clean_config AGRIF_DEMO ${SETTE_CONFIG} 'cfgs' 1302 1310 # 1303 1311 # AGRIF_DEMO does not yet support nn_hls=2 => key_loop_fusion can not be used 1304 . ./makenemo -m ${CMP_NAM} -n AGRIF_DEMO_NOAGRIF_ST-r AGRIF_DEMO -j ${CMPL_CORES} add_key "${ADD_KEYS/key_loop_fusion}" del_key "key_agrif ${DEL_KEYS}"1312 . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r AGRIF_DEMO -j ${CMPL_CORES} add_key "${ADD_KEYS/key_loop_fusion}" del_key "key_agrif ${DEL_KEYS}" 1305 1313 cd ${SETTE_DIR} 1306 1314 . ./prepare_exe_dir.sh … … 1329 1337 # ------- 1330 1338 if [ ${config} == "WED025" ] ; then 1339 SETTE_CONFIG="WED025"${SETTE_STG} 1331 1340 if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 1332 1341 then … … 1339 1348 # 1340 1349 # syncronisation if target directory/file exist (not done by makenemo) 1341 sync_config WED025 WED025_ST'cfgs'1342 clean_config WED025 WED025_ST'cfgs'1350 sync_config WED025 ${SETTE_CONFIG} 'cfgs' 1351 clean_config WED025 ${SETTE_CONFIG} 'cfgs' 1343 1352 # 1344 1353 # WED025 uses ln_hpg_isf so remove key_qco if added by default 1345 . ./makenemo -m ${CMP_NAM} -n WED025_ST-r WED025 -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}"1354 . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -r WED025 -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 1346 1355 fi 1347 1356 if [ ${config} == "WED025" ] && [ ${DO_RESTART} == "1" ] ; then -
utils/CI/sette_ticket2673/sette_test-cases.sh
r14879 r14893 135 135 # --------- 136 136 if [ ${config} == "OVERFLOW" ] ; then 137 SETTE_CONFIG="OVERFLOW"${SETTE_STG} 137 138 if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 138 139 then … … 145 146 # 146 147 # 147 clean_config OVERFLOW OVERFLOW_ST'tests'148 # 149 sync_config OVERFLOW OVERFLOW_ST'tests'150 # 151 . ./makenemo -m ${CMP_NAM} -n OVERFLOW_ST-a OVERFLOW -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}"148 clean_config OVERFLOW ${SETTE_CONFIG} 'tests' 149 # 150 sync_config OVERFLOW ${SETTE_CONFIG} 'tests' 151 # 152 . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -a OVERFLOW -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 152 153 fi 153 154 if [ ${config} == "OVERFLOW" ] && [ ${DO_RESTART} == "1" ] ; then … … 244 245 # -------------- 245 246 if [ ${config} == "LOCK_EXCHANGE" ] ; then 247 SETTE_CONFIG="LOCK_EXCHANGE"${SETTE_STG} 246 248 if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 247 249 then … … 255 257 # syncronisation if target directory/file exist (not done by makenemo) 256 258 # 257 clean_config LOCK_EXCHANGE LOCK_EXCHANGE_ST'tests'258 # 259 sync_config LOCK_EXCHANGE LOCK_EXCHANGE_ST'tests'260 # 261 . ./makenemo -m ${CMP_NAM} -n LOCK_EXCHANGE_ST-a LOCK_EXCHANGE -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}"259 clean_config LOCK_EXCHANGE ${SETTE_CONFIG} 'tests' 260 # 261 sync_config LOCK_EXCHANGE ${SETTE_CONFIG} 'tests' 262 # 263 . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -a LOCK_EXCHANGE -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 262 264 fi 263 265 if [ ${config} == "LOCK_EXCHANGE" ] && [ ${DO_RESTART} == "1" ] ; then … … 355 357 # --------- 356 358 if [ ${config} == "VORTEX" ] ; then 359 SETTE_CONFIG="VORTEX"${SETTE_STG} 357 360 if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 358 361 then … … 367 370 # syncronisation if target directory/file exist (not done by makenemo) 368 371 # 369 clean_config VORTEX VORTEX_ST'tests'370 # 371 sync_config VORTEX VORTEX_ST'tests'372 # 373 . ./makenemo -m ${CMP_NAM} -n VORTEX_ST-a VORTEX -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}"372 clean_config VORTEX ${SETTE_CONFIG} 'tests' 373 # 374 sync_config VORTEX ${SETTE_CONFIG} 'tests' 375 # 376 . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -a VORTEX -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 374 377 fi 375 378 if [ ${config} == "VORTEX" ] && [ ${DO_RESTART} == "1" ] ; then … … 532 535 # --------- 533 536 if [ ${config} == "ICE_AGRIF" ] ; then 537 SETTE_CONFIG="ICE_AGRIF"${SETTE_STG} 534 538 if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 535 539 then … … 544 548 # syncronisation if target directory/file exist (not done by makenemo) 545 549 # 546 clean_config ICE_AGRIF ICE_AGRIF_ST'tests'547 # 548 sync_config ICE_AGRIF ICE_AGRIF_ST'tests'550 clean_config ICE_AGRIF ${SETTE_CONFIG} 'tests' 551 # 552 sync_config ICE_AGRIF ${SETTE_CONFIG} 'tests' 549 553 # 550 554 # ICE_AGRIF uses linssh so remove key_qco if added by default 551 . ./makenemo -m ${CMP_NAM} -n ICE_AGRIF_ST-a ICE_AGRIF -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}"555 . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -a ICE_AGRIF -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 552 556 fi 553 557 if [ ${config} == "ICE_AGRIF" ] && [ ${DO_RESTART} == "1" ] ; then … … 714 718 # ------ 715 719 if [ ${config} == "ISOMIP+" ] ; then 720 SETTE_CONFIG="ISOMIP+"${SETTE_STG} 716 721 if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 717 722 then … … 725 730 # syncronisation if target directory/file exist (not done by makenemo) 726 731 # 727 clean_config ISOMIP+ ISOMIP+_ST'tests'728 # 729 sync_config ISOMIP+ ISOMIP+_ST'tests'732 clean_config ISOMIP+ ${SETTE_CONFIG} 'tests' 733 # 734 sync_config ISOMIP+ ${SETTE_CONFIG} 'tests' 730 735 # 731 736 # ISOMIP+ uses ln_hpg_isf so remove key_qco if added by default 732 . ./makenemo -m ${CMP_NAM} -n ISOMIP+_ST-a ISOMIP+ -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}"737 . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -a ISOMIP+ -j ${CMPL_CORES} add_key "${ADD_KEYS/key_qco/}" del_key "${DEL_KEYS}" 733 738 fi 734 739 if [ ${config} == "ISOMIP+" ] && [ ${DO_RESTART} == "1" ] ; then … … 850 855 # --------- 851 856 if [ ${config} == "SWG" ] && [ ${USING_QCO} == "yes" ] ; then 857 SETTE_CONFIG="SWG"${SETTE_STG} 852 858 if [ $( echo ${CMP_NAM} | grep -ic debug ) -eq 1 ] 853 859 then … … 861 867 # syncronisation if target directory/file exist (not done by makenemo) 862 868 # 863 clean_config SWG SWG_ST'tests'864 # 865 sync_config SWG SWG_ST'tests'866 # 867 . ./makenemo -m ${CMP_NAM} -n SWG_ST-a SWG -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}"869 clean_config SWG ${SETTE_CONFIG} 'tests' 870 # 871 sync_config SWG ${SETTE_CONFIG} 'tests' 872 # 873 . ./makenemo -m ${CMP_NAM} -n ${SETTE_CONFIG} -a SWG -j ${CMPL_CORES} add_key "${ADD_KEYS}" del_key "${DEL_KEYS}" 868 874 fi 869 875 if [ ${config} == "SWG" ] && [ ${DO_RESTART} == "1" ] && [ ${USING_QCO} == "yes" ] ; then
Note: See TracChangeset
for help on using the changeset viewer.