Surface fluxes modular on ocean and land (#667)

* Surface fluxes modular on ocean and land * update changelog * Evaporation over land/ocean modularised * typo for prescribed heat flux * split sensible/evaporative flux into ocean vs land * move prescribed fluxes to prognostic variables * typos everywhere
SpeedyWeather · Jan 24, 2025 · 7825893 · 7825893
1 parent 450e935
commit 7825893
Show file tree

Hide file tree

Showing 12 changed files with 509 additions and 284 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Prescribed ocean/land heat fluxes modular [#667](https://github.com/SpeedyWeather/SpeedyWeather.jl/pull/667)
 - NetCDF output for tracers defined, precipitation rate output at initialize! again [#657](https://github.com/SpeedyWeather/SpeedyWeather.jl/pull/657)
 - Precipitation rate from large-scale condensation/convection for coupling [#669](https://github.com/SpeedyWeather/SpeedyWeather.jl/pull/669)
 - Fixed a bug, so that sum now works for LowerTraingularArrays [#668](https://github.com/SpeedyWeather/SpeedyWeather.jl/pull/668)

diff --git a/src/SpeedyWeather.jl b/src/SpeedyWeather.jl
@@ -135,7 +135,10 @@ include("physics/boundary_layer.jl")
 include("physics/temperature_relaxation.jl")
 include("physics/vertical_diffusion.jl")
 include("physics/large_scale_condensation.jl")
-include("physics/surface_fluxes.jl")
+include("physics/surface_fluxes/surface_fluxes.jl")
+include("physics/surface_fluxes/momentum.jl")
+include("physics/surface_fluxes/heat.jl")
+include("physics/surface_fluxes/moisture.jl")
 include("physics/convection.jl")
 include("physics/zenith.jl")
 include("physics/optical_depth.jl")

diff --git a/src/dynamics/diagnostic_variables.jl b/src/dynamics/diagnostic_variables.jl
@@ -282,7 +282,7 @@ $(TYPEDFIELDS)"""
     # SURFACE FLUXES
     "Sensible heat flux [W/m²], positive up"
     sensible_heat_flux::GridVariable2D = zeros(GridVariable2D, nlat_half)
-
+    
     "Evaporative flux [kg/s/m^2], positive up"
     evaporative_flux::GridVariable2D = zeros(GridVariable2D, nlat_half)
 

diff --git a/src/dynamics/prognostic_variables.jl b/src/dynamics/prognostic_variables.jl
@@ -20,6 +20,12 @@ export PrognosticVariablesOcean
 
     "Sea ice concentration [1]"
     sea_ice_concentration::GridVariable2D = zeros(GridVariable2D, nlat_half)
+
+    "Prescribed ocean sensible heat flux [W/m²]"
+    sensible_heat_flux::GridVariable2D = zeros(GridVariable2D, nlat_half)
+
+    "Prescribed ocean evaporative flux [kg/s/m²]"
+    evaporative_flux::GridVariable2D = zeros(GridVariable2D, nlat_half)
 end
 
 export PrognosticVariablesLand
@@ -44,6 +50,12 @@ export PrognosticVariablesLand
 
     "Soil moisture layer 2, volume fraction [1]"
     soil_moisture_layer2::GridVariable2D = zeros(GridVariable2D, nlat_half)
+
+    "Prescribed land sensible heat flux [W/m²]"
+    sensible_heat_flux::GridVariable2D = zeros(GridVariable2D, nlat_half)
+
+    "Prescribed land evaporative flux [kg/s/m²]"
+    evaporative_flux::GridVariable2D = zeros(GridVariable2D, nlat_half)
 end
 
 export PrognosticVariables

diff --git a/src/physics/surface_fluxes.jl b/src/physics/surface_fluxes.jl