Skip to content

Commit

Permalink
Eighth reconciliation PR from production/RRFS.v1 (#898)
Browse files Browse the repository at this point in the history
* [production/RRFS.v1] The final physics update PR to RRFS.v1 (#841)

* Update to scale the RAVE fire emission and duirnal cycle of agriculute fire

---------

Co-authored-by: haiqinli <[email protected]>
  • Loading branch information
grantfirl and haiqinli authored Jan 7, 2025
1 parent 0834c7b commit 7d99880
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 11 deletions.
16 changes: 10 additions & 6 deletions ccpp/data/GFS_typedefs.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1582,8 +1582,9 @@ module GFS_typedefs
integer :: addsmoke_flag
integer :: plumerisefire_frq
integer :: n_dbg_lines
integer :: smoke_forecast
integer :: hwp_method
logical :: add_fire_moist_flux ! Flag to add moisture fluxes based on PM2.5 emissions
real(kind=kind_phys) :: sc_factor
logical :: aero_ind_fdb ! WFA/IFA indirect
logical :: aero_dir_fdb ! smoke/dust direct
logical :: rrfs_smoke_debug
Expand Down Expand Up @@ -4004,10 +4005,11 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
integer :: wetdep_ls_opt = 1
logical :: do_plumerise = .false.
logical :: add_fire_moist_flux = .false.
real(kind=kind_phys) :: sc_factor = 1.0
integer :: addsmoke_flag = 1
integer :: plumerisefire_frq = 60
integer :: n_dbg_lines = 3
integer :: smoke_forecast = 2 ! RRFS-sd read in ebb_smoke
integer :: hwp_method = 2 ! RRFS-sd read in ebb_smoke
logical :: aero_ind_fdb = .false. ! RRFS-sd wfa/ifa emission
logical :: aero_dir_fdb = .false. ! RRFS-sd smoke/dust radiation feedback
logical :: rrfs_smoke_debug = .false. ! RRFS-sd plumerise debug
Expand Down Expand Up @@ -4194,11 +4196,11 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
dust_alpha, dust_gamma, wetdep_ls_alpha, &
seas_opt, dust_opt, drydep_opt, coarsepm_settling, &
plume_wind_eff,ebb_dcycle, extended_sd_diags, &
wetdep_ls_opt, smoke_forecast, aero_ind_fdb, aero_dir_fdb, &
wetdep_ls_opt, hwp_method, aero_ind_fdb, aero_dir_fdb, &
rrfs_smoke_debug, do_plumerise, plumerisefire_frq, &
addsmoke_flag, enh_mix, mix_chem, smoke_dir_fdb_coef, &
do_smoke_transport,smoke_conv_wet_coef,n_dbg_lines, &
add_fire_moist_flux, plume_alpha, &
add_fire_moist_flux, sc_factor, &
!--- C3/GF closures
ichoice,ichoicem,ichoice_s, &
!--- (DFI) time ranges with radar-prescribed microphysics tendencies
Expand Down Expand Up @@ -4459,7 +4461,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
Model%plumerisefire_frq = plumerisefire_frq
Model%addsmoke_flag = addsmoke_flag
Model%add_fire_moist_flux = add_fire_moist_flux
Model%smoke_forecast = smoke_forecast
Model%sc_factor = sc_factor
Model%hwp_method = hwp_method
Model%aero_ind_fdb = aero_ind_fdb
Model%aero_dir_fdb = aero_dir_fdb
Model%rrfs_smoke_debug = rrfs_smoke_debug
Expand Down Expand Up @@ -6608,8 +6611,9 @@ subroutine control_print(Model)
print *, 'do_plumerise : ',Model%do_plumerise
print *, 'plumerisefire_frq: ',Model%plumerisefire_frq
print *, 'add_fire_moist_flux: ',Model%add_fire_moist_flux
print *, 'sc_factor : ',Model%sc_factor
print *, 'addsmoke_flag : ',Model%addsmoke_flag
print *, 'smoke_forecast : ',Model%smoke_forecast
print *, 'hwp_method : ',Model%hwp_method
print *, 'aero_ind_fdb : ',Model%aero_ind_fdb
print *, 'aero_dir_fdb : ',Model%aero_dir_fdb
print *, 'rrfs_smoke_debug : ',Model%rrfs_smoke_debug
Expand Down
15 changes: 11 additions & 4 deletions ccpp/data/GFS_typedefs.meta
Original file line number Diff line number Diff line change
Expand Up @@ -4971,6 +4971,13 @@
units = flag
dimensions = ()
type = logical
[sc_factor]
standard_name = scale_factor_for_wildfire_emissions
long_name = scale factor for wildfire emissions
units = 1
dimensions = ()
type = real
kind = kind_phys
[isncond_opt]
standard_name = control_for_soil_thermal_conductivity_option_in_ruc_lsm
long_name = control for soil thermal conductivity option in RUC land surface model
Expand Down Expand Up @@ -6983,10 +6990,10 @@
units = index
dimensions = ()
type = integer
[smoke_forecast]
standard_name = do_smoke_forecast
long_name = index for rrfs smoke forecast
units = index
[hwp_method]
standard_name = control_for_HWP_equation
long_name = control for HWP equation
units = 1
dimensions = ()
type = integer
[aero_ind_fdb]
Expand Down

0 comments on commit 7d99880

Please sign in to comment.