Skip to content

Commit 0522bad

Browse files
committed
remove extra atmos diagnostics
1 parent 5f79625 commit 0522bad

File tree

5 files changed

+1
-249
lines changed

5 files changed

+1
-249
lines changed

config/ci_configs/slabplanet_atmos_diags.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,4 @@ precip_model: "0M"
99
rad: "gray"
1010
t_end: "1days"
1111
vert_diff: "true"
12-
extra_atmos_diagnostics:
13-
- short_name: [mse, lr, edt, evu, ts, mass_strf, stab, vt, egr, toa_fluxes_net]
14-
period: 1days
15-
reduction_time: average
12+

config/ci_configs/slabplanet_default.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,3 @@ precip_model: "0M"
1010
rad: "gray"
1111
t_end: "1days"
1212
vert_diff: "true"
13-
extra_atmos_diagnostics:
14-
- short_name: [mse, lr, edt, evu, hfes, evspsbl, ts]
15-
period: 1days

experiments/ClimaEarth/components/atmosphere/climaatmos.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ import Thermodynamics as TD
1212
import ClimaCoupler: Checkpointer, FieldExchanger, FluxCalculator, Interfacer, Utilities
1313
import ClimaUtilities.TimeManager: ITime
1414

15-
include("climaatmos_extra_diags.jl")
16-
1715
if pkgversion(CA) < v"0.28.6"
1816
# Allow cache to be moved to CPU (this is a little bit of type piracy, but we
1917
# allow it in this particular file)

experiments/ClimaEarth/components/atmosphere/climaatmos_extra_diags.jl

Lines changed: 0 additions & 196 deletions
This file was deleted.

experiments/ClimaEarth/user_io/arg_parsing.jl

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ function get_coupler_config_dict(config_file)
6969
# Select the correct timestep for each component model based on which are available
7070
parse_component_dts!(config_dict)
7171

72-
# Add any extra diagnostics
73-
add_extra_diagnostics!(config_dict)
7472
return config_dict
7573
end
7674

@@ -302,45 +300,3 @@ function parse_component_dts!(config_dict)
302300
config_dict["component_dt_dict"] = component_dt_dict
303301
return nothing
304302
end
305-
306-
"""
307-
add_extra_diagnostics!(config_dict)
308-
309-
Conditionally add extra diagnostics to the config dictionary based on the
310-
simulation type and flag to use diagnostics. Currently, the only extra
311-
diagnostic is the atmosphere TOA net flux for AMIP simulations, but more diagnostics
312-
can be added for any component by following the structure in `climaatmos_extra_diags.jl`.
313-
314-
The added atmosphere diagnostics are added to the `extra_atmos_diagnostics` field
315-
of the config dict. The `diagnostics_dt` field is also added to the config dict to
316-
coordinate the output frequency of the diagnostics.
317-
318-
# Arguments
319-
- `config_dict`: A dictionary mapping configuration keys to the specified settings
320-
"""
321-
function add_extra_diagnostics!(config_dict)
322-
# Diagnostics information
323-
mode_name = config_dict["mode_name"]
324-
use_coupler_diagnostics = config_dict["use_coupler_diagnostics"]
325-
t_end = Float64(Utilities.time_to_seconds(config_dict["t_end"]))
326-
t_start = Float64(Utilities.time_to_seconds(config_dict["t_start"]))
327-
diagnostics_dt = nothing
328-
if mode_name == "amip" && use_coupler_diagnostics
329-
@info "Using default AMIP diagnostics"
330-
(period, diagnostics_dt) = get_diag_period(t_start, t_end)
331-
332-
# Additional atmosphere diagnostics
333-
!haskey(config_dict, "extra_atmos_diagnostics") &&
334-
(config_dict["extra_atmos_diagnostics"] = Vector{Dict{Any, Any}}())
335-
push!(
336-
config_dict["extra_atmos_diagnostics"],
337-
Dict(
338-
"short_name" => ["toa_fluxes_net"],
339-
"reduction_time" => "average",
340-
"period" => period,
341-
),
342-
)
343-
end
344-
config_dict["diagnostics_dt"] = diagnostics_dt
345-
return nothing
346-
end

0 commit comments

Comments
 (0)