[develop] Update ufs-weather-model hash and add WoFS_v0 to suites and…

… tests
ufs-community · Nov 18, 2022 · 1769b7a · 1769b7a
1 parent d03e646
commit 1769b7a
Show file tree

Hide file tree

Showing 10 changed files with 526 additions and 3 deletions.
diff --git a/Externals.cfg b/Externals.cfg
@@ -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 = 52072c5
+hash = 84b28ec
 local_path = sorc/ufs-weather-model
 required = True
 

diff --git a/parm/FV3.input.yml b/parm/FV3.input.yml
@@ -33,6 +33,36 @@ FV3_RRFS_v1beta:
     iopt_trs: 2
     lsm: 2
     lsoil_lsm: 4
+FV3_WoFS_v0:
+  gfs_physics_nml:
+    do_deep: False
+    imfdeepcnv: 0
+    imfshalcnv: 0
+    iopt_alb: 2
+    iopt_btr: 1
+    iopt_crs: 1
+    iopt_dveg: 2
+    iopt_frz: 1
+    iopt_inf: 1
+    iopt_rad: 1
+    iopt_run: 1
+    iopt_sfc: 1
+    iopt_snf: 4
+    iopt_stc: 1
+    iopt_tbot: 2
+    do_mynnsfclay: True
+    imfdeepcnv: -1
+    imfshalcnv: -1
+    lsm: 1
+    lsoil_lsm: 4
+    imp_physics: 17
+    nssl_cccn: 0.6e+9
+    nssl_hail_on: True
+    nssl_ccn_on: True
+  fv_core_nml:
+    nwat: 7
+  fv_diagnostics_nml:
+    do_hailcast: True
 
 FV3_HRRR:
   fv_core_nml:

diff --git a/parm/diag_table.FV3_WoFS_v0 b/parm/diag_table.FV3_WoFS_v0
diff --git a/parm/field_table.FV3_WoFS_v0 b/parm/field_table.FV3_WoFS_v0
@@ -0,0 +1,91 @@
+# added by FRE: sphum must be present in atmos
+# specific humidity for moist runs
+ "TRACER", "atmos_mod", "sphum"
+           "longname",     "specific humidity"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic cloud water mixing ratio
+ "TRACER", "atmos_mod", "liq_wat"
+           "longname",     "cloud water mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic ice water mixing ratio
+ "TRACER", "atmos_mod", "ice_wat"
+           "longname",     "cloud ice mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic rain water mixing ratio
+ "TRACER", "atmos_mod", "rainwat"
+           "longname",     "rain water mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic snow water mixing ratio
+ "TRACER", "atmos_mod", "snowwat"
+           "longname",     "snow mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic graupel mixing ratio
+ "TRACER", "atmos_mod", "graupel"
+           "longname",     "graupel mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic hail mixing ratio
+ "TRACER", "atmos_mod", "hailwat"
+           "longname",     "hail mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=0" /
+# prognostic cloud water number concentration
+ "TRACER", "atmos_mod", "water_nc"
+           "longname",     "cloud liquid water number concentration"
+           "units",        "/kg"
+       "profile_type", "fixed", "surface_value=0.0" /
+# prognostic rain number concentration
+ "TRACER", "atmos_mod", "rain_nc"
+           "longname",     "rain number concentration"
+           "units",        "/kg"
+       "profile_type", "fixed", "surface_value=0.0" /
+# prognostic cloud ice number concentration
+ "TRACER", "atmos_mod", "ice_nc"
+           "longname",     "cloud ice number concentration"
+           "units",        "/kg"
+       "profile_type", "fixed", "surface_value=0.0" /
+# prognostic snow number concentration
+ "TRACER", "atmos_mod", "snow_nc"
+           "longname",     "snow number concentration"
+           "units",        "/kg"
+       "profile_type", "fixed", "surface_value=0.0" /
+# prognostic graupel number concentration
+ "TRACER", "atmos_mod", "graupel_nc"
+           "longname",     "graupel number concentration"
+           "units",        "/kg"
+       "profile_type", "fixed", "surface_value=0.0" /
+# prognostic hail number concentration
+ "TRACER", "atmos_mod", "hail_nc"
+           "longname",     "hail number concentration"
+           "units",        "/kg"
+       "profile_type", "fixed", "surface_value=0.0" /
+# prognostic graupel volume
+ "TRACER", "atmos_mod", "graupel_vol"
+           "longname",     "graupel water particle volume"
+           "units",        "m3/kg"
+       "profile_type", "fixed", "surface_value=0" /
+# prognostic hail volume
+ "TRACER", "atmos_mod", "hail_vol"
+           "longname",     "hail water particle volume"
+           "units",        "m3/kg"
+       "profile_type", "fixed", "surface_value=0" /
+# prognostic CCN number concentration
+ "TRACER", "atmos_mod", "ccn_nc"
+           "longname",     "ccn number concentration"
+           "units",        "/kg"
+       "profile_type", "fixed", "surface_value=0" /
+# prognostic ozone mixing ratio tracer
+ "TRACER", "atmos_mod", "o3mr"
+           "longname",     "ozone mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic subgrid scale turbulent kinetic energy
+ "TRACER", "atmos_mod", "sgs_tke"
+           "longname",     "subgrid scale turbulent kinetic energy"
+           "units",        "m2/s2"
+       "profile_type", "fixed", "surface_value=0.0" /
diff --git a/scripts/exregional_make_ics.sh b/scripts/exregional_make_ics.sh
@@ -124,6 +124,7 @@ case "${CCPP_PHYS_SUITE}" in
 #
   "FV3_RRFS_v1beta" | \
   "FV3_GFS_v15_thompson_mynn_lam3km" | \
