Merge pull request #3952 from CliMA/zs/get_wstar

remove get_wstar function

Author: szy21

src/ClimaAtmos.jl

@@ -45,13 +45,6 @@ include(joinpath("cache", "cloud_fraction.jl"))
 include(joinpath("cache", "surface_albedo.jl"))
 
 include(joinpath("initial_conditions", "InitialConditions.jl"))
-include(
-    joinpath(
-        "parameterized_tendencies",
-        "turbulence_convection",
-        "tc_functions.jl",
-    ),
-)
 include(joinpath("surface_conditions", "SurfaceConditions.jl"))
 include(joinpath("utils", "discrete_hydrostatic_balance.jl"))
 

src/parameterized_tendencies/turbulence_convection/tc_functions.jl

@@ -13,7 +13,6 @@ import ..gcm_driven_timeseries
 
 import ..CT1, ..CT2, ..C12, ..CT12, ..C3
 import ..unit_basis_vector_data, ..projected_vector_data
-import ..get_wstar
 
 import ClimaCore: DataLayouts, Geometry, Fields
 import ClimaCore.Geometry: ⊗

src/surface_conditions/SurfaceConditions.jl

@@ -309,10 +309,11 @@ function surface_state_to_conditions(
                     ts,
                     SF.PointValueScheme(),
                 )
-                gustiness = get_wstar(buoyancy_flux)
                 # TODO: We are assuming that the average mixed layer depth is
                 # always 1000 meters. This needs to be adjusted for deep
                 # convective cases like TRMM.
+                zi = FT(1000)
+                gustiness = cbrt(max(buoyancy_flux * zi, 0))
             else
                 gustiness = surf_state.gustiness
             end