From 182e53fed53cb039d38bcf3dea1827e0581896ef Mon Sep 17 00:00:00 2001 From: George Gayno Date: Mon, 6 Dec 2021 16:42:29 +0000 Subject: [PATCH 1/2] Point to new role account regression test directory. Part of #600. --- reg_tests/chgres_cube/driver.hera.sh | 2 +- reg_tests/global_cycle/driver.hera.sh | 2 +- reg_tests/grid_gen/driver.hera.sh | 2 +- reg_tests/ice_blend/driver.hera.sh | 2 +- reg_tests/snow2mdl/driver.hera.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/reg_tests/chgres_cube/driver.hera.sh b/reg_tests/chgres_cube/driver.hera.sh index f68e2726b..649a11e54 100755 --- a/reg_tests/chgres_cube/driver.hera.sh +++ b/reg_tests/chgres_cube/driver.hera.sh @@ -46,7 +46,7 @@ QUEUE="${QUEUE:-batch}" export HOMEufs=$PWD/../.. -export HOMEreg=/scratch1/NCEPDEV/da/George.Gayno/noscrub/reg_tests/chgres_cube +export HOMEreg=/scratch1/NCEPDEV/nems/role.ufsutils/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 a7058347a..77c3c2b87 100755 --- a/reg_tests/global_cycle/driver.hera.sh +++ b/reg_tests/global_cycle/driver.hera.sh @@ -38,7 +38,7 @@ QUEUE="${QUEUE:-batch}" DATA_DIR="${WORK_DIR}/reg-tests/global-cycle" -export HOMEreg=/scratch1/NCEPDEV/da/George.Gayno/noscrub/reg_tests/global_cycle +export HOMEreg=/scratch1/NCEPDEV/nems/role.ufsutils/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 11ebb7c76..77962195f 100755 --- a/reg_tests/grid_gen/driver.hera.sh +++ b/reg_tests/grid_gen/driver.hera.sh @@ -46,7 +46,7 @@ export APRUN=time export APRUN_SFC=srun export OMP_STACKSIZE=2048m export machine=HERA -export HOMEreg=/scratch1/NCEPDEV/da/George.Gayno/noscrub/reg_tests/grid_gen/baseline_data +export HOMEreg=/scratch1/NCEPDEV/nems/role.ufsutils/reg_tests/grid_gen/baseline_data ulimit -a #ulimit -s unlimited diff --git a/reg_tests/ice_blend/driver.hera.sh b/reg_tests/ice_blend/driver.hera.sh index 3b7d9c4da..d3b45db45 100755 --- a/reg_tests/ice_blend/driver.hera.sh +++ b/reg_tests/ice_blend/driver.hera.sh @@ -49,7 +49,7 @@ export COPYGB=/scratch2/NCEPDEV/nwprod/NCEPLIBS/utils/grib_util.v1.1.1/exec/copy export COPYGB2=/scratch2/NCEPDEV/nwprod/NCEPLIBS/utils/grib_util.v1.1.1/exec/copygb2 export CNVGRIB=/scratch2/NCEPDEV/nwprod/NCEPLIBS/utils/grib_util.v1.1.1/exec/cnvgrib -export HOMEreg=/scratch1/NCEPDEV/da/George.Gayno/noscrub/reg_tests/ice_blend +export HOMEreg=/scratch1/NCEPDEV/nems/role.ufsutils/reg_tests/ice_blend export HOMEgfs=$PWD/../.. rm -fr $DATA diff --git a/reg_tests/snow2mdl/driver.hera.sh b/reg_tests/snow2mdl/driver.hera.sh index 9885f0ac9..ae8bdedc6 100755 --- a/reg_tests/snow2mdl/driver.hera.sh +++ b/reg_tests/snow2mdl/driver.hera.sh @@ -45,7 +45,7 @@ export DATA="${DATA}/reg-tests/snow2mdl" rm -fr $DATA -export HOMEreg=/scratch1/NCEPDEV/da/George.Gayno/noscrub/reg_tests/snow2mdl +export HOMEreg=/scratch1/NCEPDEV/nems/role.uftutils/reg_tests/snow2mdl export HOMEgfs=$PWD/../.. 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 From eb7e31545dc67a9a7d4d804ac362fdcd4abb4645 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Mon, 6 Dec 2021 18:53:13 +0000 Subject: [PATCH 2/2] Update location of regression test directories. Part of #600. --- reg_tests/chgres_cube/driver.hera.sh | 2 +- reg_tests/global_cycle/driver.hera.sh | 2 +- reg_tests/grid_gen/driver.hera.sh | 2 +- reg_tests/ice_blend/driver.hera.sh | 2 +- reg_tests/rt.sh | 2 +- reg_tests/snow2mdl/driver.hera.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/reg_tests/chgres_cube/driver.hera.sh b/reg_tests/chgres_cube/driver.hera.sh index 649a11e54..dd911d241 100755 --- a/reg_tests/chgres_cube/driver.hera.sh +++ b/reg_tests/chgres_cube/driver.hera.sh @@ -46,7 +46,7 @@ QUEUE="${QUEUE:-batch}" export HOMEufs=$PWD/../.. -export HOMEreg=/scratch1/NCEPDEV/nems/role.ufsutils/reg_tests/chgres_cube +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 77c3c2b87..a781020d0 100755 --- a/reg_tests/global_cycle/driver.hera.sh +++ b/reg_tests/global_cycle/driver.hera.sh @@ -38,7 +38,7 @@ QUEUE="${QUEUE:-batch}" DATA_DIR="${WORK_DIR}/reg-tests/global-cycle" -export HOMEreg=/scratch1/NCEPDEV/nems/role.ufsutils/reg_tests/global_cycle +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 77962195f..b8de3f8d2 100755 --- a/reg_tests/grid_gen/driver.hera.sh +++ b/reg_tests/grid_gen/driver.hera.sh @@ -46,7 +46,7 @@ export APRUN=time export APRUN_SFC=srun export OMP_STACKSIZE=2048m export machine=HERA -export HOMEreg=/scratch1/NCEPDEV/nems/role.ufsutils/reg_tests/grid_gen/baseline_data +export HOMEreg=/scratch1/NCEPDEV/nems/role.ufsutils/ufs_utils/reg_tests/grid_gen/baseline_data ulimit -a #ulimit -s unlimited diff --git a/reg_tests/ice_blend/driver.hera.sh b/reg_tests/ice_blend/driver.hera.sh index d3b45db45..3ce993fe4 100755 --- a/reg_tests/ice_blend/driver.hera.sh +++ b/reg_tests/ice_blend/driver.hera.sh @@ -49,7 +49,7 @@ export COPYGB=/scratch2/NCEPDEV/nwprod/NCEPLIBS/utils/grib_util.v1.1.1/exec/copy export COPYGB2=/scratch2/NCEPDEV/nwprod/NCEPLIBS/utils/grib_util.v1.1.1/exec/copygb2 export CNVGRIB=/scratch2/NCEPDEV/nwprod/NCEPLIBS/utils/grib_util.v1.1.1/exec/cnvgrib -export HOMEreg=/scratch1/NCEPDEV/nems/role.ufsutils/reg_tests/ice_blend +export HOMEreg=/scratch1/NCEPDEV/nems/role.ufsutils/ufs_utils/reg_tests/ice_blend export HOMEgfs=$PWD/../.. rm -fr $DATA diff --git a/reg_tests/rt.sh b/reg_tests/rt.sh index 9630f178d..dd25f276a 100755 --- a/reg_tests/rt.sh +++ b/reg_tests/rt.sh @@ -16,7 +16,7 @@ cd ${WORK_DIR} rm -f reg_test_results.txt rm -rf UFS_UTILS -git clone --recursive https://github.com/NOAA-EMC/UFS_UTILS.git +git clone --recursive https://github.com/ufs-community/UFS_UTILS.git cd UFS_UTILS source sorc/machine-setup.sh diff --git a/reg_tests/snow2mdl/driver.hera.sh b/reg_tests/snow2mdl/driver.hera.sh index ae8bdedc6..d83b501e0 100755 --- a/reg_tests/snow2mdl/driver.hera.sh +++ b/reg_tests/snow2mdl/driver.hera.sh @@ -45,7 +45,7 @@ export DATA="${DATA}/reg-tests/snow2mdl" rm -fr $DATA -export HOMEreg=/scratch1/NCEPDEV/nems/role.uftutils/reg_tests/snow2mdl +export HOMEreg=/scratch1/NCEPDEV/nems/role.ufsutils/ufs_utils/reg_tests/snow2mdl export HOMEgfs=$PWD/../.. 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