Merge pull request #3937 from CliMA/szy21-patch-2

Update longrun_aquaplanet_progedmf.toml

Author: szy21

src/parameters/Parameters.jl

@@ -37,9 +37,9 @@ Base.@kwdef struct TurbulenceConvectionParameters{FT, VFT1, VFT2} <: ATCP
     min_updraft_top::FT
     pressure_normalmode_buoy_coeff1::FT
     pressure_normalmode_drag_coeff::FT
-    entr_tau::FT
+    entr_inv_tau::FT
     entr_coeff::FT
-    detr_tau::FT
+    detr_inv_tau::FT
     detr_coeff::FT
     detr_buoy_coeff::FT
     detr_vertdiv_coeff::FT

src/parameters/create_parameters.jl

@@ -262,8 +262,8 @@ function TurbulenceConvectionParameters(
         :mixing_length_static_stab_coeff => :static_stab_coeff,
         :pressure_normalmode_buoy_coeff1 =>
             :pressure_normalmode_buoy_coeff1,
-        :detr_inv_tau => :detr_tau,
-        :entr_inv_tau => :entr_tau,
+        :detr_inv_tau => :detr_inv_tau,
+        :entr_inv_tau => :entr_inv_tau,
     )
     parameters = CP.get_parameter_values(toml_dict, name_map, "ClimaAtmos")
     parameters = merge(parameters, overrides)

src/prognostic_equations/edmfx_entr_detr.jl

@@ -168,7 +168,7 @@ function entrainment(
     )
 
     entr_param_vec = CAP.entr_param_vec(turbconv_params)
-    entr_inv_tau = CAP.entr_tau(turbconv_params)
+    entr_inv_tau = CAP.entr_inv_tau(turbconv_params)
     pi_sum =
         entr_param_vec[1] * abs(Π₁) +
         entr_param_vec[2] * abs(Π₂) +
@@ -206,7 +206,7 @@ function entrainment(
 )
     FT = eltype(thermo_params)
     entr_mult_limiter_coeff = CAP.entr_mult_limiter_coeff(turbconv_params)
-    entr_inv_tau = CAP.entr_tau(turbconv_params)
+    entr_inv_tau = CAP.entr_inv_tau(turbconv_params)
     entr_coeff = CAP.entr_coeff(turbconv_params)
     min_area_limiter_scale = CAP.min_area_limiter_scale(turbconv_params)
     min_area_limiter_power = CAP.min_area_limiter_power(turbconv_params)
@@ -456,7 +456,7 @@ function detrainment(
     ::BuoyancyVelocityDetrainment,
 )
     FT = eltype(thermo_params)
-    detr_inv_tau = CAP.detr_tau(turbconv_params)
+    detr_inv_tau = CAP.detr_inv_tau(turbconv_params)
     detr_coeff = CAP.detr_coeff(turbconv_params)
     detr_buoy_coeff = CAP.detr_buoy_coeff(turbconv_params)
     detr_vertdiv_coeff = CAP.detr_vertdiv_coeff(turbconv_params)

toml/longrun_aquaplanet_progedmf.toml

@@ -7,9 +7,6 @@ value = 40000.0
 [precipitation_timescale]
 value = 600
 
-[EDMF_surface_area]
-value = 0
-
 [EDMF_min_area]
 value = 1.0e-5