Merge pull request #1551 from CliMA/zs/rm_atmos_diag

remove extra atmos diagnostics

Author: szy21

config/ci_configs/slabplanet_atmos_diags.yml

@@ -9,7 +9,4 @@ precip_model: "0M"
 rad: "gray"
 t_end: "1days"
 vert_diff: "true"
-extra_atmos_diagnostics:
-  - short_name: [mse, lr, edt, evu, ts, mass_strf, stab, vt, egr, toa_fluxes_net]
-    period: 1days
-    reduction_time: average
+

config/ci_configs/slabplanet_default.yml

@@ -10,6 +10,3 @@ precip_model: "0M"
 rad: "gray"
 t_end: "1days"
 vert_diff: "true"
-extra_atmos_diagnostics:
- - short_name: [mse, lr, edt, evu, hfes, evspsbl, ts]
-   period: 1days

experiments/ClimaEarth/components/atmosphere/climaatmos.jl

@@ -12,8 +12,6 @@ import Thermodynamics as TD
 import ClimaCoupler: Checkpointer, FieldExchanger, FluxCalculator, Interfacer, Utilities
 import ClimaUtilities.TimeManager: ITime
 
-include("climaatmos_extra_diags.jl")
-
 if pkgversion(CA) < v"0.28.6"
     # Allow cache to be moved to CPU (this is a little bit of type piracy, but we
     # allow it in this particular file)

experiments/ClimaEarth/components/atmosphere/climaatmos_extra_diags.jl

@@ -69,8 +69,6 @@ function get_coupler_config_dict(config_file)
     # Select the correct timestep for each component model based on which are available
     parse_component_dts!(config_dict)
 
-    # Add any extra diagnostics
-    add_extra_diagnostics!(config_dict)
     return config_dict
 end
 
@@ -302,45 +300,3 @@ function parse_component_dts!(config_dict)
     config_dict["component_dt_dict"] = component_dt_dict
     return nothing
 end
-
-"""
-    add_extra_diagnostics!(config_dict)
-
-Conditionally add extra diagnostics to the config dictionary based on the
-simulation type and flag to use diagnostics. Currently, the only extra
-diagnostic is the atmosphere TOA net flux for AMIP simulations, but more diagnostics
-can be added for any component by following the structure in `climaatmos_extra_diags.jl`.
-
-The added atmosphere diagnostics are added to the `extra_atmos_diagnostics` field
-of the config dict. The `diagnostics_dt` field is also added to the config dict to
-coordinate the output frequency of the diagnostics.
-
-# Arguments
-- `config_dict`: A dictionary mapping configuration keys to the specified settings
-"""
-function add_extra_diagnostics!(config_dict)
-    # Diagnostics information
-    mode_name = config_dict["mode_name"]
-    use_coupler_diagnostics = config_dict["use_coupler_diagnostics"]
-    t_end = Float64(Utilities.time_to_seconds(config_dict["t_end"]))
-    t_start = Float64(Utilities.time_to_seconds(config_dict["t_start"]))
-    diagnostics_dt = nothing
-    if mode_name == "amip" && use_coupler_diagnostics
-        @info "Using default AMIP diagnostics"
-        (period, diagnostics_dt) = get_diag_period(t_start, t_end)
-
-        # Additional atmosphere diagnostics
-        !haskey(config_dict, "extra_atmos_diagnostics") &&
-            (config_dict["extra_atmos_diagnostics"] = Vector{Dict{Any, Any}}())
-        push!(
-            config_dict["extra_atmos_diagnostics"],
-            Dict(
-                "short_name" => ["toa_fluxes_net"],
-                "reduction_time" => "average",
-                "period" => period,
-            ),
-        )
-    end
-    config_dict["diagnostics_dt"] = diagnostics_dt
-    return nothing
-end