Release/public v2.1.0

.cicd/Jenkinsfile

@@ -16,7 +16,8 @@ pipeline {
         choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea', 'hera', 'jet', 'orion'], description: 'Specify the platform(s) to use')
         // Allow job runner to filter based on compiler
         choice(name: 'SRW_COMPILER_FILTER', choices: ['all', 'gnu', 'intel'], description: 'Specify the compiler(s) to use to build')
-        booleanParam name: 'SRW_WE2E_COMPREHENSIVE_TESTS', defaultValue: false, description: 'Whether to execute the comprehensive end-to-end tests'
+        // Uncomment the following line to re-enable comprehensive tests
+        // booleanParam name: 'SRW_WE2E_COMPREHENSIVE_TESTS', defaultValue: false, description: 'Whether to execute the comprehensive end-to-end tests'
     }
 
     stages {
@@ -145,6 +146,11 @@ pipeline {
                         steps {
                             echo "Testing SRW (${env.SRW_COMPILER}) on ${env.SRW_PLATFORM} (using ${env.WORKSPACE})"
 
+                            // Remove the following line to re-enable comprehensive tests
+                            sh 'SRW_WE2E_COMPREHENSIVE_TESTS=false bash --login "${WORKSPACE}/.cicd/scripts/srw_test.sh"'
+
+                            // Uncomment the following block to re-enable comprehensive tests
+                            /*
                             // If executing for a Pull Request, check for the run_we2e_comprehensive_tests. If set,
                             // override the value of the SRW_WE2E_COMPREHENSIVE_TESTS parameter
                             script {
@@ -161,6 +167,7 @@ pipeline {
 
                                 sh "SRW_WE2E_COMPREHENSIVE_TESTS=${run_we2e_comprehensive_tests}" + ' bash --login "${WORKSPACE}/.cicd/scripts/srw_test.sh"'
                             }
+                            */
                         }
 
                         post {

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
 
@@ -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 = a644aaa
+hash = e227247
 local_path = sorc/UPP
 required = True
 

modulefiles/build_noaacloud_intel.lua

@@ -7,6 +7,7 @@ whatis([===[Loads libraries needed for building the UFS SRW App on NOAA cloud ]=
 
 prepend_path("MODULEPATH", "/contrib/EPIC/spack-stack/envs/srw-develop-intel/install/modulefiles/Core")
 prepend_path("MODULEPATH", "/apps/modules/modulefiles")
+prepend_path("PATH", "/contrib/EPIC/bin")
 load("intel/2021.3.0")
 load("impi/2021.3.0")
 load("stack-intel")

modulefiles/tasks/noaacloud/run_vx.local.lua

@@ -0,0 +1 @@
+load("miniconda_regional_workflow")

modulefiles/tasks/orion/run_vx.local.lua

@@ -0,0 +1 @@
+load("miniconda_regional_workflow")

modulefiles/wflow_noaacloud.lua

@@ -14,6 +14,7 @@ load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))
 setenv("PROJ_LIB","/contrib/EPIC/miniconda3/4.12.0/envs/regional_workflow/share/proj")
 setenv("OPT","/contrib/EPIC/hpc-modules")
 append_path("PATH","/contrib/EPIC/miniconda3/4.12.0/envs/regional_workflow/bin")
+prepend_path("PATH","/contrib/EPIC/bin")
 
 if mode() == "load" then
    LmodMsgRaw([===[Please do the following to activate conda:

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:

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" /

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

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

sorc/CMakeLists.txt

@@ -38,7 +38,7 @@ if (BUILD_UFS)
   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)

tests/WE2E/machine_suites/comprehensive

@@ -1,57 +1,27 @@
-grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
-grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta
-grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_RAP_suite_HRRR
-grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_HRRR
-grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_RRFS_v1beta
-grid_RRFS_CONUScompact_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
-grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR
-grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR
+grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
 grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
-grid_SUBCONUS_Ind_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
-grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_HRRR
-grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
-custom_ESGgrid
+grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
+grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
+grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR
+grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_HRRR
+grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_HRRR
+grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta
+grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR
+grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta
+grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR
+grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta
+grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR
+community_ensemble_008mems
+community_ensemble_2mems
 deactivate_tasks
 inline_post
+MET_ensemble_verification
+MET_verification
+custom_ESGgrid
+custom_GFDLgrid
+custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_FALSE
+custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_TRUE
 specify_DOT_OR_USCORE
 specify_DT_ATMOS_LAYOUT_XY_BLOCKSIZE
 specify_RESTART_INTERVAL
 specify_template_filenames
-community_ensemble_2mems
-community_ensemble_2mems_stoch
-community_ensemble_008mems
-custom_GFDLgrid
-custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_FALSE
-custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_TRUE
-grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
-grid_CONUS_3km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
-grid_RRFS_AK_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
-grid_RRFS_AK_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
-grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
-grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
-grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR
-grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta
-grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp
-grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp_regional
-grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
-grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR
-grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_2017_gfdlmp
-grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v15p2
-grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v16
-grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km
-grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
-grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
-grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR
-grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta
-grid_RRFS_CONUScompact_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
-grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_HRRR
-grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
-grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_RRFS_v1beta
-grid_RRFS_CONUScompact_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
-grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_HRRR
-grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
-grid_RRFS_NA_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta
-grid_RRFS_SUBCONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
-grid_RRFS_SUBCONUS_3km_ics_HRRR_lbcs_RAP_suite_GFS_v15p2
-nco_grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
-nco_grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km

tests/WE2E/machine_suites/fundamental

@@ -1,9 +1,6 @@
-grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
 grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
-grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_RAP_suite_HRRR
-grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v15p2
-grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR
-grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_RRFS_v1beta
-grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR
-grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
-nco_grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR
+grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
+grid_SUBCONUS_Ind_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
+grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
+grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_HRRR
+grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_WoFS_v0

tests/WE2E/test_configs/grids_extrn_mdls_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

tests/WE2E/test_configs/grids_extrn_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