Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 23 additions & 22 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
env:
JULIA_VERSION: "1.10.10"
JULIA_VERSION: "1.12.0"
BUILDKITE_HOME: "/var/lib/buildkite-agent"
JULIA_DEPOT_PATH: "$BUILDKITE_HOME/.julia-oceananigans"
JULIA_PKG_SERVER_REGISTRY_PREFERENCE: eager
Expand Down Expand Up @@ -79,29 +79,30 @@ steps:
- "CPU"
- "GPU"
group:
- "🐇 unit"
# - "👻 abstract_operations"
# - "🕊 poisson_solvers_1"
- "🦖 poisson_solvers_2"
# - "🦤 general_solvers"
# - "🎣 turbulence_closures"
# - "🦀 time_stepping_1"
# - "🦈 time_stepping_2"
# - "🦟 time_stepping_3"
# - "🐫 nonhydrostatic_regression"
# - "🐙 hydrostatic_free_surface"
# - "🫐 tripolar_grid"
# - "🥑 vertical_coordinate"
# - "🙈 hydrostatic_regression"
# - "🦢 shallow_water"
# - "🐳 simulation"
# - "🍂 lagrangian_particles"
# - "🧅 multi_region"
# - "🦧 scripts"
# - "👺 enzyme"
# - "🍱 xesmf"
# - "👹 reactant_1"
- "🎭 reactant_2"
- "🐇 unit"
- "👻 abstract_operations"
- "🕊 poisson_solvers_1"
- "🦤 general_solvers"
- "🎣 turbulence_closures"
- "🦀 time_stepping_1"
- "🦈 time_stepping_2"
- "🦟 time_stepping_3"
- "🐫 nonhydrostatic_regression"
- "🐙 hydrostatic_free_surface"
- "🫐 tripolar_grid"
- "🥑 vertical_coordinate"
- "🙈 hydrostatic_regression"
- "🦢 shallow_water"
- "🐳 simulation"
- "🍂 lagrangian_particles"
- "🧅 multi_region"
- "🦧 scripts"
- "👺 enzyme"
- "🍱 xesmf"
- "👹 reactant_1"

retry:
automatic:
- exit_status: 1
Expand Down
8 changes: 4 additions & 4 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ OffsetArrays = "1.4"
OrderedCollections = "1.1"
Printf = "1.9"
Random = "1.9"
Reactant = "0.2.162"
Reactant = "0.2.169"
ReactantCore = "0.1"
Rotations = "1.0"
SeawaterPolynomials = "0.3.9"
Expand All @@ -110,14 +110,14 @@ AMDGPU = "21141c5a-9bdb-4563-92ae-f87d6854732e"
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
CUDA_Runtime_jll = "76a88914-d11a-5bdc-97e0-2f5a05c973a2"
DataDeps = "124859b0-ceae-595e-8997-d05f6a7a8dfe"
Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9"
# Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9"
MPIPreferences = "3da0fdf6-3ccc-4f1b-acd9-58baa6c99267"
Metal = "dde4c033-4e86-420c-a63e-0dd931031962"
Reactant = "3c362404-f566-11ee-1572-e11a4b42c853"
# Reactant = "3c362404-f566-11ee-1572-e11a4b42c853"
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
TimesDates = "bdfc003b-8df8-5c39-adcd-3a9087f5df4a"
oneAPI = "8f75cd03-7ff8-4ecb-9b8f-daf728133b1b"

[targets]
test = ["AMDGPU", "CUDA", "oneAPI", "DataDeps", "SafeTestsets", "Test", "Enzyme", "Reactant", "Metal", "XESMF", "CUDA_Runtime_jll", "MPIPreferences", "TimesDates", "NCDatasets"]
test = ["AMDGPU", "CUDA", "oneAPI", "DataDeps", "SafeTestsets", "Test", "Metal", "XESMF", "CUDA_Runtime_jll", "MPIPreferences", "TimesDates", "NCDatasets"]
15 changes: 8 additions & 7 deletions docs/make.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Distributed
Distributed.addprocs(2)
# using Distributed
# Distributed.addprocs(2)

@everywhere begin
# @everywhere begin
using Documenter
using DocumenterCitations
using Literate
Expand Down Expand Up @@ -49,11 +49,12 @@ Distributed.addprocs(2)
"one_dimensional_diffusion.jl",
"internal_wave.jl",
]
end
# end

@info string("Executing the examples using ", Distributed.nprocs(), " processes")
# @info string("Executing the examples using ", Distributed.nprocs(), " processes")

Distributed.pmap(1:length(example_scripts)) do n
# Distributed.pmap(1:length(example_scripts)) do n
for n in 1:length(example_scripts)
example = example_scripts[n]
example_filepath = joinpath(EXAMPLES_DIR, example)
withenv("JULIA_DEBUG" => "Literate") do
Expand All @@ -65,7 +66,7 @@ Distributed.pmap(1:length(example_scripts)) do n
end
end

Distributed.rmprocs()
# Distributed.rmprocs()

#####
##### Organize page hierarchies
Expand Down
2 changes: 1 addition & 1 deletion examples/internal_tide.jl
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ width = 20kilometers
hill(x) = h₀ * exp(-x^2 / 2width^2)
bottom(x) = - H + hill(x)

grid = ImmersedBoundaryGrid(underlying_grid, PartialCellBottom(bottom))
grid = ImmersedBoundaryGrid(underlying_grid, GridFittedBottom(bottom))

# Let's see how the domain with the bathymetry is.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ function mask_immersed_model_fields!(model, grid)
η = displacement(model.free_surface)
fields_to_mask = merge(model.auxiliary_fields, prognostic_fields(model))

foreach(fields_to_mask) do field
if field !== η
mask_immersed_field!(field)
foreach(keys(fields_to_mask)) do key
if key != :η
@inbounds mask_immersed_field!(fields_to_mask[key])
end
end
mask_immersed_field_xy!(η, k=size(grid, 3)+1)
Expand Down
2 changes: 1 addition & 1 deletion src/MultiRegion/multi_region_field.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ using Oceananigans.OutputWriters: output_indices

using Base: @propagate_inbounds

import Oceananigans.BoundaryConditions: regularize_field_boundary_conditions
import Oceananigans.BoundaryConditions: regularize_field_boundary_conditions, FieldBoundaryConditions
import Oceananigans.Diagnostics: hasnan
import Oceananigans.DistributedComputations: reconstruct_global_field, CommunicationBuffers
import Oceananigans.Fields: set!, compute!, compute_at!, interior, communication_buffers,
Expand Down
8 changes: 4 additions & 4 deletions src/Oceananigans.jl
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,10 @@ using DocStringExtensions
using FFTW

function __init__()
if VERSION >= v"1.11.0"
@warn """You are using Julia v1.11 or later!"
Oceananigans is currently tested on Julia v1.10."
If you find issues with Julia v1.11 or later,"
if VERSION >= v"1.13.0"
@warn """You are using Julia v1.13 or later!"
Oceananigans is currently tested on Julia v1.12."
If you find issues with Julia v1.13 or later,"
please report at https://github.com/CliMA/Oceananigans.jl/issues/new"""

end
Expand Down
2 changes: 1 addition & 1 deletion test/test_init.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Enzyme
# using Enzyme
using CUDA
using Metal
using AMDGPU
Expand Down
Loading