From d5d72ac159537b4ad58c60919996bcba151b1ef5 Mon Sep 17 00:00:00 2001 From: Gregory Wagner Date: Thu, 3 Feb 2022 23:12:45 -0700 Subject: [PATCH 1/2] Fixes FFT solver constructor for an ensemble of slice models --- .../slice_ensemble_model_mode.jl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Models/HydrostaticFreeSurfaceModels/slice_ensemble_model_mode.jl b/src/Models/HydrostaticFreeSurfaceModels/slice_ensemble_model_mode.jl index 03de555f87..7295aa6dc3 100644 --- a/src/Models/HydrostaticFreeSurfaceModels/slice_ensemble_model_mode.jl +++ b/src/Models/HydrostaticFreeSurfaceModels/slice_ensemble_model_mode.jl @@ -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.")) @@ -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) From 1a99eb01dc22d4e46c3abd82703097cd8285f2b9 Mon Sep 17 00:00:00 2001 From: "Navid C. Constantinou" Date: Fri, 4 Feb 2022 18:47:28 +1100 Subject: [PATCH 2/2] bump minor release --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index b8fbf30750..057ae7e9cd 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "Oceananigans" uuid = "9e8cae18-63c1-5223-a75c-80ca9d6e9a09" -version = "0.69.4" +version = "0.69.5" [deps] Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"