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

Persist FractionalIndices with two separate arrays for i, j #371

Merged
merged 23 commits into from
Mar 6, 2025
Merged

Persist FractionalIndices with two separate arrays for i, j #371

Changes from 3 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3e1178b
one missing allowscalar
simone-silvestri Mar 4, 2025
72dcc2f
small cleanup
simone-silvestri Mar 4, 2025
b0ef88f
bugfix
simone-silvestri Mar 4, 2025
3d07bc7
New way of constructing fractional indices
glwagner Mar 4, 2025
cf656fe
add topoology
simone-silvestri Mar 4, 2025
c4f1e93
Tuple of fractional indices
glwagner Mar 4, 2025
db2b3dc
Bugfix
glwagner Mar 4, 2025
a2f35f7
Bump ClimaSeaICe
glwagner Mar 4, 2025
9016c17
Fix bug in atmos interpolation
glwagner Mar 4, 2025
788aa89
Try to generalize to doubly-Flat grids
glwagner Mar 5, 2025
952e901
Bug in StateExchanger construcotr
glwagner Mar 5, 2025
ffd9373
Bump Oceananigans compat
glwagner Mar 5, 2025
9d8fe41
Merge branch 'main' into ss/fix-gpu-bug
simone-silvestri Mar 5, 2025
360bfa6
Update Project.toml
simone-silvestri Mar 5, 2025
635ead9
Update Project.toml
simone-silvestri Mar 5, 2025
e4822b5
fix test simulation
simone-silvestri Mar 5, 2025
aa08360
Fix interpolation for Flat topologies?
glwagner Mar 5, 2025
b6e57c4
Ohhh
glwagner Mar 5, 2025
b3b3b30
Fix test bug
glwagner Mar 5, 2025
2b57bb1
Better name
glwagner Mar 5, 2025
85f641e
Name mangle
glwagner Mar 5, 2025
990deb9
Fix test
glwagner Mar 5, 2025
9c0cc89
Tiny change in MixedLayerDepth diagnostic
glwagner Mar 6, 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
9 changes: 3 additions & 6 deletions src/OceanSeaIceModels/InterfaceComputations/component_interfaces.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ using StaticArrays
using Thermodynamics
using SurfaceFluxes
using OffsetArrays
using CUDA: @allowscalar

using ..OceanSeaIceModels: reference_density,
heat_capacity,
Expand Down Expand Up @@ -81,11 +80,9 @@ function StateExchanger(ocean::Simulation, atmosphere)
Nx, Ny, Nz = size(exchange_grid)

# Make an array of FractionalIndices
kᴺ = size(exchange_grid, 3)
@allowscalar X1 = _node(1, 1, kᴺ + 1, exchange_grid, c, c, f)
i1 = FractionalIndices(X1, atmosphere.grid, c, c, nothing)
frac_indices_data = [deepcopy(i1) for i=1:Nx+2, j=1:Ny+2, k=1:1]
frac_indices = OffsetArray(frac_indices_data, -1, -1, 0)
FT = eltype(exchange_grid)
frac_indices = [FractionalIndices(one(FT), one(FT), one(FT)) for i=1:Nx+2, j=1:Ny+2, k=1:1]
frac_indices = OffsetArray(frac_indices, -1, -1, 0)
frac_indices = on_architecture(arch, frac_indices)

kernel_parameters = interface_kernel_parameters(exchange_grid)
Expand Down