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

Do not restrict bathymetry #335

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Do not restrict bathymetry #335

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
922a36e
Update Bathymetry.jl
simone-silvestri Jan 31, 2025
cc056e0
add a fill halo
simone-silvestri Feb 13, 2025
788e10a
Merge branch 'main' into ss/bathymetry
simone-silvestri Feb 13, 2025
467566e
Merge branch 'main' into ss/bathymetry
simone-silvestri Feb 14, 2025
7c9578c
Merge branch 'main' into ss/bathymetry
simone-silvestri Feb 15, 2025
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
27 changes: 6 additions & 21 deletions src/Bathymetry.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,25 +125,9 @@ function regrid_bathymetry(target_grid;
φ₁, φ₂ = y_domain(target_grid)
λ₁, λ₂ = x_domain(target_grid)

if λ₁ < 0 || λ₂ > 360
throw(ArgumentError("Cannot regrid bathymetry between λ₁ = $(λ₁) and λ₂ = $(λ₂).
Bathymetry data is defined on longitudes spanning λ = (0, 360)."))
end

# Calculate limiting indices on the bathymetry grid
i₁ = searchsortedfirst(λ_data, λ₁)
i₂ = searchsortedfirst(λ_data, λ₂) - 1
ii = i₁:i₂

j₁ = searchsortedfirst(φ_data, φ₁)
j₂ = searchsortedfirst(φ_data, φ₂) - 1
jj = j₁:j₂

# Restrict bathymetry coordinate_data to region of interest
λ_data = λ_data[ii] |> Array{BigFloat}
φ_data = φ_data[jj] |> Array{BigFloat}
z_data = z_data[ii, jj]

λ_data = λ_data |> Array{BigFloat}
φ_data = φ_data |> Array{BigFloat}

if !isnothing(height_above_water)
# Overwrite the height of cells above water.
# This has an impact on reconstruction. Greater height_above_water reduces total
Expand All @@ -164,7 +148,7 @@ function regrid_bathymetry(target_grid;
Nxn = length(λ_data)
Nyn = length(φ_data)
Nzn = 1

native_grid = LatitudeLongitudeGrid(arch;
size = (Nxn, Nyn, Nzn),
latitude = (φ₁_data, φ₂_data),
Expand All @@ -174,7 +158,8 @@ function regrid_bathymetry(target_grid;

native_z = Field{Center, Center, Nothing}(native_grid)
set!(native_z, z_data)

fill_halo_regions!(native_z)

target_z = interpolate_bathymetry_in_passes(native_z, target_grid;
passes = interpolation_passes)

Expand Down