Update configs and leaderboard

config/amip_configs/amip.yml

@@ -7,6 +7,12 @@ coupler_toml: ["toml/amip_diagedmf.toml"]
 dt: "120secs"
 dt_cpl: "120secs"
 energy_check: false
+extra_atmos_diagnostics:
+  - short_name: [hur, hus, ta]
+    period: 1months
+    reduction_time: average
+    pressure_coordinates: true
+    compute_every: 6hours
 mode_name: "amip"
 netcdf_output_at_levels: true
 output_default_diagnostics: true

config/longrun_configs/amip_diagedmf_1m_land.yml

@@ -9,6 +9,12 @@ dt_cloud_fraction: "1hours"
 dt_cpl: "120secs"
 dt_rad: "1hours"
 energy_check: false
+extra_atmos_diagnostics:
+  - short_name: [hur, hus, ta]
+    period: 1months
+    reduction_time: average
+    pressure_coordinates: true
+    compute_every: 6hours
 initial_condition: "AMIPFromERA5"
 insolation: "timevarying"
 mode_name: "amip"

config/longrun_configs/amip_diagedmf_land.yml

@@ -9,6 +9,12 @@ dt_cloud_fraction: "1hours"
 dt_cpl: "120secs"
 dt_rad: "1hours"
 energy_check: false
+extra_atmos_diagnostics:
+  - short_name: [hur, hus, ta]
+    period: 1months
+    reduction_time: average
+    pressure_coordinates: true
+    compute_every: 6hours
 initial_condition: "AMIPFromERA5"
 insolation: "timevarying"
 land_model: "integrated"

config/longrun_configs/amip_diagedmf_land_p2k.yml

@@ -9,6 +9,12 @@ dt_cloud_fraction: "1hours"
 dt_cpl: "120secs"
 dt_rad: "1hours"
 energy_check: false
+extra_atmos_diagnostics:
+  - short_name: [hur, hus, ta]
+    period: 1months
+    reduction_time: average
+    pressure_coordinates: true
+    compute_every: 6hours
 initial_condition: "AMIPFromERA5"
 insolation: "timevarying"
 land_model: "integrated"

config/longrun_configs/amip_edonly.yml

@@ -9,6 +9,12 @@ dt_cloud_fraction: "1hours"
 dt_cpl: "120secs"
 dt_rad: "1hours"
 energy_check: false
+extra_atmos_diagnostics:
+  - short_name: [hur, hus, ta]
+    period: 1months
+    reduction_time: average
+    pressure_coordinates: true
+    compute_every: 6hours
 initial_condition: "AMIPFromERA5"
 insolation: "timevarying"
 mode_name: "amip"

config/longrun_configs/amip_progedmf.yml

@@ -7,6 +7,12 @@ coupler_toml: ["toml/amip_progedmf.toml"]
 dt: "120secs"
 dt_cpl: "120secs"
 energy_check: false
+extra_atmos_diagnostics:
+  - short_name: [hur, hus, ta]
+    period: 1months
+    reduction_time: average
+    pressure_coordinates: true
+    compute_every: 6hours
 mode_name: "amip"
 netcdf_output_at_levels: true
 ode_algo: "ARS222"

config/longrun_configs/cmip_edonly_bucket.yml

@@ -10,6 +10,12 @@ dt_ocean: "120secs" # 2 minutes
 dt_rad: "1hours"
 dt_seaice: "120secs" # 2 minutes
 energy_check: false
+extra_atmos_diagnostics:
+  - short_name: [hur, hus, ta]
+    period: 1months
+    reduction_time: average
+    pressure_coordinates: true
+    compute_every: 6hours
 ice_model: "clima_seaice"
 insolation: "timevarying"
 mode_name: "cmip"

config/longrun_configs/cmip_edonly_land.yml

@@ -9,6 +9,12 @@ dt_ocean: "120secs" # 2 minutes
 dt_rad: "1hours"
 dt_seaice: "120secs" # 2 minutes
 energy_check: false
+extra_atmos_diagnostics:
+  - short_name: [hur, hus, ta]
+    period: 1months
+    reduction_time: average
+    pressure_coordinates: true
+    compute_every: 6hours
 ice_model: "clima_seaice"
 insolation: "timevarying"
 land_model: "integrated"

config/longrun_configs/slabplanet_aqua_evolve_ocean.yml

@@ -5,6 +5,12 @@ dt_cloud_fraction: "1hours"
 dt_cpl: "240secs"
 dt_rad: "1hours"
 energy_check: true
+extra_atmos_diagnostics:
+  - short_name: [hur, hus, ta]
+    period: 1months
+    reduction_time: average
+    pressure_coordinates: true
+    compute_every: 6hours
 evolving_ocean: true
 h_elem: 8
 mode_name: "slabplanet_aqua"

