Add TOA and surface radiation diagnostics

CliMA · Feb 2, 2024 · 22353ea · 22353ea
1 parent a21c62f
commit 22353ea
Show file tree

Hide file tree

Showing 4 changed files with 622 additions and 38 deletions.
diff --git a/post_processing/ci_plots.jl b/post_processing/ci_plots.jl
@@ -447,8 +447,18 @@ function make_plots(
     simdir = SimDir(simulation_path)
 
     reduction = "average"
-    short_names_3D = ["ua", "ta", "hus", "rsd", "rsu", "rld", "rlu"]
-    short_names_sfc = ["hfes", "evspsbl"]
+    short_names_3D = ["ua", "ta", "hus"]
+    short_names_2D = [
+        "rsdt",
+        "rsds",
+        "rsut",
+        "rsus",
+        "rlds",
+        "rlut",
+        "rlus",
+        "hfes",
+        "evspsbl",
+    ]
     available_periods = ClimaAnalysis.available_periods(
         simdir;
         short_name = short_names_3D[1],
@@ -464,9 +474,9 @@ function make_plots(
     vars_3D = [
         get(simdir; short_name, reduction, period) |> ClimaAnalysis.average_lon for short_name in short_names_3D
     ]
-    vars_sfc = [
+    vars_2D = [
         get(simdir; short_name, reduction, period) for
-        short_name in short_names_sfc
+        short_name in short_names_2D
     ]
     make_plots_generic(
         simulation_path,
@@ -476,9 +486,9 @@ function make_plots(
     )
     make_plots_generic(
         simulation_path,
-        vars_sfc,
+        vars_2D,
         time = LAST_SNAP,
-        output_name = "summary_sfc",
+        output_name = "summary_2D",
     )
 end
 
@@ -497,29 +507,26 @@ function make_plots(
 
     reduction = "average"
     period = "10d"
-    short_names_3D = [
-        "ta",
-        "thetaa",
-        "rhoa",
-        "ua",
-        "va",
-        "wa",
-        "hur",
-        "hus",
-        "clw",
-        "cli",
-        "rsd",
-        "rsu",
-        "rld",
-        "rlu",
+    short_names_3D =
+        ["ta", "thetaa", "rhoa", "ua", "va", "wa", "hur", "hus", "clw", "cli"]
+    short_names_2D = [
+        "rsdt",
+        "rsds",
+        "rsut",
+        "rsus",
+        "rlds",
+        "rlut",
+        "rlus",
+        "hfes",
+        "evspsbl",
+        "ts",
     ]
-    short_names_sfc = ["hfes", "evspsbl", "ts"]
     vars_3D = [
         get(simdir; short_name, reduction, period) |> ClimaAnalysis.average_lon for short_name in short_names_3D
     ]
-    vars_sfc = [
+    vars_2D = [
         get(simdir; short_name, reduction, period) for
-        short_name in short_names_sfc
+        short_name in short_names_2D
     ]
     make_plots_generic(
         simulation_path,
@@ -529,9 +536,9 @@ function make_plots(
     )
     make_plots_generic(
         simulation_path,
-        vars_sfc,
+        vars_2D,
         time = LAST_SNAP,
-        output_name = "summary_sfc",
+        output_name = "summary_2D",
     )
 end
 
@@ -553,8 +560,18 @@ function make_plots(::AquaplanetPlots, simulation_path)
     simdir = SimDir(simulation_path)
 
     reduction = "average"
-    short_names_3D = ["ua", "ta", "hus", "rsd", "rsu", "rld", "rlu"]
-    short_names_sfc = ["hfes", "evspsbl"]
+    short_names_3D = ["ua", "ta", "hus"]
+    short_names_2D = [
+        "rsdt",
+        "rsds",
+        "rsut",
+        "rsus",
+        "rlds",
+        "rlut",
+        "rlus",
+        "hfes",
+        "evspsbl",
+    ]
     available_periods = ClimaAnalysis.available_periods(
         simdir;
         short_name = short_names_3D[1],
@@ -570,8 +587,8 @@ function make_plots(::AquaplanetPlots, simulation_path)
     vars_3D = [
         get(simdir; short_name, reduction, period) |> ClimaAnalysis.average_lon for short_name in short_names_3D
     ]
-    vars_sfc =
-        [get(simdir; short_name, reduction) for short_name in short_names_sfc]
+    vars_2D =
+        [get(simdir; short_name, reduction) for short_name in short_names_2D]
     make_plots_generic(
         simulation_path,
         vars_3D,
@@ -580,9 +597,9 @@ function make_plots(::AquaplanetPlots, simulation_path)
     )
     make_plots_generic(
         simulation_path,
-        vars_sfc,
+        vars_2D,
         time = LAST_SNAP,
-        output_name = "summary_sfc",
+        output_name = "summary_2D",
     )
 end
 

diff --git a/src/diagnostics/default_diagnostics.jl b/src/diagnostics/default_diagnostics.jl
@@ -174,7 +174,19 @@ end
 # Radiation mode #
 ##################
 function default_diagnostics(::RRTMGPI.AbstractRRTMGPMode, t_end; output_writer)
-    rad_diagnostics = ["rsd", "rsu", "rld", "rlu"]
+    rad_diagnostics = [
+        "rsd",
+        "rsdt",
+        "rsds",
+        "rsu",
+        "rsut",
+        "rsus",
+        "rld",
+        "rlds",
+        "rlu",
+        "rlut",
+        "rlus",
+    ]
 
     average_func = frequency_averages(t_end)
 
@@ -187,12 +199,37 @@ function default_diagnostics(
     t_end;
     output_writer,
 )
-    rad_diagnostics =
-        ["rsd", "rsu", "rld", "rlu", "rsdcs", "rsucs", "rldcs", "rlucs"]
+    rad_diagnostics = [
+        "rsd",
+        "rsdt",
+        "rsds",
+        "rsu",
+        "rsut",
+        "rsus",
+        "rld",
+        "rlds",
+        "rlu",
+        "rlut",
+        "rlus",
+    ]
+    rad_clearsky_diagnostics = [
+        "rsdcs",
+        "rsdscs",
+        "rsucs",
+        "rsutcs",
+        "rsuscs",
+        "rldcs",
+        "rldscs",
+        "rlucs",
+        "rlutcs",
+    ]
 
     average_func = frequency_averages(t_end)
 
-    return [average_func(rad_diagnostics...; output_writer)...]
+    return [
+        average_func(rad_diagnostics...; output_writer)...,
+        average_func(rad_clearsky_diagnostics...; output_writer)...,
+    ]
 end
 
 ##################