+  "FV3_WoFS_v0" | \
   "FV3_HRRR" )
     if [ "${EXTRN_MDL_NAME_ICS}" = "RAP" ] || \
        [ "${EXTRN_MDL_NAME_ICS}" = "HRRR" ]; then

diff --git a/scripts/exregional_make_lbcs.sh b/scripts/exregional_make_lbcs.sh
@@ -122,6 +122,7 @@ case "${CCPP_PHYS_SUITE}" in
 #
   "FV3_RRFS_v1beta" | \
   "FV3_GFS_v15_thompson_mynn_lam3km" | \
+  "FV3_WoFS_v0" | \
   "FV3_HRRR" )
     if [ "${EXTRN_MDL_NAME_LBCS}" = "RAP" ] || \
        [ "${EXTRN_MDL_NAME_LBCS}" = "HRRR" ]; then

diff --git a/sorc/CMakeLists.txt b/sorc/CMakeLists.txt
@@ -35,10 +35,10 @@ endif()
 
 # Build UFS weather model
 if (BUILD_UFS)
-  list(APPEND TARGET_LIST ufs-weather-model)
+  list(APPEND TARGET_LIST UFS)
 
   if(NOT CCPP_SUITES)
-    set(CCPP_SUITES "FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_regional,FV3_GFS_v15p2,FV3_GFS_v16,FV3_RRFS_v1beta,FV3_HRRR,FV3_GFS_v15_thompson_mynn_lam3km")
+    set(CCPP_SUITES "FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_regional,FV3_GFS_v15p2,FV3_GFS_v16,FV3_RRFS_v1beta,FV3_HRRR,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0")
   endif()
 
   if(NOT APP)

diff --git a/...s_suites_community/config.grid_SUBCONUS_Ind_3km_ics_FV3GFS_lbcs_FV3GFS_suite_WoFS_v0.yaml b/...s_suites_community/config.grid_SUBCONUS_Ind_3km_ics_FV3GFS_lbcs_FV3GFS_suite_WoFS_v0.yaml
@@ -0,0 +1,24 @@
+metadata:
+  description: |-
+    This test is to ensure that the workflow running in community mode
+    completes successfully on the RRFS_SUBCONUS_3km grid using the WoFS_v0
+    physics suite with ICs and LBCs derived from the FV3GFS.
+user:
+  RUN_ENVIR: community
+workflow:
+  CCPP_PHYS_SUITE: FV3_WoFS_v0
+  DATE_FIRST_CYCL: '20190615'
+  DATE_LAST_CYCL: '20190615'
+  FCST_LEN_HRS: 6
+  PREEXISTING_DIR_METHOD: rename
+task_get_extrn_ics:
+  EXTRN_MDL_NAME_ICS: FV3GFS
+  FV3GFS_FILE_FMT_ICS: grib2
+  USE_USER_STAGED_EXTRN_FILES: true
+task_get_extrn_lbcs:
+  EXTRN_MDL_NAME_LBCS: FV3GFS
+  LBC_SPEC_INTVL_HRS: 3
+  FV3GFS_FILE_FMT_LBCS: grib2
+  USE_USER_STAGED_EXTRN_FILES: true
+task_run_fcst:
+  PREDEF_GRID_NAME: SUBCONUS_Ind_3km
diff --git a/...n_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_WoFS_v0.yaml b/...n_mdls_suites_community/config.grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_WoFS_v0.yaml
@@ -0,0 +1,26 @@
+metadata:
+  description: |-
+    This test is to ensure that the workflow running in community mode
+    completes successfully on the SUBCONUS_Ind_3km grid using the HRRR
+    physics suite with ICs derived from HRRR and LBCs derived from the RAP.
+user:
+  RUN_ENVIR: community
+workflow:
+  CCPP_PHYS_SUITE: FV3_WoFS_v0
+  DATE_FIRST_CYCL: '2020081000'
+  DATE_LAST_CYCL: '2020081000'
+  FCST_LEN_HRS: 6
+  PREEXISTING_DIR_METHOD: rename
+task_get_extrn_ics:
+  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: RAP
+  LBC_SPEC_INTVL_HRS: 6
+  USE_USER_STAGED_EXTRN_FILES: true
+  EXTRN_MDL_FILES_LBCS:
+    - '{yy}{jjj}{hh}00{fcst_hr:02d}00'
+task_run_fcst:
+  PREDEF_GRID_NAME: SUBCONUS_Ind_3km
diff --git a/ush/valid_param_vals.yaml b/ush/valid_param_vals.yaml
@@ -40,6 +40,7 @@ valid_vals_CCPP_PHYS_SUITE: [
 "FV3_GFS_v15_thompson_mynn_lam3km",
 "FV3_GFS_v16",
 "FV3_RRFS_v1beta",
+"FV3_WoFS_v0",
 "FV3_HRRR"
 ] 
 valid_vals_GFDLgrid_NUM_CELLS: [48, 96, 192, 384, 768, 1152, 3072]