Merge pull request #4058 from CliMA/as/amd-method

Anisotropic Minimum Dissipation method (LES)

Author: akshaysridhar

.buildkite/pipeline.yml

@@ -195,6 +195,14 @@ steps:
           --config_file $CONFIG_PATH/plane_density_current_test.yml
           --job_id plane_density_current_test
         artifact_paths: "plane_density_current_test/output_active/*"
+      
+      - label: ":computer: Density current experiment (AMD)"
+        command: >
+          julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
+          --config_file $CONFIG_PATH/plane_density_current_test_amd.yml
+          --job_id plane_density_current_test_amd
+        soft_fail: true
+        artifact_paths: "plane_density_current_test_amd/output_active/*"
 
   - group: "Analytic Tests"
     steps:
@@ -348,6 +356,18 @@ steps:
         artifact_paths: "baroclinic_wave_equil/output_active/*"
         agents:
           slurm_constraint: icelake|cascadelake|skylake|epyc
+      
+      - label: ":computer: no lim baroclinic wave equilmoist (AMD)"
+        command: >
+          julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
+          --config_file $COMMON_CONFIG_PATH/numerics_sphere_he6ze10.yml
+          --config_file $CONFIG_PATH/baroclinic_wave_equil_amd.yml
+          --job_id baroclinic_wave_equil_amd
+
+        artifact_paths: "baroclinic_wave_equil_amd/output_active/*"
+        soft_fail: true
+        agents:
+          slurm_constraint: icelake|cascadelake|skylake|epyc
 
       - label: ":computer: held suarez"
         key: held_suarez

config/default_configs/default_config.yml

@@ -163,6 +163,12 @@ vert_diff:
 hyperdiff:
   help: "Hyperdiffusion. Use `CAM_SE` for sensible default values and ClimaHyperdiffusion for user control. [`CAM_SE` (default), `ClimaHyperdiffusion` (or `true`), `none` (or `false`)]"
   value: "CAM_SE"
+amd_les:
+  help: "AMD LES closure [`true`, `false` (default)]"
+  value: false
+c_amd: 
+  help: "Model coefficient for AMD-LES closure (TODO: Move to parameters.toml)"
+  value: 0.29
 smagorinsky_lilly:
   help: "Smagorinsky-Lilly diffusive closure [`false` (default), `true`]"
   value: false

config/model_configs/baroclinic_wave_equil_amd.yml

@@ -0,0 +1,12 @@
+precip_model: "0M"
+dt_save_state_to_disk: "2days"
+reproducibility_test: true
+initial_condition: "MoistBaroclinicWave"
+dt: "300secs"
+amd_les: true
+t_end: "10days"
+moist: "equil"
+disable_surface_flux_tendency: true
+diagnostics:
+  - short_name: [pfull, wa, va, rv, hus, ke]
+    period: 1days

config/model_configs/plane_density_current_test_amd.yml

@@ -0,0 +1,17 @@
+dt_save_state_to_disk: "3600secs"
+initial_condition: "DryDensityCurrentProfile"
+x_max: 51200.0
+z_elem: 90
+dt: "0.3secs"
+t_end: "900.0secs"
+discrete_hydrostatic_balance: true
+amd_les: true
+z_stretch: false
+x_elem: 80
+config: "plane"
+z_max: 6400.0
+disable_surface_flux_tendency: true
+output_default_diagnostics: false
+diagnostics:
+  - short_name: thetaa
+    period: 900secs

post_processing/ci_plots.jl

@@ -804,7 +804,10 @@ function make_plots(
 end
 
 function make_plots(
-    ::Val{:plane_density_current_test},
+    ::Union{
+        Val{:plane_density_current_test},
+        Val{:plane_density_current_test_amd},
+    },
     output_paths::Vector{<:AbstractString},
 )
     simdirs = SimDir.(output_paths)
@@ -887,7 +890,9 @@ function make_plots(
 end
 
 MoistBaroWavePlots =
-    Union{Val{:baroclinic_wave_equil}, Val{:baroclinic_wave_equil_deepatmos}}
+    Union{Val{:baroclinic_wave_equil},
+        Val{:baroclinic_wave_equil_amd},
+        Val{:baroclinic_wave_equil_deepatmos}}
 
 function make_plots(
     ::MoistBaroWavePlots,

src/ClimaAtmos.jl

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

src/cache/precomputed_quantities.jl

@@ -257,6 +257,18 @@ function precomputed_quantities(Y, atmos)
         else
             (;)
         end
+    amd_les_quantities =
+        if atmos.amd_les isa AnisotropicMinimumDissipation
+            uvw_vec = UVW(FT(0), FT(0), FT(0))
+            (;
+                ᶜτ_amd = similar(Y.c, typeof(uvw_vec * uvw_vec')),
+                ᶠτ_amd = similar(Y.f, typeof(uvw_vec * uvw_vec')),
+                ᶜD_amd = similar(Y.c, FT),
+                ᶠD_amd = similar(Y.f, FT),
+            )
+        else
+            (;)
+        end
 
     return (;
         implicit_precomputed_quantities(Y, atmos)...,
@@ -270,7 +282,7 @@ function precomputed_quantities(Y, atmos)
         surface_precip_fluxes...,
         cloud_diagnostics_tuple,
         smagorinsky_lilly_quantities...,
-    )
+        amd_les_quantities...)
 end
 
 # Interpolates the third contravariant component of Y.c.uₕ to cell faces.
@@ -600,6 +612,10 @@ NVTX.@annotate function set_explicit_precomputed_quantities_part2!(Y, p, t)
         set_smagorinsky_lilly_precomputed_quantities!(Y, p)
     end
 
+    if p.atmos.amd_les isa AnisotropicMinimumDissipation
+        set_amd_precomputed_quantities!(Y, p)
+    end
+
     return nothing
 end