From 8bd70c8fa1e5b3f0913b88673d22906d6e770efe Mon Sep 17 00:00:00 2001 From: Jago Stong-Wright Date: Thu, 28 Dec 2023 15:10:49 +0000 Subject: [PATCH] use convienence constructor --- src/wall_model.jl | 10 +++++----- src/wind_stress.jl | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/wall_model.jl b/src/wall_model.jl index 4a8f9fd..64700a7 100644 --- a/src/wall_model.jl +++ b/src/wall_model.jl @@ -38,7 +38,7 @@ adapt_structure(to, ws::WallStress) = WallStress(ws.von_Karman_constant, ws.kine kinematic_viscosity = 1e-6, B = 5.2, precomputed_friction_velocities = false, - precompute_speeds = 0:25/100000:25, + precompute_speeds = [0:25/100000:25;], grid = nothing) Returns a wall stress model for LES simulation with default parameters similar @@ -93,7 +93,7 @@ function WallStress(; von_Karman_constant::FT = 0.4, kinematic_viscosity::FT = 1.15e-6, B::FT = 5.2, precomputed_friction_velocities = false, - precompute_speeds = 0:25/100000:25, + precompute_speeds = [0:25/100000:25;], grid = nothing) where FT if precomputed_friction_velocities @@ -112,7 +112,7 @@ function WallStress(; von_Karman_constant::FT = 0.4, velocities[n] = find_friction_velocity(tmp, speed, params) end - friction_velocities = SimpleInterpolation((x₀ = minimum(precompute_speeds), Δx = Float64(precompute_speeds.step)), velocities) + friction_velocities = SimpleInterpolation(precompute_speeds, velocities) else friction_velocities = nothing end @@ -157,7 +157,7 @@ end WallStressBoundaryConditions(; von_Karman_constant = 0.4, kinematic_viscosity = 1e-6, B = 5.2, - precompute_speeds = 0:25/100000:25, + precompute_speeds = [0:25/100000:25;], grid = nothing) Convenience constructor to setup `WallStress` boundary conditions. @@ -206,7 +206,7 @@ function WallStressBoundaryConditions(; von_Karman_constant::FT = 0.4, kinematic_viscosity::FT = 1.15e-6, B::FT = 5.2, precomputed_friction_velocities = false, - precompute_speeds = 0:25/100000:25, + precompute_speeds = [0:25/100000:25;], grid = nothing) where FT wall_stress_instance = WallStress(; von_Karman_constant, diff --git a/src/wind_stress.jl b/src/wind_stress.jl index a6ca8f5..e8f311f 100644 --- a/src/wind_stress.jl +++ b/src/wind_stress.jl @@ -268,7 +268,7 @@ function LogarithmicNeutralWind(; monin_obukhov_stability_length::FT = 0.4, gravity_acceleration::FT = g_Earth, precomputed_roughness_length = false, - precompute_wind_speeds = 0:25/100000:25) where FT + precompute_wind_speeds = [0:25/100000:25;]) where FT if precomputed_roughness_length tmp = LogarithmicNeutralWind(monin_obukhov_stability_length, charnock_coefficient, @@ -290,7 +290,7 @@ function LogarithmicNeutralWind(; monin_obukhov_stability_length::FT = 0.4, lengths[n] = find_velocity_roughness_length(tmp, wind_speed, 10, params) end - roughness_length = SimpleInterpolation((x₀ = minimum(precompute_wind_speeds), Δx = Float64(precompute_wind_speeds.step)), lengths) + roughness_length = SimpleInterpolation(precompute_wind_speeds, lengths) else roughness_length = nothing end