From 67bbcdb57d47b0c97d3f3f4f3c00f2658c88a81c Mon Sep 17 00:00:00 2001 From: "George.Gayno" Date: Wed, 13 Oct 2021 14:57:20 +0000 Subject: [PATCH 01/18] An initial idea of updating the cycle reg test scripts to save a new set of baseline data. Fixes #574 --- reg_tests/global_cycle/C768.lndincsoil.sh | 6 ++++++ reg_tests/global_cycle/check.sh | 11 +++++++++++ reg_tests/global_cycle/driver.wcoss_dell_p3.sh | 4 ++++ 3 files changed, 21 insertions(+) create mode 100755 reg_tests/global_cycle/check.sh diff --git a/reg_tests/global_cycle/C768.lndincsoil.sh b/reg_tests/global_cycle/C768.lndincsoil.sh index 5d50c4221..21b98ba8f 100755 --- a/reg_tests/global_cycle/C768.lndincsoil.sh +++ b/reg_tests/global_cycle/C768.lndincsoil.sh @@ -9,6 +9,12 @@ set -x +echo got here +echo $commit_num + +exit + + NCCMP=${NCCMP:-$(which nccmp)} export MAX_TASKS_CY=6 diff --git a/reg_tests/global_cycle/check.sh b/reg_tests/global_cycle/check.sh new file mode 100755 index 000000000..938494889 --- /dev/null +++ b/reg_tests/global_cycle/check.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +#set -x + +commit_string=$(git log -1 --oneline) + +commit_num=$(echo $commit_string | cut -c1-8) + +echo $commit_num + +export commit_num diff --git a/reg_tests/global_cycle/driver.wcoss_dell_p3.sh b/reg_tests/global_cycle/driver.wcoss_dell_p3.sh index 13896deb0..67a97521e 100755 --- a/reg_tests/global_cycle/driver.wcoss_dell_p3.sh +++ b/reg_tests/global_cycle/driver.wcoss_dell_p3.sh @@ -34,6 +34,10 @@ QUEUE="${QUEUE:-dev}" # Should not have to change anything below. #----------------------------------------------------------------------------- +source check.sh + +exit + DATA_DIR="${WORK_DIR}/reg-tests/global-cycle" export HOMEreg=/gpfs/dell2/emc/modeling/noscrub/George.Gayno/ufs_utils.git/reg_tests/global_cycle From c07db3a67feffa9f73c23384c565890665b8f102 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 14 Oct 2021 18:55:19 +0000 Subject: [PATCH 02/18] New script - update.sh - that will update the baseline data directory. Update test scripts to call the update script. Fixes #574 --- reg_tests/global_cycle/C768.fv3gfs.sh | 3 ++ reg_tests/global_cycle/C768.lndincsnow.sh | 3 ++ reg_tests/global_cycle/C768.lndincsoil.sh | 9 ++--- reg_tests/global_cycle/check.sh | 4 +- .../global_cycle/driver.wcoss_dell_p3.sh | 7 ++-- reg_tests/global_cycle/update.sh | 37 +++++++++++++++++++ 6 files changed, 52 insertions(+), 11 deletions(-) create mode 100755 reg_tests/global_cycle/update.sh diff --git a/reg_tests/global_cycle/C768.fv3gfs.sh b/reg_tests/global_cycle/C768.fv3gfs.sh index 5bb326c42..f737e3ba7 100755 --- a/reg_tests/global_cycle/C768.fv3gfs.sh +++ b/reg_tests/global_cycle/C768.fv3gfs.sh @@ -70,6 +70,9 @@ if [ $test_failed -ne 0 ]; then echo "*********************************" echo "<<< C768 GLOBAL CYCLE TEST FAILED. >>>" echo "*********************************" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $BASE_GSM/reg_tests/global_cycle/update.sh $HOMEreg "c768.fv3gfs" $commit_num + fi else echo echo "*********************************" diff --git a/reg_tests/global_cycle/C768.lndincsnow.sh b/reg_tests/global_cycle/C768.lndincsnow.sh index 62a91fa7a..4a9313a82 100755 --- a/reg_tests/global_cycle/C768.lndincsnow.sh +++ b/reg_tests/global_cycle/C768.lndincsnow.sh @@ -75,6 +75,9 @@ if [ $test_failed -ne 0 ]; then echo "****************************************" echo "<<< C768 LANDINC SNOW CYCLE TEST FAILED. >>>" echo "****************************************" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $BASE_GSM/reg_tests/global_cycle/update.sh $HOMEreg "c768.lndincsnow" $commit_num + fi else echo echo "***************************************" diff --git a/reg_tests/global_cycle/C768.lndincsoil.sh b/reg_tests/global_cycle/C768.lndincsoil.sh index 21b98ba8f..bb9dc2912 100755 --- a/reg_tests/global_cycle/C768.lndincsoil.sh +++ b/reg_tests/global_cycle/C768.lndincsoil.sh @@ -9,12 +9,6 @@ set -x -echo got here -echo $commit_num - -exit - - NCCMP=${NCCMP:-$(which nccmp)} export MAX_TASKS_CY=6 @@ -83,6 +77,9 @@ if [ $test_failed -ne 0 ]; then echo "*****************************************" echo "<<< C768 LANDINC SOILT CYCLE TEST FAILED. >>>" echo "*****************************************" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $BASE_GSM/reg_tests/global_cycle/update.sh $HOMEreg "c768.lndincsoil" $commit_num + fi else echo echo "*****************************************" diff --git a/reg_tests/global_cycle/check.sh b/reg_tests/global_cycle/check.sh index 938494889..443c62098 100755 --- a/reg_tests/global_cycle/check.sh +++ b/reg_tests/global_cycle/check.sh @@ -4,8 +4,8 @@ commit_string=$(git log -1 --oneline) -commit_num=$(echo $commit_string | cut -c1-8) +commit_num=$(echo $commit_string | cut -c1-7) -echo $commit_num +echo ${commit_num} export commit_num diff --git a/reg_tests/global_cycle/driver.wcoss_dell_p3.sh b/reg_tests/global_cycle/driver.wcoss_dell_p3.sh index 67a97521e..4ca8f6985 100755 --- a/reg_tests/global_cycle/driver.wcoss_dell_p3.sh +++ b/reg_tests/global_cycle/driver.wcoss_dell_p3.sh @@ -34,13 +34,14 @@ QUEUE="${QUEUE:-dev}" # Should not have to change anything below. #----------------------------------------------------------------------------- -source check.sh +#export UPDATE_BASELINE="FALSE" +export UPDATE_BASELINE="TRUE" -exit +source check.sh DATA_DIR="${WORK_DIR}/reg-tests/global-cycle" -export HOMEreg=/gpfs/dell2/emc/modeling/noscrub/George.Gayno/ufs_utils.git/reg_tests/global_cycle +export HOMEreg=/gpfs/dell2/emc/modeling/noscrub/George.Gayno/ufs_utils.git/reg_tests/global_cycle.test export OMP_NUM_THREADS_CY=2 diff --git a/reg_tests/global_cycle/update.sh b/reg_tests/global_cycle/update.sh new file mode 100755 index 000000000..d060703b4 --- /dev/null +++ b/reg_tests/global_cycle/update.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +set -x + +HOMEreg=$1 +test_name=$2 +commit_num=$3 + +base_dir=$HOMEreg/baseline_data +base_dir_commit=${base_dir}/$test_name.$commit_num + +chmod 755 $base_dir + +if [ -d $base_dir_commit ];then + chmod 777 $base_dir_commit + rm -fr $base_dir_commit +fi + +mkdir -p $base_dir_commit + +for files in *tile*.nc +do + if [ -f $files ]; then + cp $files $base_dir_commit + chmod 444 $base_dir_commit/$files + fi +done + +chmod 555 $base_dir_commit +rm -f $base_dir/$test_name +cd $base_dir +ln -fs $test_name.$commit_num $test_name + +# move this to driver? +###chmod 555 $base_dir + +exit From 4ef2152483e31aff29ce903701f63b0e66618aa1 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 14 Oct 2021 20:10:04 +0000 Subject: [PATCH 03/18] Generalize the scripts and start testing them from chgres_cube. Fixes #574. --- reg_tests/{global_cycle => }/check.sh | 0 reg_tests/chgres_cube/25km.conus.gfs.grib2.sh | 3 +++ reg_tests/chgres_cube/25km.conus.gfs.pbgrib2.sh | 3 +++ reg_tests/chgres_cube/driver.wcoss_dell_p3.sh | 10 +++++++++- reg_tests/global_cycle/C768.fv3gfs.sh | 2 +- reg_tests/global_cycle/C768.lndincsnow.sh | 2 +- reg_tests/global_cycle/C768.lndincsoil.sh | 2 +- reg_tests/global_cycle/driver.wcoss_dell_p3.sh | 2 +- reg_tests/{global_cycle => }/update.sh | 2 +- 9 files changed, 20 insertions(+), 6 deletions(-) rename reg_tests/{global_cycle => }/check.sh (100%) rename reg_tests/{global_cycle => }/update.sh (96%) diff --git a/reg_tests/global_cycle/check.sh b/reg_tests/check.sh similarity index 100% rename from reg_tests/global_cycle/check.sh rename to reg_tests/check.sh diff --git a/reg_tests/chgres_cube/25km.conus.gfs.grib2.sh b/reg_tests/chgres_cube/25km.conus.gfs.grib2.sh index 61bbe7e50..ee0fbf97b 100755 --- a/reg_tests/chgres_cube/25km.conus.gfs.grib2.sh +++ b/reg_tests/chgres_cube/25km.conus.gfs.grib2.sh @@ -80,6 +80,9 @@ done set +x if [ $test_failed -ne 0 ]; then echo "<<< 25-KM CONUS GFS GRIB2 TEST FAILED. >>>" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $HOMEufs/reg_tests/update.sh $HOMEreg "25km_conus_gfs_grib2" $commit_num + fi else echo "<<< 25-KM CONUS GFS GRIB2 TEST PASSED. >>>" fi diff --git a/reg_tests/chgres_cube/25km.conus.gfs.pbgrib2.sh b/reg_tests/chgres_cube/25km.conus.gfs.pbgrib2.sh index bb23c3004..5be4f3df8 100755 --- a/reg_tests/chgres_cube/25km.conus.gfs.pbgrib2.sh +++ b/reg_tests/chgres_cube/25km.conus.gfs.pbgrib2.sh @@ -79,6 +79,9 @@ done set +x if [ $test_failed -ne 0 ]; then echo "<<< 25-KM CONUS GFS PGRIB2+BGRIB2 TEST FAILED. >>>" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $HOMEufs/reg_tests/update.sh $HOMEreg "25km_conus_gfs_pbgrib2" $commit_num + fi else echo "<<< 25-KM CONUS GFS PGRIB2+BGRIB2 TEST PASSED. >>>" fi diff --git a/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh b/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh index 20cc13003..48b4d0135 100755 --- a/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh +++ b/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh @@ -40,9 +40,14 @@ PROJECT_CODE="${PROJECT_CODE:-GFS-DEV}" # and baseline data for each test. #----------------------------------------------------------------------------- +#export UPDATE_BASELINE="FALSE" +export UPDATE_BASELINE="TRUE" + +source ../check.sh + export HOMEufs=$PWD/../.. -export HOMEreg=/gpfs/dell2/emc/modeling/noscrub/George.Gayno/ufs_utils.git/reg_tests/chgres_cube +export HOMEreg=/gpfs/dell2/emc/modeling/noscrub/George.Gayno/ufs_utils.git/reg_tests/chgres_cube.test SUM_FILE=summary.log @@ -63,6 +68,9 @@ export OMP_NUM_THREADS=1 bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J chgres01 -W 0:05 -x -n 6 \ -R "span[ptile=6]" -R "affinity[core(${OMP_NUM_THREADS}):distribute=balance]" "$PWD/25km.conus.gfs.grib2.sh" + +exit + #----------------------------------------------------------------------------- # Initialize CONUS 3-KM USING HRRR GRIB2 file WITH GFS PHYSICS. #----------------------------------------------------------------------------- diff --git a/reg_tests/global_cycle/C768.fv3gfs.sh b/reg_tests/global_cycle/C768.fv3gfs.sh index f737e3ba7..cb724cace 100755 --- a/reg_tests/global_cycle/C768.fv3gfs.sh +++ b/reg_tests/global_cycle/C768.fv3gfs.sh @@ -71,7 +71,7 @@ if [ $test_failed -ne 0 ]; then echo "<<< C768 GLOBAL CYCLE TEST FAILED. >>>" echo "*********************************" if [ "$UPDATE_BASELINE" = "TRUE" ]; then - $BASE_GSM/reg_tests/global_cycle/update.sh $HOMEreg "c768.fv3gfs" $commit_num + $BASE_GSM/reg_tests/update.sh $HOMEreg "c768.fv3gfs" $commit_num fi else echo diff --git a/reg_tests/global_cycle/C768.lndincsnow.sh b/reg_tests/global_cycle/C768.lndincsnow.sh index 4a9313a82..fb6d88deb 100755 --- a/reg_tests/global_cycle/C768.lndincsnow.sh +++ b/reg_tests/global_cycle/C768.lndincsnow.sh @@ -76,7 +76,7 @@ if [ $test_failed -ne 0 ]; then echo "<<< C768 LANDINC SNOW CYCLE TEST FAILED. >>>" echo "****************************************" if [ "$UPDATE_BASELINE" = "TRUE" ]; then - $BASE_GSM/reg_tests/global_cycle/update.sh $HOMEreg "c768.lndincsnow" $commit_num + $BASE_GSM/reg_tests/update.sh $HOMEreg "c768.lndincsnow" $commit_num fi else echo diff --git a/reg_tests/global_cycle/C768.lndincsoil.sh b/reg_tests/global_cycle/C768.lndincsoil.sh index bb9dc2912..c06f346b8 100755 --- a/reg_tests/global_cycle/C768.lndincsoil.sh +++ b/reg_tests/global_cycle/C768.lndincsoil.sh @@ -78,7 +78,7 @@ if [ $test_failed -ne 0 ]; then echo "<<< C768 LANDINC SOILT CYCLE TEST FAILED. >>>" echo "*****************************************" if [ "$UPDATE_BASELINE" = "TRUE" ]; then - $BASE_GSM/reg_tests/global_cycle/update.sh $HOMEreg "c768.lndincsoil" $commit_num + $BASE_GSM/reg_tests/update.sh $HOMEreg "c768.lndincsoil" $commit_num fi else echo diff --git a/reg_tests/global_cycle/driver.wcoss_dell_p3.sh b/reg_tests/global_cycle/driver.wcoss_dell_p3.sh index 4ca8f6985..be3a97c2c 100755 --- a/reg_tests/global_cycle/driver.wcoss_dell_p3.sh +++ b/reg_tests/global_cycle/driver.wcoss_dell_p3.sh @@ -37,7 +37,7 @@ QUEUE="${QUEUE:-dev}" #export UPDATE_BASELINE="FALSE" export UPDATE_BASELINE="TRUE" -source check.sh +source ../check.sh DATA_DIR="${WORK_DIR}/reg-tests/global-cycle" diff --git a/reg_tests/global_cycle/update.sh b/reg_tests/update.sh similarity index 96% rename from reg_tests/global_cycle/update.sh rename to reg_tests/update.sh index d060703b4..73cee4714 100755 --- a/reg_tests/global_cycle/update.sh +++ b/reg_tests/update.sh @@ -18,7 +18,7 @@ fi mkdir -p $base_dir_commit -for files in *tile*.nc +for files in *.nc do if [ -f $files ]; then cp $files $base_dir_commit From 12106cf07c1dd87d56d85c89614cfb758dc6e19f Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 14 Oct 2021 20:20:07 +0000 Subject: [PATCH 04/18] Rename some scripts Fixes #574 --- reg_tests/chgres_cube/25km.conus.gfs.grib2.sh | 2 +- reg_tests/chgres_cube/25km.conus.gfs.pbgrib2.sh | 2 +- reg_tests/chgres_cube/driver.wcoss_dell_p3.sh | 2 +- reg_tests/{check.sh => get_hash.sh} | 0 reg_tests/global_cycle/C768.fv3gfs.sh | 2 +- reg_tests/global_cycle/C768.lndincsnow.sh | 2 +- reg_tests/global_cycle/C768.lndincsoil.sh | 2 +- reg_tests/global_cycle/driver.wcoss_dell_p3.sh | 2 +- reg_tests/{update.sh => update_baseline.sh} | 0 9 files changed, 7 insertions(+), 7 deletions(-) rename reg_tests/{check.sh => get_hash.sh} (100%) rename reg_tests/{update.sh => update_baseline.sh} (100%) diff --git a/reg_tests/chgres_cube/25km.conus.gfs.grib2.sh b/reg_tests/chgres_cube/25km.conus.gfs.grib2.sh index ee0fbf97b..10ead8ce6 100755 --- a/reg_tests/chgres_cube/25km.conus.gfs.grib2.sh +++ b/reg_tests/chgres_cube/25km.conus.gfs.grib2.sh @@ -81,7 +81,7 @@ set +x if [ $test_failed -ne 0 ]; then echo "<<< 25-KM CONUS GFS GRIB2 TEST FAILED. >>>" if [ "$UPDATE_BASELINE" = "TRUE" ]; then - $HOMEufs/reg_tests/update.sh $HOMEreg "25km_conus_gfs_grib2" $commit_num + $HOMEufs/reg_tests/update_baseline.sh $HOMEreg "25km_conus_gfs_grib2" $commit_num fi else echo "<<< 25-KM CONUS GFS GRIB2 TEST PASSED. >>>" diff --git a/reg_tests/chgres_cube/25km.conus.gfs.pbgrib2.sh b/reg_tests/chgres_cube/25km.conus.gfs.pbgrib2.sh index 5be4f3df8..d56ebeef1 100755 --- a/reg_tests/chgres_cube/25km.conus.gfs.pbgrib2.sh +++ b/reg_tests/chgres_cube/25km.conus.gfs.pbgrib2.sh @@ -80,7 +80,7 @@ set +x if [ $test_failed -ne 0 ]; then echo "<<< 25-KM CONUS GFS PGRIB2+BGRIB2 TEST FAILED. >>>" if [ "$UPDATE_BASELINE" = "TRUE" ]; then - $HOMEufs/reg_tests/update.sh $HOMEreg "25km_conus_gfs_pbgrib2" $commit_num + $HOMEufs/reg_tests/update_baseline.sh $HOMEreg "25km_conus_gfs_pbgrib2" $commit_num fi else echo "<<< 25-KM CONUS GFS PGRIB2+BGRIB2 TEST PASSED. >>>" diff --git a/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh b/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh index 48b4d0135..d29d3acb9 100755 --- a/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh +++ b/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh @@ -43,7 +43,7 @@ PROJECT_CODE="${PROJECT_CODE:-GFS-DEV}" #export UPDATE_BASELINE="FALSE" export UPDATE_BASELINE="TRUE" -source ../check.sh +source ../get_hash.sh export HOMEufs=$PWD/../.. diff --git a/reg_tests/check.sh b/reg_tests/get_hash.sh similarity index 100% rename from reg_tests/check.sh rename to reg_tests/get_hash.sh diff --git a/reg_tests/global_cycle/C768.fv3gfs.sh b/reg_tests/global_cycle/C768.fv3gfs.sh index cb724cace..c86792ff6 100755 --- a/reg_tests/global_cycle/C768.fv3gfs.sh +++ b/reg_tests/global_cycle/C768.fv3gfs.sh @@ -71,7 +71,7 @@ if [ $test_failed -ne 0 ]; then echo "<<< C768 GLOBAL CYCLE TEST FAILED. >>>" echo "*********************************" if [ "$UPDATE_BASELINE" = "TRUE" ]; then - $BASE_GSM/reg_tests/update.sh $HOMEreg "c768.fv3gfs" $commit_num + $BASE_GSM/reg_tests/update_baseline.sh $HOMEreg "c768.fv3gfs" $commit_num fi else echo diff --git a/reg_tests/global_cycle/C768.lndincsnow.sh b/reg_tests/global_cycle/C768.lndincsnow.sh index fb6d88deb..c98d443ba 100755 --- a/reg_tests/global_cycle/C768.lndincsnow.sh +++ b/reg_tests/global_cycle/C768.lndincsnow.sh @@ -76,7 +76,7 @@ if [ $test_failed -ne 0 ]; then echo "<<< C768 LANDINC SNOW CYCLE TEST FAILED. >>>" echo "****************************************" if [ "$UPDATE_BASELINE" = "TRUE" ]; then - $BASE_GSM/reg_tests/update.sh $HOMEreg "c768.lndincsnow" $commit_num + $BASE_GSM/reg_tests/update_baseline.sh $HOMEreg "c768.lndincsnow" $commit_num fi else echo diff --git a/reg_tests/global_cycle/C768.lndincsoil.sh b/reg_tests/global_cycle/C768.lndincsoil.sh index c06f346b8..5e3a1da57 100755 --- a/reg_tests/global_cycle/C768.lndincsoil.sh +++ b/reg_tests/global_cycle/C768.lndincsoil.sh @@ -78,7 +78,7 @@ if [ $test_failed -ne 0 ]; then echo "<<< C768 LANDINC SOILT CYCLE TEST FAILED. >>>" echo "*****************************************" if [ "$UPDATE_BASELINE" = "TRUE" ]; then - $BASE_GSM/reg_tests/update.sh $HOMEreg "c768.lndincsoil" $commit_num + $BASE_GSM/reg_tests/update_baseline.sh $HOMEreg "c768.lndincsoil" $commit_num fi else echo diff --git a/reg_tests/global_cycle/driver.wcoss_dell_p3.sh b/reg_tests/global_cycle/driver.wcoss_dell_p3.sh index be3a97c2c..330eb307c 100755 --- a/reg_tests/global_cycle/driver.wcoss_dell_p3.sh +++ b/reg_tests/global_cycle/driver.wcoss_dell_p3.sh @@ -37,7 +37,7 @@ QUEUE="${QUEUE:-dev}" #export UPDATE_BASELINE="FALSE" export UPDATE_BASELINE="TRUE" -source ../check.sh +source ../get_hash.sh DATA_DIR="${WORK_DIR}/reg-tests/global-cycle" diff --git a/reg_tests/update.sh b/reg_tests/update_baseline.sh similarity index 100% rename from reg_tests/update.sh rename to reg_tests/update_baseline.sh From 5d0ee75a847bd7b3928e2cb8814542caef7e3ae9 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Fri, 15 Oct 2021 17:48:30 +0000 Subject: [PATCH 05/18] Incorporate baseline scripts into grid_gen reg tests. Update the update_baseline.sh script to process the fix_sfc baseline subdirectory used by the grid_gen. Fixes #574. --- reg_tests/grid_gen/c96.uniform.sh | 3 +++ reg_tests/grid_gen/driver.wcoss_dell_p3.sh | 10 +++++++++- reg_tests/update_baseline.sh | 19 +++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/reg_tests/grid_gen/c96.uniform.sh b/reg_tests/grid_gen/c96.uniform.sh index 72e4f90f9..6811c71af 100755 --- a/reg_tests/grid_gen/c96.uniform.sh +++ b/reg_tests/grid_gen/c96.uniform.sh @@ -55,6 +55,9 @@ done set +x if [ $test_failed -ne 0 ]; then echo "<<< C96 UNIFORM TEST FAILED. >>>" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $home_dir/reg_tests/update_baseline.sh "${HOMEreg}/.." "c96.uniform" $commit_num + fi else echo "<<< C96 UNIFORM TEST PASSED. >>>" fi diff --git a/reg_tests/grid_gen/driver.wcoss_dell_p3.sh b/reg_tests/grid_gen/driver.wcoss_dell_p3.sh index 3def7e696..0f1152768 100755 --- a/reg_tests/grid_gen/driver.wcoss_dell_p3.sh +++ b/reg_tests/grid_gen/driver.wcoss_dell_p3.sh @@ -35,6 +35,11 @@ export WORK_DIR="${WORK_DIR}/reg-tests/grid-gen" # Should not have to change anything below here. #----------------------------------------------------------------------------- +#export UPDATE_BASELINE="FALSE" +export UPDATE_BASELINE="TRUE" + +source ../get_hash.sh + LOG_FILE=consistency.log SUM_FILE=summary.log export home_dir=$PWD/../.. @@ -42,7 +47,7 @@ export APRUN=time export APRUN_SFC="mpirun -l" export OMP_STACKSIZE=2048m export machine=WCOSS_DELL_P3 -export HOMEreg=/gpfs/dell2/emc/modeling/noscrub/George.Gayno/ufs_utils.git/reg_tests/grid_gen/baseline_data +export HOMEreg=/gpfs/dell2/emc/modeling/noscrub/George.Gayno/ufs_utils.git/reg_tests/grid_gen.test/baseline_data export OMP_NUM_THREADS=24 rm -fr $WORK_DIR @@ -57,6 +62,9 @@ ulimit -s unlimited bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J c96.uniform -W 0:15 -x -n 24 \ -R "span[ptile=24]" -R "affinity[core(1):distribute=balance]" "$PWD/c96.uniform.sh" + +exit + #----------------------------------------------------------------------------- # C96 uniform grid using viirs vegetation type data. #----------------------------------------------------------------------------- diff --git a/reg_tests/update_baseline.sh b/reg_tests/update_baseline.sh index 73cee4714..0c4777c14 100755 --- a/reg_tests/update_baseline.sh +++ b/reg_tests/update_baseline.sh @@ -13,6 +13,9 @@ chmod 755 $base_dir if [ -d $base_dir_commit ];then chmod 777 $base_dir_commit + if [ -d $base_dir_commit/fix_sfc ]; then + chmod 777 $base_dir_commit/fix_sfc + fi rm -fr $base_dir_commit fi @@ -26,6 +29,22 @@ do fi done +# The grid_gen tests have a subdirectory for +# the surface climo fields. + +if [ -d ./fix_sfc ]; then + mkdir -p $base_dir_commit/fix_sfc + cd fix_sfc + for files in *.nc + do + if [ -f $files ]; then + cp $files $base_dir_commit/fix_sfc + chmod 444 $base_dir_commit/fix_sfc/$files + fi + done + chmod 555 $base_dir_commit/fix_sfc +fi + chmod 555 $base_dir_commit rm -f $base_dir/$test_name cd $base_dir From a0efdd2dc30125445dc6062752c82963f2dba8a1 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Mon, 18 Oct 2021 17:47:33 +0000 Subject: [PATCH 06/18] Updates to run the chgres and global_cycle tests on Hera. Fixes #574 --- reg_tests/chgres_cube/c96.fv3.restart.sh | 3 +++ reg_tests/chgres_cube/driver.hera.sh | 10 +++++++++- reg_tests/global_cycle/driver.hera.sh | 7 ++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/reg_tests/chgres_cube/c96.fv3.restart.sh b/reg_tests/chgres_cube/c96.fv3.restart.sh index bcc38ea44..c4f8ca95b 100755 --- a/reg_tests/chgres_cube/c96.fv3.restart.sh +++ b/reg_tests/chgres_cube/c96.fv3.restart.sh @@ -73,6 +73,9 @@ done set +x if [ $test_failed -ne 0 ]; then echo "<<< C96 FV3 RESTART TEST FAILED. >>>" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $HOMEufs/reg_tests/update_baseline.sh $HOMEreg "c96_fv3_restart" $commit_num + fi else echo "<<< C96 FV3 RESTART TEST PASSED. >>>" fi diff --git a/reg_tests/chgres_cube/driver.hera.sh b/reg_tests/chgres_cube/driver.hera.sh index f68e2726b..0ddf337e7 100755 --- a/reg_tests/chgres_cube/driver.hera.sh +++ b/reg_tests/chgres_cube/driver.hera.sh @@ -44,9 +44,14 @@ QUEUE="${QUEUE:-batch}" # and baseline data for each test. #----------------------------------------------------------------------------- +#export UPDATE_BASELINE="FALSE" +export UPDATE_BASELINE="TRUE" + +source ../get_hash.sh + export HOMEufs=$PWD/../.. -export HOMEreg=/scratch1/NCEPDEV/da/George.Gayno/noscrub/reg_tests/chgres_cube +export HOMEreg=/scratch1/NCEPDEV/da/George.Gayno/noscrub/reg_tests/chgres_cube.test LOG_FILE=consistency.log SUM_FILE=summary.log @@ -67,6 +72,9 @@ export OMP_NUM_THREADS=1 # should match cpus-per-task TEST1=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:15:00 -A $PROJECT_CODE -q $QUEUE -J c96.fv3.restart \ -o $LOG_FILE -e $LOG_FILE ./c96.fv3.restart.sh) + +exit + #----------------------------------------------------------------------------- # Initialize C192 using FV3 tiled history files. #----------------------------------------------------------------------------- diff --git a/reg_tests/global_cycle/driver.hera.sh b/reg_tests/global_cycle/driver.hera.sh index a7058347a..9cf3d09e4 100755 --- a/reg_tests/global_cycle/driver.hera.sh +++ b/reg_tests/global_cycle/driver.hera.sh @@ -36,9 +36,14 @@ QUEUE="${QUEUE:-batch}" # Should not have to change anything below. #----------------------------------------------------------------------------- +#export UPDATE_BASELINE="FALSE" +export UPDATE_BASELINE="TRUE" + +source ../get_hash.sh + DATA_DIR="${WORK_DIR}/reg-tests/global-cycle" -export HOMEreg=/scratch1/NCEPDEV/da/George.Gayno/noscrub/reg_tests/global_cycle +export HOMEreg=/scratch1/NCEPDEV/da/George.Gayno/noscrub/reg_tests/global_cycle.test export OMP_NUM_THREADS_CY=2 From a91902572c2c020587cd847596487e7dadae1e1e Mon Sep 17 00:00:00 2001 From: George Gayno Date: Tue, 11 Jan 2022 09:59:02 -0600 Subject: [PATCH 07/18] Add logic to run the 'get_hash.sh' script only when the baseline is to be updated. Fixes #574 --- reg_tests/chgres_cube/driver.hera.sh | 8 +++++--- reg_tests/chgres_cube/driver.wcoss_dell_p3.sh | 8 +++++--- reg_tests/global_cycle/driver.hera.sh | 8 +++++--- reg_tests/global_cycle/driver.orion.sh | 7 +++++++ reg_tests/global_cycle/driver.wcoss_dell_p3.sh | 8 +++++--- reg_tests/grid_gen/driver.wcoss_dell_p3.sh | 8 +++++--- 6 files changed, 32 insertions(+), 15 deletions(-) diff --git a/reg_tests/chgres_cube/driver.hera.sh b/reg_tests/chgres_cube/driver.hera.sh index 0ddf337e7..cd05f515d 100755 --- a/reg_tests/chgres_cube/driver.hera.sh +++ b/reg_tests/chgres_cube/driver.hera.sh @@ -44,10 +44,12 @@ QUEUE="${QUEUE:-batch}" # and baseline data for each test. #----------------------------------------------------------------------------- -#export UPDATE_BASELINE="FALSE" -export UPDATE_BASELINE="TRUE" +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" -source ../get_hash.sh +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi export HOMEufs=$PWD/../.. diff --git a/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh b/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh index d29d3acb9..75caa168e 100755 --- a/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh +++ b/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh @@ -40,10 +40,12 @@ PROJECT_CODE="${PROJECT_CODE:-GFS-DEV}" # and baseline data for each test. #----------------------------------------------------------------------------- -#export UPDATE_BASELINE="FALSE" -export UPDATE_BASELINE="TRUE" +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" -source ../get_hash.sh +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi export HOMEufs=$PWD/../.. diff --git a/reg_tests/global_cycle/driver.hera.sh b/reg_tests/global_cycle/driver.hera.sh index 9cf3d09e4..6d6e29190 100755 --- a/reg_tests/global_cycle/driver.hera.sh +++ b/reg_tests/global_cycle/driver.hera.sh @@ -36,10 +36,12 @@ QUEUE="${QUEUE:-batch}" # Should not have to change anything below. #----------------------------------------------------------------------------- -#export UPDATE_BASELINE="FALSE" -export UPDATE_BASELINE="TRUE" +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" -source ../get_hash.sh +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi DATA_DIR="${WORK_DIR}/reg-tests/global-cycle" diff --git a/reg_tests/global_cycle/driver.orion.sh b/reg_tests/global_cycle/driver.orion.sh index bf4164e43..3bd5d6dc0 100755 --- a/reg_tests/global_cycle/driver.orion.sh +++ b/reg_tests/global_cycle/driver.orion.sh @@ -34,6 +34,13 @@ QUEUE="${QUEUE:-batch}" # Should not have to change anything below. #----------------------------------------------------------------------------- +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" + +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi + export DATA_DIR="${WORK_DIR}/reg-tests/global-cycle" export HOMEreg=/work/noaa/nems/role-nems/ufs_utils/reg_tests/global_cycle diff --git a/reg_tests/global_cycle/driver.wcoss_dell_p3.sh b/reg_tests/global_cycle/driver.wcoss_dell_p3.sh index 330eb307c..5eef5d894 100755 --- a/reg_tests/global_cycle/driver.wcoss_dell_p3.sh +++ b/reg_tests/global_cycle/driver.wcoss_dell_p3.sh @@ -34,10 +34,12 @@ QUEUE="${QUEUE:-dev}" # Should not have to change anything below. #----------------------------------------------------------------------------- -#export UPDATE_BASELINE="FALSE" -export UPDATE_BASELINE="TRUE" +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" -source ../get_hash.sh +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi DATA_DIR="${WORK_DIR}/reg-tests/global-cycle" diff --git a/reg_tests/grid_gen/driver.wcoss_dell_p3.sh b/reg_tests/grid_gen/driver.wcoss_dell_p3.sh index 0f1152768..fb7ca067c 100755 --- a/reg_tests/grid_gen/driver.wcoss_dell_p3.sh +++ b/reg_tests/grid_gen/driver.wcoss_dell_p3.sh @@ -35,10 +35,12 @@ export WORK_DIR="${WORK_DIR}/reg-tests/grid-gen" # Should not have to change anything below here. #----------------------------------------------------------------------------- -#export UPDATE_BASELINE="FALSE" -export UPDATE_BASELINE="TRUE" +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" -source ../get_hash.sh +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi LOG_FILE=consistency.log SUM_FILE=summary.log From a6bda24f382327210f41023b28f8f7d743b02ef9 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Wed, 12 Jan 2022 09:07:55 -0600 Subject: [PATCH 08/18] Updates for the snow2mdl test. Fixes #574 --- reg_tests/snow2mdl/driver.orion.sh | 7 +++++++ reg_tests/snow2mdl/snow2mdl.sh | 6 +++++- reg_tests/update_baseline.sh | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/reg_tests/snow2mdl/driver.orion.sh b/reg_tests/snow2mdl/driver.orion.sh index 8ca5ed51b..99ad0c14f 100755 --- a/reg_tests/snow2mdl/driver.orion.sh +++ b/reg_tests/snow2mdl/driver.orion.sh @@ -43,6 +43,13 @@ export DATA="${DATA}/reg-tests/snow2mdl" # Should not have to change anything below. #----------------------------------------------------------------------------- +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" + +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi + rm -fr $DATA export HOMEreg=/work/noaa/nems/role-nems/ufs_utils/reg_tests/snow2mdl diff --git a/reg_tests/snow2mdl/snow2mdl.sh b/reg_tests/snow2mdl/snow2mdl.sh index 4acec05b8..4743ad42b 100755 --- a/reg_tests/snow2mdl/snow2mdl.sh +++ b/reg_tests/snow2mdl/snow2mdl.sh @@ -31,7 +31,7 @@ fi test_failed=0 -cmp ${DATA}/snogrb_model $HOMEreg/baseline_data/snogrb_model +cmp ${DATA}/snogrb_model $HOMEreg/baseline_data/t1534/snogrb_model iret=$? if [ $iret -ne 0 ]; then test_failed=1 @@ -44,6 +44,10 @@ if [ $test_failed -ne 0 ]; then echo "<<< SNOW2MDL TEST FAILED. >>>" echo "*********************************" echo "<<< SNOW2MDL TEST FAILED. >>>" > ./summary.log + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + cd $DATA + $HOMEgfs/reg_tests/update_baseline.sh $HOMEreg "t1534" $commit_num + fi else echo echo "*********************************" diff --git a/reg_tests/update_baseline.sh b/reg_tests/update_baseline.sh index 0c4777c14..ed9f279ca 100755 --- a/reg_tests/update_baseline.sh +++ b/reg_tests/update_baseline.sh @@ -21,7 +21,7 @@ fi mkdir -p $base_dir_commit -for files in *.nc +for files in *.nc snogrb_model do if [ -f $files ]; then cp $files $base_dir_commit From ae33ff7d212bf5be53dc9cb31b25ff6811b1866d Mon Sep 17 00:00:00 2001 From: George Gayno Date: Wed, 12 Jan 2022 09:41:32 -0600 Subject: [PATCH 09/18] Update for ice_blend test. Fixes #574 --- reg_tests/ice_blend/driver.orion.sh | 8 ++++++++ reg_tests/ice_blend/ice_blend.sh | 6 +++++- reg_tests/update_baseline.sh | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/reg_tests/ice_blend/driver.orion.sh b/reg_tests/ice_blend/driver.orion.sh index 9f63483ba..8424978f5 100755 --- a/reg_tests/ice_blend/driver.orion.sh +++ b/reg_tests/ice_blend/driver.orion.sh @@ -43,6 +43,13 @@ export DATA="${DATA}/reg-tests/ice-blend" # Should not have to change anything below. #----------------------------------------------------------------------------- +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" + +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi + export WGRIB=/apps/contrib/NCEPLIBS/orion/utils/grib_util.v1.2.0/exec/wgrib export WGRIB2=/apps/contrib/NCEPLIBS/orion/utils/grib_util.v1.2.0/exec/wgrib2 export COPYGB=/apps/contrib/NCEPLIBS/lib/NCEPLIBS-grib_util/v1.1.1/exec/copygb @@ -50,6 +57,7 @@ export COPYGB2=/apps/contrib/NCEPLIBS/orion/utils/grib_util.v1.2.0/exec/copygb2 export CNVGRIB=/apps/contrib/NCEPLIBS/orion/utils/grib_util.v1.2.0/exec/cnvgrib export HOMEreg=/work/noaa/nems/role-nems/ufs_utils/reg_tests/ice_blend +#export HOMEreg=/work/noaa/da/ggayno/save/ufs_utils.git/reg_tests.test/ice_blend export HOMEgfs=$PWD/../.. rm -fr $DATA diff --git a/reg_tests/ice_blend/ice_blend.sh b/reg_tests/ice_blend/ice_blend.sh index b1c193ca3..fcd90fa35 100755 --- a/reg_tests/ice_blend/ice_blend.sh +++ b/reg_tests/ice_blend/ice_blend.sh @@ -18,7 +18,7 @@ if [ $iret -ne 0 ]; then exit $iret fi -cmp ${DATA}/seaice.5min.blend $HOMEreg/baseline_data/seaice.5min.blend +cmp ${DATA}/seaice.5min.blend $HOMEreg/baseline_data/t1534/seaice.5min.blend iret=$? test_failed=0 if [ $iret -ne 0 ]; then @@ -32,6 +32,10 @@ if [ $test_failed -ne 0 ]; then echo "<<< ICE BLEND TEST FAILED. >>>" echo "*********************************" echo "<<< ICE BLEND TEST FAILED. >>>" > ./summary.log + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + cd $DATA + $HOMEgfs/reg_tests/update_baseline.sh $HOMEreg "t1534" $commit_num + fi else echo echo "*********************************" diff --git a/reg_tests/update_baseline.sh b/reg_tests/update_baseline.sh index ed9f279ca..d0cb329f6 100755 --- a/reg_tests/update_baseline.sh +++ b/reg_tests/update_baseline.sh @@ -21,7 +21,7 @@ fi mkdir -p $base_dir_commit -for files in *.nc snogrb_model +for files in *.nc snogrb_model seaice.5min.blend do if [ -f $files ]; then cp $files $base_dir_commit From 94deb26f48633cc3a74c71a3ed0fc2af5da9f5ed Mon Sep 17 00:00:00 2001 From: George Gayno Date: Wed, 12 Jan 2022 10:36:49 -0600 Subject: [PATCH 10/18] Update chgres script for Orion. Fixes #574 --- reg_tests/chgres_cube/driver.orion.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/reg_tests/chgres_cube/driver.orion.sh b/reg_tests/chgres_cube/driver.orion.sh index 53da13cfc..a40579a6a 100755 --- a/reg_tests/chgres_cube/driver.orion.sh +++ b/reg_tests/chgres_cube/driver.orion.sh @@ -44,9 +44,17 @@ QUEUE="${QUEUE:-batch}" # and baseline data for each test. #----------------------------------------------------------------------------- +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" + +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi + export HOMEufs=$PWD/../.. export HOMEreg=/work/noaa/nems/role-nems/ufs_utils/reg_tests/chgres_cube +#export HOMEreg=/work/noaa/da/ggayno/save/ufs_utils.git/reg_tests.test/chgres_cube LOG_FILE=consistency.log SUM_FILE=summary.log From a24edc5df5c39d032f6038b7fe03eab3e1a7e209 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Wed, 12 Jan 2022 13:15:34 -0600 Subject: [PATCH 11/18] Update grid_gen scripts. Fixes #574 --- reg_tests/grid_gen/c96.viirs.vegt.sh | 3 +++ reg_tests/grid_gen/driver.orion.sh | 8 ++++++++ reg_tests/grid_gen/esg.regional.sh | 3 +++ reg_tests/grid_gen/gfdl.regional.sh | 3 +++ reg_tests/grid_gen/regional.gsl.gwd.sh | 3 +++ 5 files changed, 20 insertions(+) diff --git a/reg_tests/grid_gen/c96.viirs.vegt.sh b/reg_tests/grid_gen/c96.viirs.vegt.sh index dd593680d..d0db44538 100755 --- a/reg_tests/grid_gen/c96.viirs.vegt.sh +++ b/reg_tests/grid_gen/c96.viirs.vegt.sh @@ -57,6 +57,9 @@ done set +x if [ $test_failed -ne 0 ]; then echo "<<< C96 VIIRS VEGT TEST FAILED. >>>" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $home_dir/reg_tests/update_baseline.sh "${HOMEreg}/.." "c96.viirs.vegt" $commit_num + fi else echo "<<< C96 VIIRS VEGT TEST PASSED. >>>" fi diff --git a/reg_tests/grid_gen/driver.orion.sh b/reg_tests/grid_gen/driver.orion.sh index ba48afe21..8b00621b8 100755 --- a/reg_tests/grid_gen/driver.orion.sh +++ b/reg_tests/grid_gen/driver.orion.sh @@ -46,6 +46,14 @@ export APRUN_SFC=srun export OMP_STACKSIZE=2048m export OMP_NUM_THREADS=24 export machine=ORION + +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" + +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi + export HOMEreg=/work/noaa/nems/role-nems/ufs_utils/reg_tests/grid_gen/baseline_data rm -fr $WORK_DIR diff --git a/reg_tests/grid_gen/esg.regional.sh b/reg_tests/grid_gen/esg.regional.sh index d88a260dc..55963531f 100755 --- a/reg_tests/grid_gen/esg.regional.sh +++ b/reg_tests/grid_gen/esg.regional.sh @@ -61,6 +61,9 @@ done set +x if [ $test_failed -ne 0 ]; then echo "<<< ESG REGIONAL TEST FAILED. >>>" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $home_dir/reg_tests/update_baseline.sh "${HOMEreg}/.." "esg.regional" $commit_num + fi else echo "<<< ESG REGIONAL TEST PASSED. >>>" fi diff --git a/reg_tests/grid_gen/gfdl.regional.sh b/reg_tests/grid_gen/gfdl.regional.sh index 985b498d2..76f94a4f4 100755 --- a/reg_tests/grid_gen/gfdl.regional.sh +++ b/reg_tests/grid_gen/gfdl.regional.sh @@ -64,6 +64,9 @@ done set +x if [ $test_failed -ne 0 ]; then echo "<<< GFDL REGIONAL TEST FAILED. >>>" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $home_dir/reg_tests/update_baseline.sh "${HOMEreg}/.." "gfdl.regional" $commit_num + fi else echo "<<< GFDL REGIONAL TEST PASSED. >>>" fi diff --git a/reg_tests/grid_gen/regional.gsl.gwd.sh b/reg_tests/grid_gen/regional.gsl.gwd.sh index 0a66daeeb..415ca3813 100755 --- a/reg_tests/grid_gen/regional.gsl.gwd.sh +++ b/reg_tests/grid_gen/regional.gsl.gwd.sh @@ -62,6 +62,9 @@ done set +x if [ $test_failed -ne 0 ]; then echo "<<< REGIONAL GSL GWD TEST FAILED. >>>" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $home_dir/reg_tests/update_baseline.sh "${HOMEreg}/.." "regional.gsl.gwd" $commit_num + fi else echo "<<< REGIONAL GSL GWD TEST PASSED. >>>" fi From 86cac2362e5a77aa4ded17928d026ac8052da7c1 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Wed, 12 Jan 2022 20:55:51 +0000 Subject: [PATCH 12/18] Update scripts for Jet. Fixes #574. --- reg_tests/chgres_cube/driver.jet.sh | 7 +++++++ reg_tests/global_cycle/driver.jet.sh | 7 +++++++ reg_tests/grid_gen/driver.jet.sh | 7 +++++++ reg_tests/ice_blend/driver.jet.sh | 8 ++++++++ reg_tests/snow2mdl/driver.jet.sh | 7 +++++++ 5 files changed, 36 insertions(+) diff --git a/reg_tests/chgres_cube/driver.jet.sh b/reg_tests/chgres_cube/driver.jet.sh index f1eb2e1a4..4b7a29786 100755 --- a/reg_tests/chgres_cube/driver.jet.sh +++ b/reg_tests/chgres_cube/driver.jet.sh @@ -45,6 +45,13 @@ export HDF5_DISABLE_VERSION_CHECK=2 # and baseline data for each test. #----------------------------------------------------------------------------- +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" + +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi + export HOMEufs=$PWD/../.. export HOMEreg=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/chgres_cube diff --git a/reg_tests/global_cycle/driver.jet.sh b/reg_tests/global_cycle/driver.jet.sh index 0d2a1dd7c..0f0ab0c4d 100755 --- a/reg_tests/global_cycle/driver.jet.sh +++ b/reg_tests/global_cycle/driver.jet.sh @@ -34,6 +34,13 @@ QUEUE="${QUEUE:-batch}" # Should not have to change anything below. #----------------------------------------------------------------------------- +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" + +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi + export DATA_DIR="${WORK_DIR}/reg-tests/global-cycle" export HOMEreg=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/global_cycle diff --git a/reg_tests/grid_gen/driver.jet.sh b/reg_tests/grid_gen/driver.jet.sh index 38033430a..f6778a5b7 100755 --- a/reg_tests/grid_gen/driver.jet.sh +++ b/reg_tests/grid_gen/driver.jet.sh @@ -37,6 +37,13 @@ export WORK_DIR="${WORK_DIR}/reg-tests/grid-gen" # Should not have to change anything below here. #----------------------------------------------------------------------------- +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" + +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi + LOG_FILE=consistency.log SUM_FILE=summary.log export home_dir=$PWD/../.. diff --git a/reg_tests/ice_blend/driver.jet.sh b/reg_tests/ice_blend/driver.jet.sh index 417385dc1..c66b3922b 100755 --- a/reg_tests/ice_blend/driver.jet.sh +++ b/reg_tests/ice_blend/driver.jet.sh @@ -40,6 +40,13 @@ export DATA="${DATA}/reg-tests/ice-blend" # Should not have to change anything below. #----------------------------------------------------------------------------- +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" + +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi + export WGRIB=/apps/wgrib/1.8.1.0b/bin/wgrib export WGRIB2=/apps/wgrib2/0.1.9.6a/bin/wgrib2 export COPYGB=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/grib_util/NCEPLIBS-grib_util/exec/bin/copygb @@ -47,6 +54,7 @@ export COPYGB2=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/grib_util export CNVGRIB=/apps/cnvgrib/1.4.0/bin/cnvgrib export HOMEreg=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/ice_blend + export HOMEgfs=$PWD/../.. rm -fr $DATA diff --git a/reg_tests/snow2mdl/driver.jet.sh b/reg_tests/snow2mdl/driver.jet.sh index 6da755ff9..cd06cf513 100755 --- a/reg_tests/snow2mdl/driver.jet.sh +++ b/reg_tests/snow2mdl/driver.jet.sh @@ -40,6 +40,13 @@ export DATA="${DATA}/reg-tests/snow2mdl" # Should not have to change anything below. #----------------------------------------------------------------------------- +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" + +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi + export HOMEreg=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/snow2mdl export HOMEgfs=$PWD/../.. export WGRIB=/apps/wgrib/1.8.1.0b/bin/wgrib From f564cd7c9210e5326d77d0b8e54da65b1782b001 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 13 Jan 2022 14:21:19 +0000 Subject: [PATCH 13/18] Update snow and ice scripts on WCOSS-Dell. Fixes #574 --- reg_tests/ice_blend/driver.wcoss_dell_p3.sh | 8 ++++++++ reg_tests/snow2mdl/driver.wcoss_dell_p3.sh | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/reg_tests/ice_blend/driver.wcoss_dell_p3.sh b/reg_tests/ice_blend/driver.wcoss_dell_p3.sh index 2d91a3417..be2940dea 100755 --- a/reg_tests/ice_blend/driver.wcoss_dell_p3.sh +++ b/reg_tests/ice_blend/driver.wcoss_dell_p3.sh @@ -29,6 +29,7 @@ source ../../sorc/machine-setup.sh > /dev/null 2>&1 module use ../../modulefiles module load build.$target.intel +module load git module list set -x @@ -40,6 +41,13 @@ export DATA="${DATA}/reg-tests/ice-blend" # Should not have to change anything below. #----------------------------------------------------------------------------- +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" + +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi + export WGRIB="/gpfs/dell1/nco/ops/nwprod/grib_util.v1.1.1/exec/wgrib" export WGRIB2="/gpfs/dell1/nco/ops/nwprod/grib_util.v1.1.1/exec/wgrib2" export COPYGB2="/gpfs/dell1/nco/ops/nwprod/grib_util.v1.1.1/exec/copygb2" diff --git a/reg_tests/snow2mdl/driver.wcoss_dell_p3.sh b/reg_tests/snow2mdl/driver.wcoss_dell_p3.sh index 0f315d391..f1e417587 100755 --- a/reg_tests/snow2mdl/driver.wcoss_dell_p3.sh +++ b/reg_tests/snow2mdl/driver.wcoss_dell_p3.sh @@ -29,6 +29,7 @@ source ../../sorc/machine-setup.sh > /dev/null 2>&1 module use ../../modulefiles module load build.$target.intel +module load git module list set -x @@ -40,6 +41,13 @@ export DATA="${DATA}/reg-tests/snow2mdl" # Should not have to change anything below. #----------------------------------------------------------------------------- +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" + +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi + export HOMEreg=/gpfs/dell2/emc/modeling/noscrub/George.Gayno/ufs_utils.git/reg_tests/snow2mdl export HOMEgfs=$PWD/../.. export WGRIB=/gpfs/dell1/nco/ops/nwprod/grib_util.v1.0.6/exec/wgrib From c2db9c9b6f300a07b159ff803eeeb936dbbe68c6 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 13 Jan 2022 15:57:22 +0000 Subject: [PATCH 14/18] Updates scripts on Hera. Fixes #574. --- reg_tests/chgres_cube/driver.hera.sh | 2 +- reg_tests/global_cycle/driver.hera.sh | 2 +- reg_tests/grid_gen/driver.hera.sh | 7 +++++++ reg_tests/ice_blend/driver.hera.sh | 7 +++++++ reg_tests/snow2mdl/driver.hera.sh | 7 +++++++ 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/reg_tests/chgres_cube/driver.hera.sh b/reg_tests/chgres_cube/driver.hera.sh index cd05f515d..5ef71fd1f 100755 --- a/reg_tests/chgres_cube/driver.hera.sh +++ b/reg_tests/chgres_cube/driver.hera.sh @@ -53,7 +53,7 @@ fi export HOMEufs=$PWD/../.. -export HOMEreg=/scratch1/NCEPDEV/da/George.Gayno/noscrub/reg_tests/chgres_cube.test +export HOMEreg=/scratch1/NCEPDEV/nems/role.ufsutils/ufs_utils/reg_tests/chgres_cube LOG_FILE=consistency.log SUM_FILE=summary.log diff --git a/reg_tests/global_cycle/driver.hera.sh b/reg_tests/global_cycle/driver.hera.sh index 6d6e29190..c049f51fd 100755 --- a/reg_tests/global_cycle/driver.hera.sh +++ b/reg_tests/global_cycle/driver.hera.sh @@ -45,7 +45,7 @@ fi DATA_DIR="${WORK_DIR}/reg-tests/global-cycle" -export HOMEreg=/scratch1/NCEPDEV/da/George.Gayno/noscrub/reg_tests/global_cycle.test +export HOMEreg=/scratch1/NCEPDEV/nems/role.ufsutils/ufs_utils/reg_tests/global_cycle export OMP_NUM_THREADS_CY=2 diff --git a/reg_tests/grid_gen/driver.hera.sh b/reg_tests/grid_gen/driver.hera.sh index b8de3f8d2..9c5b9b97a 100755 --- a/reg_tests/grid_gen/driver.hera.sh +++ b/reg_tests/grid_gen/driver.hera.sh @@ -39,6 +39,13 @@ PROJECT_CODE="${PROJECT_CODE:-fv3-cpu}" # Should not have to change anything below here. #----------------------------------------------------------------------------- +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" + +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi + LOG_FILE=consistency.log SUM_FILE=summary.log export home_dir=$PWD/../.. diff --git a/reg_tests/ice_blend/driver.hera.sh b/reg_tests/ice_blend/driver.hera.sh index 3ce993fe4..b86f370d1 100755 --- a/reg_tests/ice_blend/driver.hera.sh +++ b/reg_tests/ice_blend/driver.hera.sh @@ -43,6 +43,13 @@ export DATA="${DATA}/reg-tests/ice-blend" # Should not have to change anything below. #----------------------------------------------------------------------------- +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" + +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi + export WGRIB=/scratch2/NCEPDEV/nwprod/NCEPLIBS/utils/grib_util.v1.1.1/exec/wgrib export WGRIB2=/scratch2/NCEPDEV/nwprod/NCEPLIBS/utils/grib_util.v1.1.1/exec/wgrib2 export COPYGB=/scratch2/NCEPDEV/nwprod/NCEPLIBS/utils/grib_util.v1.1.1/exec/copygb diff --git a/reg_tests/snow2mdl/driver.hera.sh b/reg_tests/snow2mdl/driver.hera.sh index d83b501e0..11e854954 100755 --- a/reg_tests/snow2mdl/driver.hera.sh +++ b/reg_tests/snow2mdl/driver.hera.sh @@ -43,6 +43,13 @@ export DATA="${DATA}/reg-tests/snow2mdl" # Should not have to change anything below. #----------------------------------------------------------------------------- +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" + +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi + rm -fr $DATA export HOMEreg=/scratch1/NCEPDEV/nems/role.ufsutils/ufs_utils/reg_tests/snow2mdl From 63b18ef0073bbbc7e5aeb7a4555c16f6f9bca511 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 13 Jan 2022 19:30:11 +0000 Subject: [PATCH 15/18] Update scripts on WCOSS-Cray. Fixes #574. --- reg_tests/chgres_cube/driver.wcoss_cray.sh | 7 +++++++ reg_tests/global_cycle/driver.wcoss_cray.sh | 7 +++++++ reg_tests/grid_gen/driver.wcoss_cray.sh | 7 +++++++ reg_tests/ice_blend/driver.wcoss_cray.sh | 7 +++++++ reg_tests/snow2mdl/driver.wcoss_cray.sh | 7 +++++++ 5 files changed, 35 insertions(+) diff --git a/reg_tests/chgres_cube/driver.wcoss_cray.sh b/reg_tests/chgres_cube/driver.wcoss_cray.sh index d08b9cdb9..96337cc03 100755 --- a/reg_tests/chgres_cube/driver.wcoss_cray.sh +++ b/reg_tests/chgres_cube/driver.wcoss_cray.sh @@ -42,6 +42,13 @@ PROJECT_CODE="${PROJECT_CODE:-GFS-DEV}" export HOMEufs=$PWD/../.. +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" + +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi + export HOMEreg=/gpfs/hps3/emc/global/noscrub/George.Gayno/ufs_utils.git/reg_tests/chgres_cube LOG_FILE=consistency.log diff --git a/reg_tests/global_cycle/driver.wcoss_cray.sh b/reg_tests/global_cycle/driver.wcoss_cray.sh index f18242917..4c98a52d3 100755 --- a/reg_tests/global_cycle/driver.wcoss_cray.sh +++ b/reg_tests/global_cycle/driver.wcoss_cray.sh @@ -32,6 +32,13 @@ QUEUE="${QUEUE:-dev}" # Should not have to change anything below. #----------------------------------------------------------------------------- +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" + +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi + DATA_DIR="${WORK_DIR}/reg-tests/global-cycle" export HOMEreg=/gpfs/hps3/emc/global/noscrub/George.Gayno/ufs_utils.git/reg_tests/global_cycle diff --git a/reg_tests/grid_gen/driver.wcoss_cray.sh b/reg_tests/grid_gen/driver.wcoss_cray.sh index 5887676ff..de85aade2 100755 --- a/reg_tests/grid_gen/driver.wcoss_cray.sh +++ b/reg_tests/grid_gen/driver.wcoss_cray.sh @@ -35,6 +35,13 @@ export WORK_DIR="${WORK_DIR}/reg-tests/grid-gen" # Should not have to change anything below here. #----------------------------------------------------------------------------- +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" + +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi + export home_dir=$PWD/../.. LOG_FILE=consistency.log SUM_FILE=summary.log diff --git a/reg_tests/ice_blend/driver.wcoss_cray.sh b/reg_tests/ice_blend/driver.wcoss_cray.sh index 7556b9b55..3b1250143 100755 --- a/reg_tests/ice_blend/driver.wcoss_cray.sh +++ b/reg_tests/ice_blend/driver.wcoss_cray.sh @@ -40,6 +40,13 @@ export DATA="${DATA}/reg-tests/ice-blend" # Should not have to change anything below. #----------------------------------------------------------------------------- +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" + +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi + export WGRIB=/gpfs/hps/nco/ops/nwprod/grib_util.v1.0.5/exec/wgrib export WGRIB2=/gpfs/hps/nco/ops/nwprod/grib_util.v1.0.5/exec/wgrib2 export COPYGB2=/gpfs/hps/nco/ops/nwprod/grib_util.v1.0.5/exec/copygb2 diff --git a/reg_tests/snow2mdl/driver.wcoss_cray.sh b/reg_tests/snow2mdl/driver.wcoss_cray.sh index 197ecb161..c0dc69509 100755 --- a/reg_tests/snow2mdl/driver.wcoss_cray.sh +++ b/reg_tests/snow2mdl/driver.wcoss_cray.sh @@ -40,6 +40,13 @@ export DATA="${DATA}/reg-tests/snow2mdl" # Should not have to change anything below. #----------------------------------------------------------------------------- +export UPDATE_BASELINE="FALSE" +#export UPDATE_BASELINE="TRUE" + +if [ "$UPDATE_BASELINE" = "TRUE" ]; then + source ../get_hash.sh +fi + export HOMEreg=/gpfs/hps3/emc/global/noscrub/George.Gayno/ufs_utils.git/reg_tests/snow2mdl export HOMEgfs=$PWD/../.. export WGRIB=/gpfs/hps/nco/ops/nwprod/grib_util.v1.0.2/exec/wgrib From ea4e8915f75f22097df18a3ece259e99aa6b2349 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Thu, 13 Jan 2022 15:39:10 -0600 Subject: [PATCH 16/18] Update remaining chgres regression test scripts. Fixes #574. --- reg_tests/chgres_cube/13km.conus.nam.grib2.sh | 3 +++ reg_tests/chgres_cube/13km.conus.rap.grib2.sh | 3 +++ reg_tests/chgres_cube/13km.na.gfs.ncei.grib2.sh | 3 +++ reg_tests/chgres_cube/3km.conus.hrrr.gfssdf.grib2.sh | 3 +++ reg_tests/chgres_cube/3km.conus.hrrr.newsfc.grib2.sh | 3 +++ reg_tests/chgres_cube/c192.fv3.history.sh | 3 +++ reg_tests/chgres_cube/c192.gfs.grib2.sh | 3 +++ reg_tests/chgres_cube/c96.fv3.nemsio.sh | 3 +++ reg_tests/chgres_cube/c96.fv3.netcdf.sh | 3 +++ reg_tests/chgres_cube/c96.fv3.netcdf2wam.sh | 3 +++ reg_tests/chgres_cube/c96.gfs.nemsio.sh | 3 +++ reg_tests/chgres_cube/c96.gfs.sigio.sh | 3 +++ reg_tests/chgres_cube/c96.regional.sh | 3 +++ reg_tests/chgres_cube/driver.orion.sh | 1 - 14 files changed, 39 insertions(+), 1 deletion(-) diff --git a/reg_tests/chgres_cube/13km.conus.nam.grib2.sh b/reg_tests/chgres_cube/13km.conus.nam.grib2.sh index 7d97800db..f293f3874 100755 --- a/reg_tests/chgres_cube/13km.conus.nam.grib2.sh +++ b/reg_tests/chgres_cube/13km.conus.nam.grib2.sh @@ -82,6 +82,9 @@ done set +x if [ $test_failed -ne 0 ]; then echo "<<< 13-KM CONUS NAM GRIB2 TEST FAILED. >>>" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $HOMEufs/reg_tests/update_baseline.sh $HOMEreg "13km_conus_nam_grib2" $commit_num + fi else echo "<<< 13-KM CONUS NAM GRIB2 TEST PASSED. >>>" fi diff --git a/reg_tests/chgres_cube/13km.conus.rap.grib2.sh b/reg_tests/chgres_cube/13km.conus.rap.grib2.sh index 441f953fe..9c8fe6acb 100755 --- a/reg_tests/chgres_cube/13km.conus.rap.grib2.sh +++ b/reg_tests/chgres_cube/13km.conus.rap.grib2.sh @@ -90,6 +90,9 @@ done set +x if [ $test_failed -ne 0 ]; then echo "<<< 13-km CONUS RAP W/ GSD PHYSICS AND SFC FROM FILE GRIB2 TEST FAILED. >>>" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $HOMEufs/reg_tests/update_baseline.sh $HOMEreg "13km_conus_rap_grib2" $commit_num + fi else echo "<<< 13-km CONUS RAP W/ GSD PHYSICS AND SFC FROM FILE GRIB2 TEST PASSED. >>>" fi diff --git a/reg_tests/chgres_cube/13km.na.gfs.ncei.grib2.sh b/reg_tests/chgres_cube/13km.na.gfs.ncei.grib2.sh index c98df7122..b8122703c 100755 --- a/reg_tests/chgres_cube/13km.na.gfs.ncei.grib2.sh +++ b/reg_tests/chgres_cube/13km.na.gfs.ncei.grib2.sh @@ -79,6 +79,9 @@ done set +x if [ $test_failed -ne 0 ]; then echo "<<< 13-KM NA GFS NCEI GRIB2 TEST FAILED. >>>" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $HOMEufs/reg_tests/update_baseline.sh $HOMEreg "13km_na_gfs_ncei_grib2" $commit_num + fi else echo "<<< 13-KM NA GFS NCEI GRIB2 TEST PASSED. >>>" fi diff --git a/reg_tests/chgres_cube/3km.conus.hrrr.gfssdf.grib2.sh b/reg_tests/chgres_cube/3km.conus.hrrr.gfssdf.grib2.sh index 67711b8f6..3abd888f7 100755 --- a/reg_tests/chgres_cube/3km.conus.hrrr.gfssdf.grib2.sh +++ b/reg_tests/chgres_cube/3km.conus.hrrr.gfssdf.grib2.sh @@ -84,6 +84,9 @@ done set +x if [ $test_failed -ne 0 ]; then echo "<<< 3-km CONUS HRRR W/ GFS PHYSICS GRIB2 TEST FAILED. >>>" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $HOMEufs/reg_tests/update_baseline.sh $HOMEreg "3km_conus_hrrr_gfssdf_grib2" $commit_num + fi else echo "<<< 3-km CONUS HRRR W/ GFS PHYSICS GRIB2 TEST PASSED. >>>" fi diff --git a/reg_tests/chgres_cube/3km.conus.hrrr.newsfc.grib2.sh b/reg_tests/chgres_cube/3km.conus.hrrr.newsfc.grib2.sh index 30be5e98e..25560f5e4 100755 --- a/reg_tests/chgres_cube/3km.conus.hrrr.newsfc.grib2.sh +++ b/reg_tests/chgres_cube/3km.conus.hrrr.newsfc.grib2.sh @@ -90,6 +90,9 @@ done set +x if [ $test_failed -ne 0 ]; then echo "<<< 3-km CONUS HRRR W/ GSD PHYSICS AND SFC FROM FILE GRIB2 TEST FAILED. >>>" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $HOMEufs/reg_tests/update_baseline.sh $HOMEreg "3km_conus_hrrr_newsfc_grib2" $commit_num + fi else echo "<<< 3-km CONUS HRRR W/ GSD PHYSICS AND SFC FROM FILE GRIB2 TEST PASSED. >>>" fi diff --git a/reg_tests/chgres_cube/c192.fv3.history.sh b/reg_tests/chgres_cube/c192.fv3.history.sh index 44fd8ae81..7bb587ff6 100755 --- a/reg_tests/chgres_cube/c192.fv3.history.sh +++ b/reg_tests/chgres_cube/c192.fv3.history.sh @@ -72,6 +72,9 @@ done set +x if [ $test_failed -ne 0 ]; then echo "<<< C192 FV3 HISTORY TEST FAILED. >>>" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $HOMEufs/reg_tests/update_baseline.sh $HOMEreg "c192_fv3_history" $commit_num + fi else echo "<<< C192 FV3 HISTORY TEST PASSED. >>>" fi diff --git a/reg_tests/chgres_cube/c192.gfs.grib2.sh b/reg_tests/chgres_cube/c192.gfs.grib2.sh index 5b8cf2bac..6d6e0cba5 100755 --- a/reg_tests/chgres_cube/c192.gfs.grib2.sh +++ b/reg_tests/chgres_cube/c192.gfs.grib2.sh @@ -67,6 +67,9 @@ done set +x if [ $test_failed -ne 0 ]; then echo "<<< C192 GFS GRIB2 TEST FAILED. >>>" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $HOMEufs/reg_tests/update_baseline.sh $HOMEreg "c192_gfs_grib2" $commit_num + fi else echo "<<< C192 GFS GRIB2 TEST PASSED. >>>" fi diff --git a/reg_tests/chgres_cube/c96.fv3.nemsio.sh b/reg_tests/chgres_cube/c96.fv3.nemsio.sh index e0271c15b..7a6463f70 100755 --- a/reg_tests/chgres_cube/c96.fv3.nemsio.sh +++ b/reg_tests/chgres_cube/c96.fv3.nemsio.sh @@ -63,6 +63,9 @@ done set +x if [ $test_failed -ne 0 ]; then echo "<<< C96 FV3 GAUSSIAN NEMSIO TEST FAILED. >>>" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $HOMEufs/reg_tests/update_baseline.sh $HOMEreg "c96_fv3_nemsio" $commit_num + fi else echo "<<< C96 FV3 GAUSSIAN NEMSIO TEST PASSED. >>>" fi diff --git a/reg_tests/chgres_cube/c96.fv3.netcdf.sh b/reg_tests/chgres_cube/c96.fv3.netcdf.sh index 4f5618737..acd21c81d 100755 --- a/reg_tests/chgres_cube/c96.fv3.netcdf.sh +++ b/reg_tests/chgres_cube/c96.fv3.netcdf.sh @@ -64,6 +64,9 @@ done set +x if [ $test_failed -ne 0 ]; then echo "<<< C96 FV3 GAUSSIAN NETCDF TEST FAILED. >>>" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $HOMEufs/reg_tests/update_baseline.sh $HOMEreg "c96_fv3_netcdf" $commit_num + fi else echo "<<< C96 FV3 GAUSSIAN NETCDF TEST PASSED. >>>" fi diff --git a/reg_tests/chgres_cube/c96.fv3.netcdf2wam.sh b/reg_tests/chgres_cube/c96.fv3.netcdf2wam.sh index 7adf8f04b..74f301f87 100755 --- a/reg_tests/chgres_cube/c96.fv3.netcdf2wam.sh +++ b/reg_tests/chgres_cube/c96.fv3.netcdf2wam.sh @@ -71,6 +71,9 @@ done set +x if [ $test_failed -ne 0 ]; then echo "<<< C96 FV3 GAUSSIAN NETCDF2WAM TEST FAILED. >>>" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $HOMEufs/reg_tests/update_baseline.sh $HOMEreg "c96_fv3_netcdf2wam" $commit_num + fi else echo "<<< C96 FV3 GAUSSIAN NETCDF2WAM TEST PASSED. >>>" fi diff --git a/reg_tests/chgres_cube/c96.gfs.nemsio.sh b/reg_tests/chgres_cube/c96.gfs.nemsio.sh index 36ea52843..a965bfa10 100755 --- a/reg_tests/chgres_cube/c96.gfs.nemsio.sh +++ b/reg_tests/chgres_cube/c96.gfs.nemsio.sh @@ -67,6 +67,9 @@ done set +x if [ $test_failed -ne 0 ]; then echo "<<< C96 GFS GAUSSIAN NEMSIO TEST FAILED. >>>" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $HOMEufs/reg_tests/update_baseline.sh $HOMEreg "c96_gfs_nemsio" $commit_num + fi else echo "<<< C96 GFS GAUSSIAN NEMSIO TEST PASSED. >>>" fi diff --git a/reg_tests/chgres_cube/c96.gfs.sigio.sh b/reg_tests/chgres_cube/c96.gfs.sigio.sh index b04765603..daf1145c9 100755 --- a/reg_tests/chgres_cube/c96.gfs.sigio.sh +++ b/reg_tests/chgres_cube/c96.gfs.sigio.sh @@ -69,6 +69,9 @@ done set +x if [ $test_failed -ne 0 ]; then echo "<<< C96 GFS SIGIO TEST FAILED. >>>" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $HOMEufs/reg_tests/update_baseline.sh $HOMEreg "c96_gfs_sigio" $commit_num + fi else echo "<<< C96 GFS SIGIO TEST PASSED. >>>" fi diff --git a/reg_tests/chgres_cube/c96.regional.sh b/reg_tests/chgres_cube/c96.regional.sh index 8cde6a50a..b4807aa5e 100755 --- a/reg_tests/chgres_cube/c96.regional.sh +++ b/reg_tests/chgres_cube/c96.regional.sh @@ -72,6 +72,9 @@ done set +x if [ $test_failed -ne 0 ]; then echo "<<< C96 REGIONAL TEST FAILED. >>>" + if [ "$UPDATE_BASELINE" = "TRUE" ]; then + $HOMEufs/reg_tests/update_baseline.sh $HOMEreg "c96_regional" $commit_num + fi else echo "<<< C96 REGIONAL TEST PASSED. >>>" fi diff --git a/reg_tests/chgres_cube/driver.orion.sh b/reg_tests/chgres_cube/driver.orion.sh index a40579a6a..bfa1c543c 100755 --- a/reg_tests/chgres_cube/driver.orion.sh +++ b/reg_tests/chgres_cube/driver.orion.sh @@ -54,7 +54,6 @@ fi export HOMEufs=$PWD/../.. export HOMEreg=/work/noaa/nems/role-nems/ufs_utils/reg_tests/chgres_cube -#export HOMEreg=/work/noaa/da/ggayno/save/ufs_utils.git/reg_tests.test/chgres_cube LOG_FILE=consistency.log SUM_FILE=summary.log From 41b550fd465723b4e82eb40ff07eaef4b8fdd047 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Fri, 14 Jan 2022 15:44:34 +0000 Subject: [PATCH 17/18] Minor cleanup of scripts. Fixes #574. --- reg_tests/chgres_cube/driver.hera.sh | 3 --- reg_tests/chgres_cube/driver.wcoss_dell_p3.sh | 2 +- reg_tests/global_cycle/driver.wcoss_dell_p3.sh | 2 +- reg_tests/grid_gen/driver.wcoss_dell_p3.sh | 5 +---- reg_tests/ice_blend/driver.orion.sh | 1 - 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/reg_tests/chgres_cube/driver.hera.sh b/reg_tests/chgres_cube/driver.hera.sh index 5ef71fd1f..d95cbadf9 100755 --- a/reg_tests/chgres_cube/driver.hera.sh +++ b/reg_tests/chgres_cube/driver.hera.sh @@ -74,9 +74,6 @@ export OMP_NUM_THREADS=1 # should match cpus-per-task TEST1=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:15:00 -A $PROJECT_CODE -q $QUEUE -J c96.fv3.restart \ -o $LOG_FILE -e $LOG_FILE ./c96.fv3.restart.sh) - -exit - #----------------------------------------------------------------------------- # Initialize C192 using FV3 tiled history files. #----------------------------------------------------------------------------- diff --git a/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh b/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh index 75caa168e..3a03c2341 100755 --- a/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh +++ b/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh @@ -49,7 +49,7 @@ fi export HOMEufs=$PWD/../.. -export HOMEreg=/gpfs/dell2/emc/modeling/noscrub/George.Gayno/ufs_utils.git/reg_tests/chgres_cube.test +export HOMEreg=/gpfs/dell2/emc/modeling/noscrub/George.Gayno/ufs_utils.git/reg_tests/chgres_cube SUM_FILE=summary.log diff --git a/reg_tests/global_cycle/driver.wcoss_dell_p3.sh b/reg_tests/global_cycle/driver.wcoss_dell_p3.sh index 5eef5d894..9b1c0cc10 100755 --- a/reg_tests/global_cycle/driver.wcoss_dell_p3.sh +++ b/reg_tests/global_cycle/driver.wcoss_dell_p3.sh @@ -43,7 +43,7 @@ fi DATA_DIR="${WORK_DIR}/reg-tests/global-cycle" -export HOMEreg=/gpfs/dell2/emc/modeling/noscrub/George.Gayno/ufs_utils.git/reg_tests/global_cycle.test +export HOMEreg=/gpfs/dell2/emc/modeling/noscrub/George.Gayno/ufs_utils.git/reg_tests/global_cycle export OMP_NUM_THREADS_CY=2 diff --git a/reg_tests/grid_gen/driver.wcoss_dell_p3.sh b/reg_tests/grid_gen/driver.wcoss_dell_p3.sh index fb7ca067c..9d6bb3eba 100755 --- a/reg_tests/grid_gen/driver.wcoss_dell_p3.sh +++ b/reg_tests/grid_gen/driver.wcoss_dell_p3.sh @@ -49,7 +49,7 @@ export APRUN=time export APRUN_SFC="mpirun -l" export OMP_STACKSIZE=2048m export machine=WCOSS_DELL_P3 -export HOMEreg=/gpfs/dell2/emc/modeling/noscrub/George.Gayno/ufs_utils.git/reg_tests/grid_gen.test/baseline_data +export HOMEreg=/gpfs/dell2/emc/modeling/noscrub/George.Gayno/ufs_utils.git/reg_tests/grid_gen/baseline_data export OMP_NUM_THREADS=24 rm -fr $WORK_DIR @@ -64,9 +64,6 @@ ulimit -s unlimited bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J c96.uniform -W 0:15 -x -n 24 \ -R "span[ptile=24]" -R "affinity[core(1):distribute=balance]" "$PWD/c96.uniform.sh" - -exit - #----------------------------------------------------------------------------- # C96 uniform grid using viirs vegetation type data. #----------------------------------------------------------------------------- diff --git a/reg_tests/ice_blend/driver.orion.sh b/reg_tests/ice_blend/driver.orion.sh index 8424978f5..cf8d559b7 100755 --- a/reg_tests/ice_blend/driver.orion.sh +++ b/reg_tests/ice_blend/driver.orion.sh @@ -57,7 +57,6 @@ export COPYGB2=/apps/contrib/NCEPLIBS/orion/utils/grib_util.v1.2.0/exec/copygb2 export CNVGRIB=/apps/contrib/NCEPLIBS/orion/utils/grib_util.v1.2.0/exec/cnvgrib export HOMEreg=/work/noaa/nems/role-nems/ufs_utils/reg_tests/ice_blend -#export HOMEreg=/work/noaa/da/ggayno/save/ufs_utils.git/reg_tests.test/ice_blend export HOMEgfs=$PWD/../.. rm -fr $DATA From a418c7b15f8fd35bd9a7bb93ffa8064885cbb607 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Fri, 14 Jan 2022 15:51:13 +0000 Subject: [PATCH 18/18] More minor script clean up. Fixes #574. --- reg_tests/chgres_cube/driver.wcoss_dell_p3.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh b/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh index 3a03c2341..04ab66c72 100755 --- a/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh +++ b/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh @@ -70,9 +70,6 @@ export OMP_NUM_THREADS=1 bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J chgres01 -W 0:05 -x -n 6 \ -R "span[ptile=6]" -R "affinity[core(${OMP_NUM_THREADS}):distribute=balance]" "$PWD/25km.conus.gfs.grib2.sh" - -exit - #----------------------------------------------------------------------------- # Initialize CONUS 3-KM USING HRRR GRIB2 file WITH GFS PHYSICS. #-----------------------------------------------------------------------------