Skip to content

Always interpolate bathymetry in passes #496

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

Merged
merged 4 commits into from
May 16, 2025
Merged

Always interpolate bathymetry in passes #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac532a9
Always interpolate bathymetry in passes
glwagner Apr 30, 2025
6af9548
Update test_bathymetry.jl
glwagner May 1, 2025
6f20b35
Update test_ocean_sea_ice_model.jl
glwagner May 6, 2025
a23e2e7
Merge branch 'main' into glw/always-pass
simone-silvestri May 16, 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
36 changes: 2 additions & 34 deletions src/Bathymetry.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,38 +224,6 @@ function interpolate_bathymetry_in_passes(native_z, target_grid;
Nλt, Nφt = Nt = size(target_grid)
Nλn, Nφn = Nn = size(native_z)

resxt = minimum_xspacing(target_grid)
resyt = minimum_yspacing(target_grid)

resxn = minimum_xspacing(native_z.grid)
resyn = minimum_yspacing(native_z.grid)

# Check whether we are refining the grid in any directions.
# If so, skip interpolation passes, as they are not needed.
if resxt < resxn || resyt < resyn
target_z = Field{Center, Center, Nothing}(target_grid)

@info "Interpolating bathymetry of size $Nn onto a $gridtype target grid of size $Nt"
interpolate!(target_z, native_z)

if passes > 0
passes_str = passes == 1 ? "1 interpolation pass" : "$passes interpolation passes"

@info string("Skipping extra $passes_str for bathymetry.", '\n',
"Extra interpolation passes may only be used to coarsen bathymetry", '\n',
"and require that the bathymetry is finer than the target grid in", '\n',
"both horizontal directions.", '\n',
"Grid info:", '\n',
"target grid", '\n',
"├── minimum x-spacings ", @sprintf("%.3e", resxt), " m", '\n',
"└── minimum y-spacings ", @sprintf("%.3e", resyt), " m", '\n',
"bathymetry grid", '\n',
"├── minimum x-spacings ", @sprintf("%.3e", resxn), " m", '\n',
"└── minimum y-spacings ", @sprintf("%.3e", resyn), " m")
end
return target_z
end

# Interpolate in passes
latitude = y_domain(native_z.grid)
longitude = x_domain(native_z.grid)
Expand All @@ -275,7 +243,7 @@ function interpolate_bathymetry_in_passes(native_z, target_grid;
@info "Interpolation passes of bathymetry size $(size(old_z)) onto a $gridtype target grid of size $Nt:"
for pass = 1:passes - 1
new_size = (Nλ[pass], Nφ[pass], 1)
@info " pass $pass to size $new_size"
@info " Performing pass $pass to size $new_size."

new_grid = LatitudeLongitudeGrid(architecture(target_grid), Float32,
size = new_size,
Expand Down Expand Up @@ -469,4 +437,4 @@ end
retrieve_bathymetry(grid, ::Nothing; kw...) = regrid_bathymetry(grid; kw...)
retrieve_bathymetry(grid; kw...) = regrid_bathymetry(grid; kw...)

end # module
end # module
16 changes: 2 additions & 14 deletions test/test_bathymetry.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ using ClimaOcean

using ClimaOcean.Bathymetry: remove_minor_basins!

@testset "Availability of Bathymetry" begin
@info "Testing Bathymetry utils..."
@testset "Bathymetry construction and smoothing" begin
@info "Testing Bathymetry construction and smoothing..."
for arch in test_architectures

grid = LatitudeLongitudeGrid(arch;
Expand Down Expand Up @@ -50,18 +50,6 @@ using ClimaOcean.Bathymetry: remove_minor_basins!
# of -1000 meters
@test mean(view(bottom_height, 51:100, :, 1)) == -1000

grid = LatitudeLongitudeGrid(arch;
size = (200, 200, 10),
longitude = (0, 2),
latitude = (-0.1, 0.1),
z = (-6000, 0))

control_bottom_height = regrid_bathymetry(grid)
interpolated_bottom_height = regrid_bathymetry(grid; interpolation_passes=100)

# Testing that multiple passes do not change the solution when refining the grid
@test parent(control_bottom_height) == parent(interpolated_bottom_height)

grid = LatitudeLongitudeGrid(arch;
size = (200, 200, 10),
longitude = (0, 100),
Expand Down
2 changes: 1 addition & 1 deletion test/test_ocean_sea_ice_model.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ using ClimaSeaIce.Rheologies

bottom_height = regrid_bathymetry(grid;
minimum_depth = 10,
interpolation_passes = 20,
interpolation_passes = 5,
major_basins = 1)

grid = ImmersedBoundaryGrid(grid, GridFittedBottom(bottom_height); active_cells_map=true)
Expand Down
Loading