config/longrun_configs/slabplanet_evolve_ocean.yml

@@ -5,6 +5,12 @@ dt_cloud_fraction: "1hours"
 dt_cpl: "240secs"
 dt_rad: "1hours"
 energy_check: true
+extra_atmos_diagnostics:
+  - short_name: [hur, hus, ta]
+    period: 1months
+    reduction_time: average
+    pressure_coordinates: true
+    compute_every: 6hours
 evolving_ocean: true
 h_elem: 8
 mode_name: "slabplanet"

config/nightly_configs/amip_coarse_diagedmf_1m_land.yml

@@ -10,6 +10,12 @@ dt_cpl: "240secs"
 dt_rad: "1hours"
 dz_bottom: 100.0
 energy_check: false
+extra_atmos_diagnostics:
+  - short_name: [hur, hus, ta]
+    period: 1months
+    reduction_time: average
+    pressure_coordinates: true
+    compute_every: 6hours
 h_elem: 8
 initial_condition: "AMIPFromERA5"
 insolation: "timevarying"

config/nightly_configs/amip_coarse_diagedmf_land.yml

@@ -7,6 +7,12 @@ dt: "240secs"
 dt_cpl: "240secs"
 dz_bottom: 100.0
 energy_check: false
+extra_atmos_diagnostics:
+  - short_name: [hur, hus, ta]
+    period: 1months
+    reduction_time: average
+    pressure_coordinates: true
+    compute_every: 6hours
 h_elem: 8
 initial_condition: "AMIPFromERA5"
 land_model: "integrated"

config/nightly_configs/amip_coarse_progedmf.yml

@@ -8,6 +8,12 @@ dt: "180secs"
 dt_cpl: "180secs"
 dz_bottom: 100.0
 energy_check: false
+extra_atmos_diagnostics:
+  - short_name: [hur, hus, ta]
+    period: 1months
+    reduction_time: average
+    pressure_coordinates: true
+    compute_every: 6hours
 h_elem: 8
 mode_name: "amip"
 netcdf_interpolation_num_points: [90, 45, 31]

ext/ClimaCouplerMakieExt/leaderboard/data_sources.jl

@@ -115,7 +115,8 @@ function get_sim_var_in_pfull_dict(diagnostics_folder_path)
         ClimaAnalysis.available_vars(ClimaAnalysis.SimDir(diagnostics_folder_path))
     sim_var_pfull_dict = Dict{String, Any}()
 
-    short_names = get_short_names_monthly_averages(diagnostics_folder_path)
+    short_names =
+        get_short_names_monthly_averages(diagnostics_folder_path; pressure_coords = true)
     available_short_names = intersect(short_names, Set(["ta", "hur", "hus"]))
     for short_name in short_names
         short_name in available_short_names && (
@@ -264,19 +265,26 @@ end
     get_short_names_of_monthly_averages(diagnostics_folder_path)
 
 Get all the short names of the monthly averages.
+
+If `pressure_coords` is `true`, then get all the short names of the monthly
+averages in pressure coordinates.
 """
-function get_short_names_monthly_averages(diagnostics_folder_path)
+function get_short_names_monthly_averages(diagnostics_folder_path; pressure_coords = false)
     available_short_names = Set{String}()
     simdir = ClimaAnalysis.SimDir(diagnostics_folder_path)
+    desired_coord = pressure_coords ? "pressure" : nothing
     for short_name in ClimaAnalysis.available_vars(simdir)
-        for reduction in ClimaAnalysis.available_reductions(simdir, short_name = short_name)
-            for period in ClimaAnalysis.available_periods(
-                simdir,
-                short_name = short_name,
-                reduction = reduction,
-            )
-                if reduction == "average" && period == "1M"
-                    push!(available_short_names, short_name)
+        for reduction in ClimaAnalysis.available_reductions(simdir; short_name)
+            for period in ClimaAnalysis.available_periods(simdir; short_name, reduction)
+                for coord in ClimaAnalysis.available_coord_types(
+                    simdir;
+                    short_name,
+                    reduction,
+                    period,
+                )
+                    if reduction == "average" && period == "1M" && coord == desired_coord
+                        push!(available_short_names, short_name)
+                    end
                 end
             end
         end

ext/ClimaCouplerMakieExt/leaderboard/leaderboard.jl

@@ -227,6 +227,10 @@ function Plotting.compute_pfull_leaderboard(
     @info "Error against observations for variables in pressure coordinates"
 
     sim_var_pfull_dict = get_sim_var_in_pfull_dict(diagnostics_folder_path)
+    if isempty(sim_var_pfull_dict)
+        @warn "No diagnostics in pressure coordinates found. Leaderboard for diagnostics in pressure coordinates will not be made."
+        return nothing
+    end
     obs_var_pfull_dict = get_obs_var_in_pfull_dict()
 
     # Print dates for debugging