add precip and snowfall to default diags, and add Tair (#1203)

Author: kmdeck

src/diagnostics/default_diagnostics.jl

@@ -339,6 +339,8 @@ function default_diagnostics(
             "shf",
             "iwc",
             "snowc",
+            "tair",
+            "precip",
         ]
     elseif output_vars == :short
         snowyland_diagnostics = [
@@ -363,6 +365,8 @@ function default_diagnostics(
             "swd",
             "lwd",
             "snowc",
+            "tair",
+            "precip",
         ]
     end
 

src/diagnostics/define_diagnostics.jl

@@ -600,6 +600,26 @@ function define_diagnostics!(land_model)
             compute_snowfall!(out, Y, p, t, land_model),
     )
 
+    # Total precip (mass flux)
+    add_diagnostic_variable!(
+        short_name = "precip",
+        long_name = "Total precipitation",
+        standard_name = "total_precipitation",
+        units = "kg m^-2 s^-1",
+        comments = "The total flux from precipitation in kg of water per m^2 of ground per second).",
+        compute! = (out, Y, p, t) -> compute_precip!(out, Y, p, t, land_model),
+    )
+
+    #Air temperature
+    add_diagnostic_variable!(
+        short_name = "tair",
+        long_name = "Air Temperature (K)",
+        standard_name = "tair",
+        units = "K",
+        comments = "The air temperature at the lowest level of the atmosphere (coupled) or 2m level (prescribed).",
+        compute! = (out, Y, p, t) -> compute_tair!(out, Y, p, t, land_model),
+    )
+
     # Specific humidity
     add_diagnostic_variable!(
         short_name = "qsfc",

src/diagnostics/land_compute_methods.jl

@@ -275,9 +275,27 @@ end
 @diagnostic_compute "radiation_longwave_down" Union{SoilCanopyModel, LandModel} p.drivers.LW_d
 @diagnostic_compute "radiation_shortwave_down" Union{SoilCanopyModel, LandModel} p.drivers.SW_d
 @diagnostic_compute "snowfall" Union{SoilCanopyModel, LandModel} p.drivers.P_snow
+@diagnostic_compute "tair" Union{SoilCanopyModel, LandModel} p.drivers.T
 @diagnostic_compute "specific_humidity" Union{SoilCanopyModel, LandModel} p.drivers.q
 @diagnostic_compute "wind_speed" Union{SoilCanopyModel, LandModel} p.drivers.u
 
+function compute_precip!(
+    out,
+    Y,
+    p,
+    t,
+    land_model::Union{SoilCanopyModel{FT}, LandModel{FT}},
+) where {FT}
+    if isnothing(out)
+        out = zeros(land_model.soil.domain.space.surface) # Allocates
+        fill!(field_values(out), NaN) # fill with NaNs, even over the ocean
+        @. out = (p.drivers.P_liq + p.drivers.P_snow) * 1000 # density of liquid water (1000kg/m^3)
+        return out
+    else
+        @. out = (p.drivers.P_liq + p.drivers.P_snow) * 1000# density of liquid water (1000kg/m^3)
+    end
+end
+
 ## Soil Module ##
 
 @diagnostic_compute "infiltration" Union{SoilCanopyModel, LandModel} p.soil.infiltration