Merge pull request #4150 from CliMA/aj/constant_horiz_diff

Add constant horizontal diffusion option for testing

Author: trontrytel

.buildkite/Manifest-v1.11.toml

@@ -445,9 +445,9 @@ weakdeps = ["CUDA"]
 
 [[deps.ClimaParams]]
 deps = ["Dates", "TOML"]
-git-tree-sha1 = "995991392b8bf4c8400b38ba5bcb7d3a0e7d9cce"
+git-tree-sha1 = "5ade630eb2f88bd670f316b7fb9f8001adc772c2"
 uuid = "5c42b081-d73a-476f-9059-fd94b934656c"
-version = "1.0.3"
+version = "1.0.7"
 
 [[deps.ClimaReproducibilityTests]]
 deps = ["OrderedCollections", "PrettyTables"]
@@ -1864,7 +1864,7 @@ version = "2.5.5+0"
 [[deps.OpenLibm_jll]]
 deps = ["Artifacts", "Libdl"]
 uuid = "05823500-19ac-5b8b-9628-191a04bc5112"
-version = "0.8.1+4"
+version = "0.8.5+0"
 
 [[deps.OpenMPI_jll]]
 deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML", "Zlib_jll"]

Project.toml

@@ -47,7 +47,7 @@ ClimaComms = "0.6.9"
 ClimaCore = "0.14.43"
 ClimaDiagnostics = "0.2.13"
 ClimaInterpolations = "0.1.0"
-ClimaParams = "1.0.2"
+ClimaParams = "1.0.7"
 ClimaTimeSteppers = "0.8.2"
 ClimaUtilities = "0.1.27"
 CloudMicrophysics = "0.28, 0.29"

config/default_configs/default_config.yml

@@ -169,6 +169,9 @@ amd_les:
 c_amd:
   help: "Model coefficient for AMD-LES closure (TODO: Move to parameters.toml)"
   value: 0.29
+constant_horizontal_diffusion:
+  help: "Constant horizontal diffusion closure [`true`, `false` (default)]"
+  value: false
 smagorinsky_lilly:
   help: "Smagorinsky-Lilly diffusive closure [`nothing` (default), `UVW`, `UV`, `W`, `UV_W_decoupled`]"
   value: ~

config/model_configs/aquaplanet_nonequil_allsky_gw_res.yml

@@ -1,3 +1,4 @@
+constant_horizontal_diffusion: true
 viscous_sponge: false
 dt: "360secs"
 t_end: "1days"

src/ClimaAtmos.jl

@@ -138,6 +138,13 @@ include(
         "anisotropic_minimum_dissipation.jl",
     ),
 )
+include(
+    joinpath(
+        "parameterized_tendencies",
+        "les_sgs_models",
+        "constant_horizontal_diffusion.jl",
+    ),
+)
 include(joinpath("prognostic_equations", "advection.jl"))
 
 include(joinpath("cache", "temporary_quantities.jl"))

src/parameterized_tendencies/les_sgs_models/constant_horizontal_diffusion.jl

@@ -0,0 +1,44 @@
+#####
+##### Constant Horizontal Diffusion
+#####
+
+horizontal_constant_diffusion_tendency!(Yₜ, Y, p, t, ::Nothing) = nothing
+
+"""
+    horizontal_constant_diffusion_tendency!(Yₜ,Y, p, t, ::ConstantHorizontalDiffusion)
+
+"""
+function horizontal_constant_diffusion_tendency!(
+    Yₜ,
+    Y,
+    p,
+    t,
+    chd::ConstantHorizontalDiffusion,
+)
+    FT = eltype(Y)
+    thermo_params = CAP.thermodynamics_params(p.params)
+    (; ᶜtemp_scalar) = p.scratch
+    (; ᶜts) = p.precomputed
+
+    ᶜD = @. ᶜtemp_scalar = FT(chd.D)
+
+    # Total energy diffusion
+    ᶜh_tot = @. lazy(
+        TD.total_specific_enthalpy(
+            thermo_params,
+            ᶜts,
+            specific(Y.c.ρe_tot, Y.c.ρ),
+        ),
+    )
+    @. Yₜ.c.ρe_tot += wdivₕ(Y.c.ρ * ᶜD * gradₕ(ᶜh_tot))
+
+    # Tracer diffusion
+    foreach_gs_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
+        ᶜχ = @. lazy(specific(ᶜρχ, Y.c.ρ))
+        ᶜρχₜ_diffusion = @. lazy(wdivₕ(Y.c.ρ * ᶜD * gradₕ(ᶜχ)))
+        @. ᶜρχₜ += ᶜρχₜ_diffusion
+        if ρχ_name == @name(ρq_tot)
+            @. Yₜ.c.ρ += ᶜρχₜ_diffusion
+        end
+    end
+end

src/parameters/Parameters.jl

@@ -120,6 +120,8 @@ Base.@kwdef struct ClimaAtmosParameters{
     α_hyperdiff_tracer::FT
     # Vertical diffusion
     α_vert_diff_tracer::FT
+    # Constant horizontal diffusion
+    constant_horizontal_diffusion_D::FT
 end
 
 Base.eltype(::ClimaAtmosParameters{FT}) where {FT} = FT

src/parameters/create_parameters.jl

@@ -136,6 +136,7 @@ atmos_name_map = (;
     :optics_lookup_temperature_max => :optics_lookup_temperature_max,
     :tracer_hyperdiffusion_factor => :α_hyperdiff_tracer,
     :tracer_vertical_diffusion_factor => :α_vert_diff_tracer,
+    :D_horizontal_diffusion => :constant_horizontal_diffusion_D,
 )
 
 cloud_parameters(::Type{FT}) where {FT <: AbstractFloat} =

src/prognostic_equations/remaining_tendency.jl

@@ -352,6 +352,9 @@ NVTX.@annotate function additional_tendency!(Yₜ, Y, p, t)
     horizontal_amd_tendency!(Yₜ, Y, p, t, amd)
     vertical_amd_tendency!(Yₜ, Y, p, t, amd)
 
+    chd = p.atmos.constant_horizontal_diffusion
+    horizontal_constant_diffusion_tendency!(Yₜ, Y, p, t, chd)
+
     # Optional tendency to bring negative small tracers back from negative
     # at the cost of water vapor.
     moisture_fixer_tendency!(Yₜ, Y, p, t, moisture_model, microphysics_model)

src/solver/model_getters.jl

@@ -192,6 +192,14 @@ function get_amd_les_model(parsed_args, ::Type{FT}) where {FT}
            nothing
 end
 
+function get_constant_horizontal_diffusion_model(parsed_args, params, ::Type{FT}) where {FT}
+    is_model_active = parsed_args["constant_horizontal_diffusion"]
+    @assert is_model_active in (true, false)
+    return is_model_active ?
+           ConstantHorizontalDiffusion{FT}(CAP.constant_horizontal_diffusion_D(params)) :
+           nothing
+end
+
 function get_rayleigh_sponge_model(parsed_args, params, ::Type{FT}) where {FT}
     rs_name = parsed_args["rayleigh_sponge"]
     return if rs_name in ("false", false)