From 6bac83d68809ef6e42ce27b702e9600b3b06977d Mon Sep 17 00:00:00 2001 From: Simone Silvestri <33547697+simone-silvestri@users.noreply.github.com> Date: Fri, 1 Mar 2024 15:49:48 -0500 Subject: [PATCH 1/2] bugfix --- test/test_distributed_hydrostatic_model.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_distributed_hydrostatic_model.jl b/test/test_distributed_hydrostatic_model.jl index 8511a4c8ad..dc2b7b5d6e 100644 --- a/test/test_distributed_hydrostatic_model.jl +++ b/test/test_distributed_hydrostatic_model.jl @@ -79,7 +79,7 @@ Ny = 32 for arch in archs @testset "Testing distributed solid body rotation" begin grid = LatitudeLongitudeGrid(arch, size = (Nx, Ny, 1), - halo = (3, 3, 3), + halo = (4, 4, 4), latitude = (-80, 80), longitude = (-160, 160), z = (-1, 0), From c4ecbd093cda5fff16dd1558801a12ba08e255a5 Mon Sep 17 00:00:00 2001 From: Simone Silvestri <33547697+simone-silvestri@users.noreply.github.com> Date: Wed, 27 Mar 2024 09:48:16 -0400 Subject: [PATCH 2/2] extend methods --- src/ImmersedBoundaries/ImmersedBoundaries.jl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ImmersedBoundaries/ImmersedBoundaries.jl b/src/ImmersedBoundaries/ImmersedBoundaries.jl index f13bdabb4b..137a8a30ab 100644 --- a/src/ImmersedBoundaries/ImmersedBoundaries.jl +++ b/src/ImmersedBoundaries/ImmersedBoundaries.jl @@ -91,6 +91,8 @@ import Oceananigans.TurbulenceClosures: νᶠᶜᶠ, z_bottom +import Oceananigans.Fields: fractional_x_index, fractional_y_index, fractional_z_index + """ abstract type AbstractImmersedBoundary @@ -235,7 +237,6 @@ As well as @inline immersed_inactive_node(i, j, k, ibg::IBG, LX, LY, LZ) = inactive_node(i, j, k, ibg, LX, LY, LZ) & !inactive_node(i, j, k, ibg.underlying_grid, LX, LY, LZ) - ##### ##### Utilities ##### @@ -279,6 +280,10 @@ end isrectilinear(ibg::IBG) = isrectilinear(ibg.underlying_grid) +@inline fractional_x_index(x, locs, grid::ImmersedBoundaryGrid) = fractional_x_index(x, locs, grid.underlying_grid) +@inline fractional_y_index(x, locs, grid::ImmersedBoundaryGrid) = fractional_y_index(x, locs, grid.underlying_grid) +@inline fractional_z_index(x, locs, grid::ImmersedBoundaryGrid) = fractional_z_index(x, locs, grid.underlying_grid) + ##### ##### Diffusivities (for VerticallyImplicit) ##### (the diffusivities on the immersed boundaries are kept)