Merge pull request #558 from grantfirl/ufs-dev-omnibus-20250204

ufs/dev "omnibus" changes from 11/2024-02/2025

ccpp/config/ccpp_prebuild_config.py

@@ -21,6 +21,7 @@
     'ccpp/physics/physics/Radiation/RRTMG/radlw_param.f',
     'ccpp/physics/physics/photochem/module_ozphys.F90',
     'ccpp/physics/physics/photochem/module_h2ophys.F90',
+    'ccpp/physics/physics/SFC_Models/Land/Noahmp/lnd_iau_mod.F90',
     'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/module_ccpp_suite_simulator.F90',
     'scm/src/CCPP_typedefs.F90',
     'scm/src/GFS_typedefs.F90',
@@ -53,6 +54,12 @@
         'module_h2ophys' : '',
         'ty_h2ophys'     : '',
         },
+    'land_iau_mod' : {
+        'land_iau_mod' : '',
+        'land_iau_external_data_type' : '',
+        'land_iau_state_type' : '',
+        'land_iau_control_type' : '',
+        },
     'CCPP_typedefs' : {
         'GFS_interstitial_type' : 'physics%Interstitial(cdata%thrd_no)',
         'CCPP_typedefs' : '',

ccpp/physics_namelists/input_HRRR_gf.nml

@@ -117,7 +117,7 @@
     sfclay_compute_flux = .true.
     shal_cnv = .false.
     smoke_conv_wet_coef = 0.5, 0.5, 0.5
-    smoke_forecast = 1
+    hwp_method = 1
     swhtr = .true.
     thsfc_loc = .false.
     trans_trac = .true.

scm/src/GFS_typedefs.meta

@@ -960,7 +960,7 @@
   standard_name = emission_smoke_prvd_RRFS
   long_name = emission fire RRFS daily
   units = various
-  dimensions = (horizontal_dimension,4)
+  dimensions = (horizontal_dimension,5)
   type = real
   kind = kind_phys
   active = (do_smoke_coupling)
@@ -2383,26 +2383,44 @@
   standard_name = kinematic_surface_upward_sensible_heat_flux_of_fire
   long_name = kinematic surface upward sensible heat flux of fire
   units = K m s-1
-  dimensions = (horizontal_loop_extent)
+  dimensions = (horizontal_dimension)
   type = real
   kind = kind_phys
   active = (do_fire_coupling)
 [evap_fire]
   standard_name = surface_upward_specific_humidity_flux_of_fire
   long_name = kinematic surface upward latent heat flux of fire
   units = kg kg-1 m s-1
-  dimensions = (horizontal_loop_extent)
+  dimensions = (horizontal_dimension)
   type = real
   kind = kind_phys
   active = (do_fire_coupling)
 [smoke_fire]
   standard_name = smoke_emission_of_fire
   long_name = smoke emission of fire
   units = kg m-2
-  dimensions = (horizontal_loop_extent)
+  dimensions = (horizontal_dimension)
   type = real
   kind = kind_phys
   active = (do_fire_coupling)
+[land_iau_data]
+  standard_name = land_data_assimilation_data
+  long_name = land data assimilation data
+  units = mixed
+  dimensions = ()
+  type = land_iau_external_data_type
+[land_iau_control]
+  standard_name = land_data_assimilation_control
+  long_name = land data assimilation control
+  units = mixed
+  dimensions = ()
+  type = land_iau_control_type
+[land_iau_state]
+  standard_name = land_data_assimilation_interpolated_data
+  long_name = land data assimilation space- and time-interpolated
+  units = mixed
+  dimensions = ()
+  type = land_iau_state_type
 
 ########################################################################
 [ccpp-table-properties]
@@ -3240,6 +3258,14 @@
   type = real
   kind = kind_phys
   active = (do_smoke_coupling)
+[rho_dry]
+  standard_name = dry_air_density
+  long_name = dry air density
+  units = kg m-3
+  dimensions = (horizontal_dimension,vertical_layer_dimension)
+  type = real
+  kind = kind_phys
+  active = (do_smoke_coupling)
 [uspdavg]
   standard_name = mean_wind_speed_in_boundary_layer
   long_name = average wind speed within the boundary layer
@@ -4899,12 +4925,18 @@
   units = count
   dimensions = ()
   type = integer
-[thpsnmp_is_init]
+[thompson_mp_is_init]
   standard_name = flag_for_thompson_mp_scheme_initialization
   long_name = flag carrying scheme initialization status
   units = flag
   dimensions = ()
   type = logical
+[gfs_phys_time_vary_is_init]
+  standard_name = flag_for_gfs_phys_time_vary_interstitial_initialization
+  long_name = flag carrying interstitial initialization status
+  units = flag
+  dimensions = ()
+  type = logical
 [lgfdlmprad]
   standard_name = flag_for_GFDL_microphysics_radiation_interaction
   long_name = flag for GFDL microphysics-radiation interaction
@@ -4953,6 +4985,19 @@
   units = flag
   dimensions = ()
   type = logical
+[add_fire_moist_flux]
+  standard_name = flag_for_fire_moisture_flux
+  long_name = flag to add fire moisture flux
+  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
@@ -5598,6 +5643,12 @@
   units = flag
   dimensions = ()
   type = integer
+[gf_coldstart]
+  standard_name = flag_for_cold_start_gf
+  long_name = flag to cold start G-F
+  units = flag
+  dimensions = ()
+  type = logical
 [hwrf_samfdeep]
   standard_name = flag_for_hurricane_specific_code_in_scale_aware_mass_flux_deep_convection
   long_name = flag for hwrf samfdeepcnv scheme
@@ -5655,6 +5706,12 @@
   units = none
   dimensions = ()
   type = integer
+[conv_cf_opt]
+  standard_name = option_for_convection_scheme_cloud_fraction_computation
+  long_name = option for convection scheme cloud fraction computation
+  units = flag
+  dimensions = ()
+  type = integer
 [nmtvr]
   standard_name = number_of_statistical_measures_of_subgrid_orography
   long_name = number of topographic variables in GWD
@@ -6880,6 +6937,13 @@
   dimensions = ()
   type = real
   kind = kind_phys
+[plume_alpha]
+  standard_name = alpha_for_plumerise_scheme
+  long_name = alpha paramter for plumerise scheme
+  units = none
+  dimensions = ()
+  type = real
+  kind = kind_phys
 [ebb_dcycle]
   standard_name = control_for_diurnal_cycle_of_biomass_burning_emissions
   long_name = rrfs smoke diurnal cycle option
@@ -6952,10 +7016,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]
@@ -10163,7 +10227,7 @@
   dependencies = hooks/machine.F,hooks/physcons.F90
   dependencies = Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f
   dependencies = photochem/module_ozphys.F90,photochem/module_h2ophys.F90
