ufs-community · BrianCurtis-NOAA · May 17, 2022 · Nov 25, 2020 · Dec 1, 2020 · Dec 8, 2020
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  url = https://github.com/SamuelTrahanNOAA/fv3atm
+  branch = gsl/merge-develop-to-community
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3

diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -871,6 +871,10 @@ export NSSL_HAIL_ON=.false.
 export NSSL_CCN_ON=.true.
 export NSSL_INVERTCCN=.true.
 
+# Smoke
+export RRFS_SMOKE=.false.
+export SEAS_OPT=2
+
 # GWD
 export LDIAG_UGWP=.false.
 export DO_UGWP=.false.
@@ -911,6 +915,7 @@ export DO_MYNNEDMF=.false.
 export DO_MYJPBL=.false.
 export HURR_PBL=.false.
 export MONINQ_FAC=1.0
+export SFCLAY_COMPUTE_FLUX=.false.
 
 # Shallow/deep convection
 export DO_DEEP=.true.

diff --git a/tests/parm/diag_table/diag_additional_rrfs_smoke b/tests/parm/diag_table/diag_additional_rrfs_smoke
@@ -0,0 +1,21 @@
+# This file contains diag_table entries for the RRFS smoke.
+# It should be appended to the end of the diag_table before execution of the test.
+
+# Tracers
+"gfs_dyn",     "smoke",       "smoke",     "fv3_history",  "all",  .false.,  "none",  2
+"gfs_dyn",     "dust",        "dust",      "fv3_history",  "all",  .false.,  "none",  2
+
+# Aerosols emission for smoke
+"gfs_sfc",     "emdust",       "emdust",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "emseas",       "emseas",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "emanoc",       "emanoc",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "coef_bb_dc",   "coef_bb_c",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "min_fplume",   "min_fplume",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "max_fplume",   "max_fplume",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "hwp",          "hwp",           "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "ebb_smoke_hr", "ebb_smoke_hr",  "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "frp_hr",       "frp_hr",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "frp_std_hr",   "frp_std_hr",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "ebu_smoke",    "ebu_smoke",     "fv3_history",    "all",  .false.,  "none",  2
+"gfs_phys",    "smoke_ext",    "smoke_ext",     "fv3_history",    "all",  .false.,  "none",  2
+"gfs_phys",    "dust_ext",     "dust_ext",      "fv3_history",    "all",  .false.,  "none",  2
diff --git a/tests/parm/field_table/field_table_thompson_aero_tke_smoke b/tests/parm/field_table/field_table_thompson_aero_tke_smoke
@@ -0,0 +1,75 @@
+# 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=3.e-6" /
+# 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 water mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic Grau water mixing ratio
+ "TRACER", "atmos_mod", "graupel"
+           "longname",     "graupel mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# 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 cloud ice number concentration
+ "TRACER", "atmos_mod", "ice_nc"
+           "longname",     "cloud ice 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 ozone mixing ratio tracer
+ "TRACER", "atmos_mod", "o3mr"
+           "longname",     "ozone mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# water- and ice-friendly aerosols (Thompson)
+ "TRACER", "atmos_mod", "liq_aero"
+           "longname",     "water-friendly aerosol number concentration"
+           "units",        "/kg"
+       "profile_type", "fixed", "surface_value=0.0" /
+ "TRACER", "atmos_mod", "ice_aero"
+           "longname",     "ice-friendly aerosol number concentration"
+           "units",        "/kg"
+       "profile_type", "fixed", "surface_value=0.0" /
+# 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" /
+# prognostic smoke mixing ratio tracer
+ "TRACER", "atmos_mod", "smoke"
+           "longname",     "smoke mixing ratio"
+           "units",        "ug/kg"
+       "profile_type", "fixed", "surface_value=1.e-7" /
+# prognostic dust mixing ratio tracer
+ "TRACER", "atmos_mod", "dust"
+           "longname",     "dust mixing ratio"
+           "units",        "ug/kg"
+       "profile_type", "fixed", "surface_value=1.e-7" /
diff --git a/tests/parm/rap.nml.IN b/tests/parm/rap.nml.IN
@@ -107,6 +107,7 @@ deflate_level=1
 /
 
 &gfs_physics_nml
