[develop] Component hash updates, FV3_HRRR namelist changes

Externals.cfg

@@ -3,7 +3,7 @@ protocol = git
 repo_url = https://github.com/ufs-community/UFS_UTILS
 # Specify either a branch name or a hash but not both.
 #branch = develop
-hash = ae483bd
+hash = 6a7d534
 local_path = sorc/UFS_UTILS
 required = True
 
@@ -12,7 +12,7 @@ protocol = git
 repo_url = https://github.com/ufs-community/ufs-weather-model
 # Specify either a branch name or a hash but not both.
 #branch = develop
-hash = 24c51d1
+hash = 788897d
 local_path = sorc/ufs-weather-model
 required = True
 
@@ -21,7 +21,7 @@ protocol = git
 repo_url = https://github.com/NOAA-EMC/UPP
 # Specify either a branch name or a hash but not both.
 #branch = develop
-hash = dccb321
+hash = baa7751
 local_path = sorc/UPP
 required = True
 

parm/FV3.input.yml

@@ -66,16 +66,19 @@ FV3_WoFS_v0:
 
 FV3_HRRR:
   fv_core_nml: &HRRR_fv_core
-    hord_dp: -5
-    hord_mt: 5
-    hord_tm: 5
-    hord_vt: 5
+    hord_dp: 6
+    hord_mt: 6
+    hord_tm: 6
+    hord_vt: 6
+    hord_tr: 8
     kord_mt: 9
     kord_tm: -9
     kord_tr: 9
     kord_wz: 9
-    nord_tr: 2
-    nrows_blend: 10
+    nord_tr: 0
+    nrows_blend: 20
+    d_con: 0.5
+    n_sponge: 9
   gfs_physics_nml:
     <<: *RRFS_v1beta_phys
     cdmbgwd: [3.5, 1.0]
@@ -91,6 +94,16 @@ FV3_HRRR:
     lsm: 3
     lsoil_lsm: 9
     sfclay_compute_flux: True
+    diag_log: True
+    ialb: 2
+    iems: 2
+    isncond_opt: 2
+    isncovr_opt: 3
+    mosaic_lu: 0
+    mosaic_soil: 0
+    thsfc_loc: False
+    nst_anl:
+    nstf_name:
 
 FV3_RAP:
   fv_core_nml:

scripts/exregional_run_fcst.sh

@@ -436,6 +436,18 @@ cat > itag <<EOF
 EOF
 fi
 
+#
+#----------------------------------------------------------------------
+#
+# NOAHMP table copied from CCPP physics directory into $DATA directory.
+# This is a temporary solution that will need to be changed once NOAHMP
+# is included as a submodule in the weather model.
+#
+#----------------------------------------------------------------------
+#
+
+cp_vrfy ${CCPP_PHYS_DIR}/noahmptable.tbl .
+
 #
 #-----------------------------------------------------------------------
 #

tests/WE2E/machine_suites/comprehensive

@@ -58,7 +58,6 @@ grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_HRRR_suite_HRRR
 grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_WoFS_v0
 grid_SUBCONUS_Ind_3km_ics_NAM_lbcs_NAM_suite_GFS_v16
 grid_SUBCONUS_Ind_3km_ics_RAP_lbcs_RAP_suite_RRFS_v1beta_plot
-GST_release_public_v1
 long_fcst
 MET_ensemble_verification_only_vx
 MET_ensemble_verification_only_vx_time_lag

tests/WE2E/machine_suites/comprehensive.orion

@@ -49,7 +49,6 @@ grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_HRRR_suite_HRRR
 grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_WoFS_v0
 grid_SUBCONUS_Ind_3km_ics_NAM_lbcs_NAM_suite_GFS_v16
 grid_SUBCONUS_Ind_3km_ics_RAP_lbcs_RAP_suite_RRFS_v1beta_plot
-GST_release_public_v1
 MET_ensemble_verification_only_vx
 MET_verification_only_vx
 nco

tests/WE2E/machine_suites/coverage.hera.gnu.com

@@ -4,7 +4,6 @@ get_from_NOMADS_ics_FV3GFS_lbcs_FV3GFS
 grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR
 grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta
 grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_WoFS_v0
-GST_release_public_v1
 long_fcst
 MET_verification_only_vx
 MET_ensemble_verification_only_vx_time_lag

tests/WE2E/test_configs/custom_grids/config.custom_ESGgrid_SF_1p1km.yaml

@@ -8,8 +8,8 @@ user:
 workflow:
   CCPP_PHYS_SUITE: FV3_WoFS_v0
   GRID_GEN_METHOD: ESGgrid
-  DATE_FIRST_CYCL: '2019061500'
-  DATE_LAST_CYCL: '2019061500'
+  DATE_FIRST_CYCL: '2020080100'
+  DATE_LAST_CYCL: '2020080100'
   FCST_LEN_HRS: 6
   PREEXISTING_DIR_METHOD: rename
 task_make_grid:
@@ -22,14 +22,16 @@ task_make_grid:
   ESGgrid_WIDE_HALO_WIDTH: 6
   ESGgrid_PAZI: 0.0
 task_get_extrn_ics:
-  EXTRN_MDL_NAME_ICS: FV3GFS
-  FV3GFS_FILE_FMT_ICS: grib2
+  EXTRN_MDL_NAME_ICS: HRRR
   USE_USER_STAGED_EXTRN_FILES: true
+  EXTRN_MDL_FILES_ICS:
+    - '{yy}{jjj}{hh}00{fcst_hr:02d}00'
 task_get_extrn_lbcs:
-  EXTRN_MDL_NAME_LBCS: FV3GFS
-  FV3GFS_FILE_FMT_LBCS: grib2
+  EXTRN_MDL_NAME_LBCS: RAP
   LBC_SPEC_INTVL_HRS: 3
   USE_USER_STAGED_EXTRN_FILES: true
+  EXTRN_MDL_FILES_LBCS:
+    - '{yy}{jjj}{hh}00{fcst_hr:02d}00'
 task_run_fcst:
   DT_ATMOS: 15
   LAYOUT_X: 24

ush/config_defaults.yaml

@@ -659,12 +659,17 @@ workflow:
   #
   # *_FN and *_FP variables set the name and paths to the suite
   # definition files used for the experiment
+  #
+  # CCPP_PHYS_DIR:
+  # The directory of the CCPP physics source code. This is needed to
+  # link table(s) contained in that repository.
   #-----------------------------------------------------------------------
   #
   CCPP_PHYS_SUITE: "FV3_GFS_v16"
   CCPP_PHYS_SUITE_FN: 'suite_{{ CCPP_PHYS_SUITE }}.xml'
   CCPP_PHYS_SUITE_IN_CCPP_FP: '{{ [user.UFS_WTHR_MDL_DIR, "FV3", "ccpp", "suites", CCPP_PHYS_SUITE_FN] |path_join }}'
   CCPP_PHYS_SUITE_FP: '{{ [workflow.EXPTDIR, CCPP_PHYS_SUITE_FN]|path_join }}'
+  CCPP_PHYS_DIR: '{{ [user.UFS_WTHR_MDL_DIR, "FV3", "ccpp", "physics", "physics"] |path_join }}'
   #
   #-----------------------------------------------------------------------
   #