From 4f07e4dbfdf9f8a3cb540fd438f6eb584e7b7f00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20Kl=C3=B6wer?= Date: Mon, 9 Dec 2024 00:25:01 +0000 Subject: [PATCH] Change timestep to 40min at T31 (#623) * change timestep to 40min at T31 * update changelog * schedule tests updated * Rossby-Haurwitz docs with shorter dt * reduce stochastic stirrin strength --- CHANGELOG.md | 2 ++ docs/src/forcing_drag.md | 2 +- docs/src/initial_conditions.md | 4 +++- src/dynamics/time_integration.jl | 2 +- test/schedule.jl | 4 ++-- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a88f2eb4c..325775f1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +- Change default timestep to 40min at T31 [#623](https://github.com/SpeedyWeather/SpeedyWeather.jl/pull/623) + ## v0.13 - AbstractSurfacePerturbation introduced [#631](https://github.com/SpeedyWeather/SpeedyWeather.jl/pull/631) diff --git a/docs/src/forcing_drag.md b/docs/src/forcing_drag.md index 9ae98269f..f7a69ca05 100644 --- a/docs/src/forcing_drag.md +++ b/docs/src/forcing_drag.md @@ -42,7 +42,7 @@ using SpeedyWeather decorrelation_time::Second = Day(2) "Stirring strength A [1/s²]" - strength::NF = 5e-11 + strength::NF = 2e-11 "Stirring latitude [˚N]" latitude::NF = 45 diff --git a/docs/src/initial_conditions.md b/docs/src/initial_conditions.md index 3ce195f6a..31836dcea 100644 --- a/docs/src/initial_conditions.md +++ b/docs/src/initial_conditions.md @@ -202,7 +202,9 @@ initial_conditions = InitialConditions( pres=PressureOnOrography()) orography = NoOrography(spectral_grid) -model = PrimitiveDryModel(spectral_grid; initial_conditions, orography, physics=false) +time_stepping = Leapfrog(spectral_grid, Δt_at_T31=Minute(30)) # 30min timestep scaled linearly + +model = PrimitiveDryModel(spectral_grid; time_stepping, initial_conditions, orography, physics=false) simulation = initialize!(model) run!(simulation, period=Day(5)) nothing # hide diff --git a/src/dynamics/time_integration.jl b/src/dynamics/time_integration.jl index 18b27e8ba..074a83fe7 100644 --- a/src/dynamics/time_integration.jl +++ b/src/dynamics/time_integration.jl @@ -16,7 +16,7 @@ $(TYPEDFIELDS) # OPTIONS "Time step in minutes for T31, scale linearly to `trunc`" - Δt_at_T31::Second = Minute(30) + Δt_at_T31::Second = Minute(40) "Radius of sphere [m], used for scaling" radius::NF = DEFAULT_RADIUS diff --git a/test/schedule.jl b/test/schedule.jl index 63acac882..398662318 100644 --- a/test/schedule.jl +++ b/test/schedule.jl @@ -1,7 +1,7 @@ @testset "Periodic schedule" begin # especially T170 uses 337500 milliseconds time steps # not representable as seconds - for trunc in (31,42,63,85,127,170,255,341) + for trunc in (31, 42, 63, 85, 127, 170, 255, 341) spectral_grid = SpectralGrid(trunc=trunc, nlayers=1) time_stepping = Leapfrog(spectral_grid) @@ -10,7 +10,7 @@ SpeedyWeather.set_period!(clock, period) initialize!(clock, time_stepping) - hour = Hour(1) + hour = Hour(2) schedule = Schedule(every=hour) initialize!(schedule, clock)