Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes FFT solver constructor for an ensemble of slice models #2220

Merged
merged 2 commits into from
Feb 4, 2022
Merged

Fixes FFT solver constructor for an ensemble of slice models #2220

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5d72ac
Fixes FFT solver constructor for an ensemble of slice models
glwagner Feb 4, 2022
1a99eb0
bump minor release
navidcy Feb 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/Models/HydrostaticFreeSurfaceModels/slice_ensemble_model_mode.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const CoriolisVector = AbstractVector{<:AbstractRotation}
@inline y_f_cross_U(i, j, k, grid::YZSliceGrid, coriolis::CoriolisVector, U) = @inbounds y_f_cross_U(i, j, k, grid, coriolis[i], U)
@inline z_f_cross_U(i, j, k, grid::YZSliceGrid, coriolis::CoriolisVector, U) = @inbounds z_f_cross_U(i, j, k, grid, coriolis[i], U)

function FFTImplicitFreeSurfaceSolver(arch, grid::YZSliceGrid, settings)
function FFTImplicitFreeSurfaceSolver(grid::YZSliceGrid, gravitational_acceleration::Number, settings)

grid isa HRegRectilinearGrid ||
throw(ArgumentError("FFTImplicitFreeSurfaceSolver requires horizontally-regular rectilinear grids."))
Expand All @@ -86,12 +86,13 @@ function FFTImplicitFreeSurfaceSolver(arch, grid::YZSliceGrid, settings)

sz = SliceEnsembleSize(size=(grid.Ny, 1), ensemble=grid.Nx, halo=(grid.Hy, 0))

horizontal_grid = RectilinearGrid(; topology = (Flat, TY, Flat),
size = sz,
halo = grid.Hy,
y = y_domain(grid))
horizontal_grid = RectilinearGrid(architecture(grid);
topology = (Flat, TY, Flat),
size = sz,
halo = grid.Hy,
y = y_domain(grid))

solver = FFTBasedPoissonSolver(arch, horizontal_grid)
solver = FFTBasedPoissonSolver(horizontal_grid)
right_hand_side = solver.storage

return FFTImplicitFreeSurfaceSolver(solver, grid, horizontal_grid, right_hand_side)
Expand Down