Merge pull request #432 from SpeedyWeather/mk/parametrizations

Switch off dynamics
SpeedyWeather · Jan 18, 2024 · 7cb6485 · 7cb6485
2 parents 020d08f + 51b58f4
commit 7cb6485
Show file tree

Hide file tree

Showing 6 changed files with 765 additions and 709 deletions.
diff --git a/src/SpeedyWeather.jl b/src/SpeedyWeather.jl
@@ -183,7 +183,6 @@ include("dynamics/vertical_advection.jl")
 include("dynamics/implicit.jl")
 include("dynamics/scaling.jl")
 include("dynamics/tendencies.jl")
-include("dynamics/tendencies_dynamics.jl")
 
 # PARAMETERIZATIONS
 include("physics/tendencies.jl")

diff --git a/src/dynamics/models.jl b/src/dynamics/models.jl
@@ -149,6 +149,7 @@ Base.@kwdef struct PrimitiveDryModel{NF<:AbstractFloat, D<:AbstractDevice} <: Pr
     spectral_grid::SpectralGrid = SpectralGrid()
 
     # DYNAMICS
+    dynamics::Bool = true
     planet::AbstractPlanet = Earth()
     atmosphere::AbstractAtmosphere = EarthAtmosphere()
     initial_conditions::InitialConditions = ZonalWind()
@@ -236,6 +237,7 @@ Base.@kwdef struct PrimitiveWetModel{NF<:AbstractFloat, D<:AbstractDevice} <: Pr
     spectral_grid::SpectralGrid = SpectralGrid()
 
     # DYNAMICS
+    dynamics::Bool = true
     planet::AbstractPlanet = Earth()
     atmosphere::AbstractAtmosphere = EarthAtmosphere()
     initial_conditions::InitialConditions = ZonalWind()

diff --git a/src/dynamics/orography.jl b/src/dynamics/orography.jl
@@ -233,4 +233,7 @@ function initialize!(land_sea_mask::LandSeaMask)
 
     # average onto grid cells of the model
     RingGrids.grid_cell_average!(land_sea_mask.land_sea_mask,lsm_highres)
+
+    # TODO this shoudln't be necessary, but at the moment grid_cell_average! can return values > 1
+    clamp!(land_sea_mask.land_sea_mask,0,1)
 end