+  sfclay_compute_flux = @[SFCLAY_COMPUTE_FLUX]
   fhzero       = @[FHZERO]
   h2o_phys     = .true.
   ldiag3d      = @[LDIAG3D]

diff --git a/tests/parm/regional_stoch.nml.IN b/tests/parm/regional_stoch.nml.IN
@@ -140,6 +140,7 @@
 /
 
 &gfs_physics_nml
+    sfclay_compute_flux = @[SFCLAY_COMPUTE_FLUX]
     bl_mynn_edmf = 1
     bl_mynn_edmf_mom = 1
     bl_mynn_tkeadvect = .true.

diff --git a/tests/parm/rrfs_conus13km_hrrr.nml.IN b/tests/parm/rrfs_conus13km_hrrr.nml.IN
@@ -1,3 +1,6 @@
+! This configuration is supposed to match the rrfs_dev1 parallel, so
+! do not change the namelist without checking the current parallel.
+
 &atmos_model_nml
     blocksize = 32
     ccpp_suite = '@[CCPP_SUITE]'
@@ -41,7 +44,7 @@
 
 &fms_nml
     clock_grain = 'ROUTINE'
-    domains_stack_size = 3000000
+    domains_stack_size = 5000000 ! Smoke needs a higher value than 3000000 default.
     print_memory_usage = .false.
 /
 
@@ -132,11 +135,28 @@
     grid_file = 'INPUT/grid_spec.nc'
 /
 
+
 &gfs_physics_nml
+    sfclay_compute_flux = @[SFCLAY_COMPUTE_FLUX]
     fh_dfi_radar = @[FH_DFI_RADAR]
     bl_mynn_edmf = 1
     bl_mynn_edmf_mom = 1
     bl_mynn_tkeadvect = .true.
+    rrfs_smoke = @[RRFS_SMOKE]
+    rrfs_smoke_debug = .false.
+    seas_opt = @[SEAS_OPT]
+    mix_chem = @[RRFS_SMOKE]
+    fire_turb = @[RRFS_SMOKE]
+    dust_opt = 5
+    drydep_opt = 1 
+    smoke_forecast = @[RRFS_SMOKE]
+    aero_ind_fdb = .false.
+    aero_dir_fdb = .false.
+    addsmoke_flag = 1
+    biomass_burn_opt = 1
+    wetdep_ls_opt = 1    
+    do_plumerise = @[RRFS_SMOKE]
+    plumerisefire_frq = 60
     cal_pre = .false.
     cdmbgwd = @[CDMBWD]
     cnvcld = .false.
@@ -186,21 +206,22 @@
     imfdeepcnv = @[IMFDEEPCNV]
     imfshalcnv = @[IMFSHALCNV]
     imp_physics = @[IMP_PHYSICS]
+    ! Yes, really, I mean it. Stop changing the iopt settings too.
+    ! They need to match the RRFS_dev1 parallel.
+    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
     sedi_semi   = @[SEDI_SEMI]
     decfl       = @[DECFL]
-    iopt_dveg = 4
-    iopt_crs  = 2
-    iopt_btr  = 1
-    iopt_run  = 1
-    iopt_sfc  = 3
-    iopt_frz  = 1
-    iopt_inf  = 1
-    iopt_rad  = 3
-    iopt_alb  = 1
-    iopt_snf  = 4
-    iopt_tbot = 2
-    iopt_stc  = 3
-    iopt_trs  = 2
     iovr = @[IOVR]
     isol = 2
     isot = 1
@@ -216,6 +237,7 @@
 !    lkm = @[LKM]
     lndp_type = @[LNDP_TYPE]
     lradar = @[LRADAR]
+    lrefres = .true.
 !    lseaspray = @[LSEASPRAY]
     lsm = @[LSM]
     lsoil = 9

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -65,7 +65,7 @@ RUN     | regional_2threads
 RUN     | regional_netcdf_parallel                                                                                                | - wcoss2                                | fv3 |
 RUN     | regional_3km                                                                                                            |                                         | fv3 |
 
-COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON      |                                         | fv3 |
+COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON      |                                         | fv3 |
 
 RUN     | rap_control                                                                                                             |                                         | fv3 |
 RUN     | rap_rrtmgp                                                                                                              |                                         | fv3 |
