From dddfbcdc56d1095ddbc92c19ff0bcbf03bc49e5a Mon Sep 17 00:00:00 2001
From: Zhaoyi Shen <11598433+szy21@users.noreply.github.com>
Date: Wed, 3 Jul 2024 15:24:57 -0700
Subject: [PATCH] remove ediff diagnostics

---
 config/ci_configs/slabplanet_atmos_diags.yml  |  2 +-
 config/ci_configs/slabplanet_default.yml      |  2 +-
 .../atmosphere/climaatmos_extra_diags.jl      | 23 -------------------
 experiments/ClimaEarth/user_io/ci_plots.jl    |  2 +-
 4 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/config/ci_configs/slabplanet_atmos_diags.yml b/config/ci_configs/slabplanet_atmos_diags.yml
index 024d91668b..d555946bdb 100644
--- a/config/ci_configs/slabplanet_atmos_diags.yml
+++ b/config/ci_configs/slabplanet_atmos_diags.yml
@@ -15,6 +15,6 @@ rad: "gray"
 t_end: "10days"
 vert_diff: "true"
 diagnostics:
-  - short_name: [mse, lr, ediff, ts, mass_strf, stab, vt, egr]
+  - short_name: [mse, lr, edt, evu, ts, mass_strf, stab, vt, egr]
     reduction_time: average
     period: 1days
diff --git a/config/ci_configs/slabplanet_default.yml b/config/ci_configs/slabplanet_default.yml
index 0896357ba5..1b0037efac 100644
--- a/config/ci_configs/slabplanet_default.yml
+++ b/config/ci_configs/slabplanet_default.yml
@@ -14,5 +14,5 @@ t_end: "10days"
 vert_diff: "true"
 output_default_diagnostics: false
 diagnostics:
- - short_name: [mse, lr, ediff, hfes, evspsbl, ts]
+ - short_name: [mse, lr, edt, evu, hfes, evspsbl, ts]
    period: 1days
diff --git a/experiments/ClimaEarth/components/atmosphere/climaatmos_extra_diags.jl b/experiments/ClimaEarth/components/atmosphere/climaatmos_extra_diags.jl
index 013c23afe8..ac5cf75a1d 100644
--- a/experiments/ClimaEarth/components/atmosphere/climaatmos_extra_diags.jl
+++ b/experiments/ClimaEarth/components/atmosphere/climaatmos_extra_diags.jl
@@ -54,29 +54,6 @@ CAD.add_diagnostic_variable!(
     end,
 )
 
-CAD.add_diagnostic_variable!(
-    short_name = "ediff",
-    long_name = "Eddy diffusivity",
-    standard_name = "eddy_diffusivity",
-    units = "m^2 s^-1",
-    comments = "Eddy diffusivity consistent with the VerticalDiffusion scheme in ClimaAtmos.",
-    compute! = (out, state, cache, time) -> begin
-        (; ᶜp) = cache.precomputed
-        (; C_E) = cache.atmos.vert_diff
-        interior_uₕ = CC.Fields.level(state.c.uₕ, 1)
-        ᶠp = ᶠK_E = cache.scratch.ᶠtemp_scalar
-        @. ᶠp = CAD.ᶠinterp(ᶜp)
-        ᶜΔz_surface = CC.Fields.Δz_field(interior_uₕ)
-        @. ᶠK_E = CA.eddy_diffusivity_coefficient(C_E, CA.norm(interior_uₕ), ᶜΔz_surface / 2, ᶠp)
-        if isnothing(out)
-            return CAD.ᶜinterp.(ᶠK_E)
-        else
-            out .= CAD.ᶜinterp.(ᶠK_E)
-        end
-
-    end,
-)
-
 CAD.add_diagnostic_variable!(
     short_name = "mass_strf",
     long_name = "Meridional Mass Streamfunction",
diff --git a/experiments/ClimaEarth/user_io/ci_plots.jl b/experiments/ClimaEarth/user_io/ci_plots.jl
index cfd7b7c808..adc4d8472c 100644
--- a/experiments/ClimaEarth/user_io/ci_plots.jl
+++ b/experiments/ClimaEarth/user_io/ci_plots.jl
@@ -164,7 +164,7 @@ function make_plots(
     simdirs = CAN.SimDir.(output_paths)
 
     # Default output diagnostics
-    short_names_3D = ["mse", "lr", "ediff"]
+    short_names_3D = ["mse", "lr", "edt"]
     short_names_2D = ["ts"]
 
     available_periods = CAN.available_periods(simdirs[1]; short_name = short_names_3D[1], reduction)