From 65f4e529719505b18f120ceb0e02fdc681857799 Mon Sep 17 00:00:00 2001 From: EdwardSnyder-NOAA Date: Tue, 14 Jun 2022 17:30:21 -0500 Subject: [PATCH 1/3] added 'fix_dir_input_grid' var --- scripts/exregional_make_ics.sh | 1 + scripts/exregional_make_lbcs.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/scripts/exregional_make_ics.sh b/scripts/exregional_make_ics.sh index 07bcadbfd..1c8561633 100755 --- a/scripts/exregional_make_ics.sh +++ b/scripts/exregional_make_ics.sh @@ -519,6 +519,7 @@ fi # settings=" 'config': { + 'fix_dir_input_grid': ${FIXgsm}, 'fix_dir_target_grid': ${FIXLAM}, 'mosaic_file_target_grid': ${FIXLAM}/${CRES}${DOT_OR_USCORE}mosaic.halo$((10#${NH4})).nc, 'orog_dir_target_grid': ${FIXLAM}, diff --git a/scripts/exregional_make_lbcs.sh b/scripts/exregional_make_lbcs.sh index 3580119ad..c32845829 100755 --- a/scripts/exregional_make_lbcs.sh +++ b/scripts/exregional_make_lbcs.sh @@ -443,6 +443,7 @@ list file has not specified for this external LBC model (EXTRN_MDL_NAME_LBCS): # settings=" 'config': { + 'fix_dir_input_grid': ${FIXgsm}, 'fix_dir_target_grid': ${FIXLAM}, 'mosaic_file_target_grid': ${FIXLAM}/${CRES}${DOT_OR_USCORE}mosaic.halo$((10#${NH4})).nc, 'orog_dir_target_grid': ${FIXLAM}, From ccf6e0f185805a6ffa5480ec9046a9384e19f997 Mon Sep 17 00:00:00 2001 From: EdwardSnyder-NOAA Date: Tue, 14 Jun 2022 18:09:26 -0500 Subject: [PATCH 2/3] added filename --- ...g.grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_WoFS_v0.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_WoFS_v0.sh b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_WoFS_v0.sh index e30ab5f4d..dcd51b8a5 100644 --- a/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_WoFS_v0.sh +++ b/tests/WE2E/test_configs/grids_extrn_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_WoFS_v0.sh @@ -17,10 +17,12 @@ CCPP_PHYS_SUITE="FV3_WoFS_v0" EXTRN_MDL_NAME_ICS="HRRR" EXTRN_MDL_NAME_LBCS="RAP" USE_USER_STAGED_EXTRN_FILES="TRUE" +EXTRN_MDL_FILES_ICS=( '{yy}{jjj}{hh}00{fcst_hr:02d}00' ) +EXTRN_MDL_FILES_LBCS=( '{yy}{jjj}{hh}00{fcst_hr:02d}00' ) DATE_FIRST_CYCL="20200801" DATE_LAST_CYCL="20200801" CYCL_HRS=( "00" ) FCST_LEN_HRS="6" -LBC_SPEC_INTVL_HRS="3" +LBC_SPEC_INTVL_HRS="6" From 8d15af5903a47ad0eb372ff32e972879af0fccfd Mon Sep 17 00:00:00 2001 From: EdwardSnyder-NOAA Date: Tue, 14 Jun 2022 19:23:57 -0500 Subject: [PATCH 3/3] update file paths to v2p0 --- ush/machine/cheyenne.sh | 2 +- ush/machine/gaea.sh | 2 +- ush/machine/hera.sh | 2 +- ush/machine/jet.sh | 2 +- ush/machine/noaacloud.sh | 2 +- ush/machine/odin.sh | 2 +- ush/machine/orion.sh | 2 +- ush/machine/stampede.sh | 4 ++-- ush/machine/wcoss_dell_p3.sh | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ush/machine/cheyenne.sh b/ush/machine/cheyenne.sh index cf80db74f..5c8913436 100644 --- a/ush/machine/cheyenne.sh +++ b/ush/machine/cheyenne.sh @@ -46,7 +46,7 @@ QUEUE_HPSS=${QUEUE_HPSS:-"regular"} QUEUE_FCST=${QUEUE_FCST:-"regular"} # UFS SRW App specific paths -staged_data_dir="/glade/p/ral/jntp/UFS_SRW_App/develop" +staged_data_dir="/glade/p/ral/jntp/UFS_SRW_App/v2p0" FIXgsm=${FIXgsm:-"${staged_data_dir}/fix/fix_am"} FIXaer=${FIXaer:-"${staged_data_dir}/fix/fix_aer"} FIXlut=${FIXlut:-"${staged_data_dir}/fix/fix_lut"} diff --git a/ush/machine/gaea.sh b/ush/machine/gaea.sh index 88f715366..52c27e55c 100755 --- a/ush/machine/gaea.sh +++ b/ush/machine/gaea.sh @@ -48,7 +48,7 @@ QUEUE_FCST=${QUEUE_DEFAULT:-"normal"} WTIME_MAKE_LBCS="00:60:00" # UFS SRW App specific paths -staged_data_dir="/lustre/f2/pdata/ncep/UFS_SRW_App/develop" +staged_data_dir="/lustre/f2/pdata/ncep/UFS_SRW_App/v2p0" FIXgsm=${FIXgsm:-"${staged_data_dir}/fix/fix_am"} FIXaer=${FIXaer:-"${staged_data_dir}/fix/fix_aer"} FIXlut=${FIXlut:-"${staged_data_dir}/fix/fix_lut"} diff --git a/ush/machine/hera.sh b/ush/machine/hera.sh index bf587a71e..c8ae3eac7 100644 --- a/ush/machine/hera.sh +++ b/ush/machine/hera.sh @@ -53,7 +53,7 @@ PARTITION_FCST=${PARTITION_FCST:-"hera"} QUEUE_FCST=${QUEUE_FCST:-"batch"} # UFS SRW App specific paths -staged_data_dir="/scratch2/BMC/det/UFS_SRW_App/develop" +staged_data_dir="/scratch2/BMC/det/UFS_SRW_App/v2p0" FIXgsm=${FIXgsm:-"${staged_data_dir}/fix/fix_am"} FIXaer=${FIXaer:-"${staged_data_dir}/fix/fix_aer"} FIXlut=${FIXlut:-"${staged_data_dir}/fix/fix_lut"} diff --git a/ush/machine/jet.sh b/ush/machine/jet.sh index f383090ec..b0b55e6d1 100644 --- a/ush/machine/jet.sh +++ b/ush/machine/jet.sh @@ -67,7 +67,7 @@ PARTITION_FCST=${PARTITION_FCST:-"sjet,vjet,kjet,xjet"} QUEUE_FCST=${QUEUE_FCST:-"batch"} # UFS SRW App specific paths -staged_data_dir="/mnt/lfs4/BMC/wrfruc/UFS_SRW_App/develop" +staged_data_dir="/mnt/lfs4/BMC/wrfruc/UFS_SRW_App/v2p0" FIXgsm=${FIXgsm:-"${staged_data_dir}/fix/fix_am"} FIXaer=${FIXaer:-"${staged_data_dir}/fix/fix_aer"} FIXlut=${FIXlut:-"${staged_data_dir}/fix/fix_lut"} diff --git a/ush/machine/noaacloud.sh b/ush/machine/noaacloud.sh index 62a698da8..3116b040d 100755 --- a/ush/machine/noaacloud.sh +++ b/ush/machine/noaacloud.sh @@ -49,7 +49,7 @@ NCORES_PER_NODE=${NCORES_PER_NODE:-36} SCHED=${SCHED:-"slurm"} # UFS SRW App specific paths -staged_data_dir="/contrib/EPIC/UFS_SRW_App/develop" +staged_data_dir="/contrib/EPIC/UFS_SRW_App/v2p0" FIXgsm=${FIXgsm:-"${staged_data_dir}/fix/fix_am"} FIXaer=${FIXaer:-"${staged_data_dir}/fix/fix_aer"} FIXlut=${FIXlut:-"${staged_data_dir}/fix/fix_lut"} diff --git a/ush/machine/odin.sh b/ush/machine/odin.sh index 58d360a63..16eebad38 100644 --- a/ush/machine/odin.sh +++ b/ush/machine/odin.sh @@ -9,7 +9,7 @@ function file_location() { external_model=${1} external_file_fmt=${2} - staged_data_dir="/scratch/ywang/UFS_SRW_App/develop" + staged_data_dir="/scratch/ywang/UFS_SRW_App/v2p0" location="" case ${external_model} in diff --git a/ush/machine/orion.sh b/ush/machine/orion.sh index b8032e241..6e403c3e0 100644 --- a/ush/machine/orion.sh +++ b/ush/machine/orion.sh @@ -45,7 +45,7 @@ PARTITION_FCST=${PARTITION_FCST:-"orion"} QUEUE_FCST=${QUEUE_FCST:-"batch"} # UFS SRW App specific paths -staged_data_dir="/work/noaa/fv3-cam/UFS_SRW_App/develop" +staged_data_dir="/work/noaa/fv3-cam/UFS_SRW_App/v2p0" FIXgsm=${FIXgsm:-"${staged_data_dir}/fix/fix_am"} FIXaer=${FIXaer:-"${staged_data_dir}/fix/fix_aer"} FIXlut=${FIXlut:-"${staged_data_dir}/fix/fix_lut"} diff --git a/ush/machine/stampede.sh b/ush/machine/stampede.sh index 3f879ea22..89e7e68c9 100644 --- a/ush/machine/stampede.sh +++ b/ush/machine/stampede.sh @@ -9,7 +9,7 @@ function file_location() { external_model=${1} external_file_fmt=${2} - staged_data_dir="/work2/00315/tg455890/stampede2/UFS_SRW_App/develop" + staged_data_dir="/work2/00315/tg455890/stampede2/UFS_SRW_App/v2p0" location="" case ${external_model} in @@ -62,7 +62,7 @@ PARTITION_FCST=${PARTITION_FCST:-"normal"} QUEUE_FCST=${QUEUE_FCST:-"normal"} # UFS SRW App specific paths -staged_data_dir="/work2/00315/tg455890/stampede2/UFS_SRW_App/develop" +staged_data_dir="/work2/00315/tg455890/stampede2/UFS_SRW_App/v2p0" FIXgsm=${FIXgsm:-"${staged_data_dir}/fix/fix_am"} FIXaer=${FIXaer:-"${staged_data_dir}/fix/fix_aer"} FIXlut=${FIXlut:-"${staged_data_dir}/fix/fix_lut"} diff --git a/ush/machine/wcoss_dell_p3.sh b/ush/machine/wcoss_dell_p3.sh index 9bf525a35..514645fa1 100644 --- a/ush/machine/wcoss_dell_p3.sh +++ b/ush/machine/wcoss_dell_p3.sh @@ -57,7 +57,7 @@ QUEUE_HPSS=${QUEUE_HPSS:-"dev_transfer"} QUEUE_FCST=${QUEUE_FCST:-"dev"} # UFS SRW App specific paths -staged_data_dir="/gpfs/dell2/emc/modeling/noscrub/UFS_SRW_App/develop" +staged_data_dir="/gpfs/dell2/emc/modeling/noscrub/UFS_SRW_App/v2p0" FIXgsm=${FIXgsm:-"${staged_data_dir}/fix/fix_am"} FIXaer=${FIXaer:-"${staged_data_dir}/fix/fix_aer"} FIXlut=${FIXlut:-"${staged_data_dir}/fix/fix_lut"}