@@ -85,6 +85,7 @@ RUN     | rrfs_v1nssl_nohailnoccn
 
 RUN     | rrfs_conus13km_hrrr_warm                                                                                                |                                         | fv3 |
 RUN     | rrfs_conus13km_radar_tten_warm                                                                                          |                                         | fv3 |
+RUN     | rrfs_smoke_conus13km_hrrr_warm                                                                                          |                                         | fv3 |
 
 COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_flake,FV3_GFS_v16_ugwpv1,FV3_GFS_v16_ras,FV3_GFS_v16_thompson,FV3_GFS_v16_noahmp | | fv3 |
 RUN     | control_csawmg                                                                                                          | - gaea.intel                            | fv3 |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -485,7 +485,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20220511
+BL_DATE=20220516
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else
@@ -531,9 +531,10 @@ mkdir ${LOG_DIR}
 if [[ $ROCOTO == true ]]; then
 
   ROCOTO_XML=${PATHRT}/rocoto_workflow.xml
+  ROCOTO_STATE=${PATHRT}/rocoto_workflow.state
   ROCOTO_DB=${PATHRT}/rocoto_workflow.db
 
-  rm -f $ROCOTO_XML $ROCOTO_DB *_lock.db
+  rm -f $ROCOTO_XML $ROCOTO_DB $ROCOTO_STATE *_lock.db
 
   if [[ $MACHINE_ID = wcoss ]]; then
     QUEUE=dev
@@ -880,7 +881,7 @@ else
 
   rm -f fv3_*.x fv3_*.exe modules.fv3_* keep_tests.tmp
   [[ ${KEEP_RUNDIR} == false ]] && rm -rf ${RUNDIR_ROOT}
-  [[ ${ROCOTO} == true ]] && rm -f ${ROCOTO_XML} ${ROCOTO_DB} *_lock.db
+  [[ ${ROCOTO} == true ]] && rm -f ${ROCOTO_XML} ${ROCOTO_DB} ${ROCOTO_STATE} *_lock.db
   [[ ${TEST_35D} == true ]] && rm -f tests/cpld_bmark*_20*
   [[ ${SINGLE_NAME} != '' ]] && rm -f rt.conf.single
 fi

diff --git a/tests/rt_gnu.conf b/tests/rt_gnu.conf
@@ -14,7 +14,7 @@ RUN     | control_thompson_no_aero
 RUN     | control_ras                                                                                                             |                | fv3         |
 RUN     | control_p8                                                                                                              |                | fv3         |
 
-COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta -D32BIT=ON                                     |                | fv3         |
+COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta -D32BIT=ON                                     |                | fv3         |
 
 RUN     | rap_control                                                                                                             |                | fv3         |
 # This test is not giving the same results (also not in REPRO mode) - needs to be fixed
@@ -29,6 +29,7 @@ RUN     | hrrr_control
 RUN     | rrfs_v1beta                                                                                                             |                | fv3         |
 RUN     | rrfs_conus13km_hrrr_warm                                                                                                |                | fv3         |
 RUN     | rrfs_conus13km_radar_tten_warm                                                                                          |                | fv3         |
+RUN     | rrfs_smoke_conus13km_hrrr_warm                                                                                          |                | fv3         |
 
 ##################################################################################################################################################################
 # CCPP DEBUG tests                                                                                                                                               #
+2 −2		.gitmodules
+5 −1		ccpp/config/ccpp_prebuild_config.py
+7 −7		ccpp/data/CCPP_typedefs.meta
+239 −15		ccpp/data/GFS_typedefs.F90
+389 −15		ccpp/data/GFS_typedefs.meta
+160 −0		ccpp/driver/GFS_diagnostics.F90
+22 −1		ccpp/driver/GFS_restart.F90
+1 −1		ccpp/physics
+1 −3		ccpp/suites/suite_FV3_HRRR.xml
+83 −0		ccpp/suites/suite_FV3_HRRR_smoke.xml
+94 −0		ccpp/suites/suite_FV3_RAP_noah_sfcdiff_ugwpv1.xml
+90 −0		ccpp/suites/suite_FV3_RAP_noah_sfcdiff_unified_ugwp.xml
+162 −1		io/FV3GFS_io.F90