Merge remote-tracking branch 'origin/ss/add-radiative-flux-diagnostic' into ss-nc/fix-climatoloy-experiment

Author: simone-silvestri

src/OceanSeaIceModels/InterfaceComputations/assemble_net_fluxes.jl

@@ -103,9 +103,15 @@ end
     α = stateindex(atmos_ocean_properties.radiation.α, i, j, kᴺ, grid, time)
     ϵ = stateindex(atmos_ocean_properties.radiation.ϵ, i, j, kᴺ, grid, time)
     Qu = upwelling_radiation(Tₛ, σ, ϵ)
-    Qr = (; Qs, Qℓ)
-    Qd = net_downwelling_radiation(Qr, α, ϵ)
-    ΣQao = Qd + Qu + Qc + Qv
+    Qdℓ = downwelling_longwave_radiation(Qℓ, ϵ)
+    Qds = downwelling_shortwave_radiation(Qs, α)
+    ΣQao = Qu + Qc + Qv + Qdℓ + Qds
+
+    @inbounds begin
+        atmos_ocean_fluxes.upwelling_longwave[i, j, 1] = Qu
+        atmos_ocean_fluxes.downwelling_longwave[i, j, 1] = Qdℓ
+        atmos_ocean_fluxes.downwelling_shortwave[i, j, 1] = Qds
+    end
 
     # Convert from a mass flux to a volume flux (aka velocity)
     # by dividing with the density of freshwater.

src/OceanSeaIceModels/InterfaceComputations/component_interfaces.jl

@@ -178,12 +178,23 @@ function atmosphere_ocean_interface(atmos,
                                     velocity_formulation,
                                     specific_humidity_formulation)
 
-    water_vapor   = Field{Center, Center, Nothing}(ocean.model.grid)
-    latent_heat   = Field{Center, Center, Nothing}(ocean.model.grid)
-    sensible_heat = Field{Center, Center, Nothing}(ocean.model.grid)
-    x_momentum    = Field{Center, Center, Nothing}(ocean.model.grid)
-    y_momentum    = Field{Center, Center, Nothing}(ocean.model.grid)
-    ao_fluxes = (; latent_heat, sensible_heat, water_vapor, x_momentum, y_momentum)
+    water_vapor           = Field{Center, Center, Nothing}(ocean.model.grid)
+    latent_heat           = Field{Center, Center, Nothing}(ocean.model.grid)
+    sensible_heat         = Field{Center, Center, Nothing}(ocean.model.grid)
+    x_momentum            = Field{Center, Center, Nothing}(ocean.model.grid)
+    y_momentum            = Field{Center, Center, Nothing}(ocean.model.grid)
+    upwelling_longwave    = Field{Center, Center, Nothing}(ocean.model.grid)
+    downwelling_longwave  = Field{Center, Center, Nothing}(ocean.model.grid)
+    downwelling_shortwave = Field{Center, Center, Nothing}(ocean.model.grid)
+
+    ao_fluxes = (; latent_heat, 
+                   sensible_heat, 
+                   water_vapor, 
+                   x_momentum,
+                   y_momentum, 
+                   upwelling_longwave,
+                   downwelling_longwave,
+                   downwelling_shortwave)
 
     σ = radiation.stefan_boltzmann_constant
     αₐₒ = radiation.reflection.ocean

src/OceanSeaIceModels/InterfaceComputations/radiation.jl

@@ -94,3 +94,6 @@ end
 @inline net_downwelling_radiation(i, j, grid, time, α, ϵ, Qs, Qℓ) = - (1 - α) * Qs - ϵ * Qℓ
 @inline net_downwelling_radiation(r, α, ϵ) = - (1 - α) * r.Qs - ϵ * r.Qℓ
 
+# Split the individual bands
+@inline downwelling_longwave_radiation(Qℓ, ϵ) = - ϵ * Qℓ
+@inline downwelling_shortwave_radiation(Qℓ, ϵ) = - (1 - α) * Qs