-  dependencies = MP/GFDL/GFDL_parse_tracers.F90
+  dependencies = SFC_Models/Land/Noahmp/lnd_iau_mod.F90,MP/GFDL/GFDL_parse_tracers.F90
   dependencies = Interstitials/UFS_SCM_NEPTUNE/GFS_ccpp_suite_sim_pre.F90
 
 [ccpp-arg-table]

scm/src/scm_physical_constants.F90

@@ -16,6 +16,7 @@ module scm_physical_constants
   real(kind=dp),parameter:: con_omega  =7.2921e-5
   real(kind=dp),parameter:: con_p0     =1.01325e+5
 
+  real(kind=dp),parameter:: con_rgas   =8.314472_dp
   real(kind=dp),parameter:: con_rd     =2.8705e+2
   real(kind=dp),parameter:: con_rv     =4.6150e+2
   real(kind=dp),parameter:: con_cp     =1.0046e+3
@@ -37,7 +38,10 @@ module scm_physical_constants
   real(kind=dp),parameter:: con_epsm1  =con_rd/con_rv - 1._dp
   real(kind=dp),parameter:: con_1ovg   =1._dp/con_g
 
-  real(kind=dp),parameter:: karman = 0.4_dp
+  real(kind=dp),parameter:: con_avgd   =6.0221415e23_dp
+  real(kind=dp),parameter:: con_amd    =28.9644_dp                   !< molecular wght of dry air (\f$g/mol\f$)
+  real(kind=dp),parameter:: con_amw    =18.0154_dp
+  real(kind=dp),parameter:: karman     =0.4_dp
 
   real(kind=dp),parameter:: cimin      =0.15
   !> minimum rain amount

scm/src/scm_physical_constants.meta

@@ -285,4 +285,32 @@
   units = K
   dimensions = ()
   type = real
+  kind = kind_phys
+[con_rgas]
+  standard_name = molar_gas_constant
+  long_name = universal ideal molar gas constant
+  units = J K-1 mol-1
+  dimensions = ()
+  type = real
+  kind = kind_phys
+[con_avgd]
+  standard_name = avogadro_consant
+  long_name = Avogadro constant
+  units = mol-1
+  dimensions = ()
+  type = real
+  kind = kind_phys
+[con_amd]
+  standard_name = molecular_weight_of_dry_air
+  long_name = molecular weight of dry air
+  units = g mol-1
+  dimensions = ()
+  type = real
+  kind = kind_phys
+[con_amw]
+  standard_name = molecular_weight_of_water_vapor
+  long_name = molecular weight of water vapor
+  units = g mol-1
+  dimensions = ()
+  type = real
   kind = kind_phys