diff --git a/.buildkite/pipeline-benchmarks.yml b/.buildkite/pipeline-benchmarks.yml index feac4821dd..4e1a4e6d08 100644 --- a/.buildkite/pipeline-benchmarks.yml +++ b/.buildkite/pipeline-benchmarks.yml @@ -1,6 +1,6 @@ env: - JULIA_VERSION: "1.10.10" - JULIA_MINOR_VERSION: "1.10" + JULIA_VERSION: "1.11.6" + JULIA_MINOR_VERSION: "1.11" TARTARUS_HOME: "/storage5/buildkite-agent" JULIA_DEPOT_PATH: "$TARTARUS_HOME/.julia-$BUILDKITE_BUILD_NUMBER" JULIA_PKG_SERVER_REGISTRY_PREFERENCE: eager diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index a02042670e..15f4353e59 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,5 +1,5 @@ env: - JULIA_VERSION: "1.10.10" + JULIA_VERSION: "1.11.6" BUILDKITE_HOME: "/var/lib/buildkite-agent" JULIA_DEPOT_PATH: "$BUILDKITE_HOME/.julia-oceananigans" JULIA_PKG_SERVER_REGISTRY_PREFERENCE: eager diff --git a/.github/workflows/ci.yml b/.github/workflows/CI.yml similarity index 98% rename from .github/workflows/ci.yml rename to .github/workflows/CI.yml index 986a899388..3c7a4af1c0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/CI.yml @@ -68,7 +68,7 @@ jobs: fail-fast: false matrix: version: - - '1.10' + - '1.11' os: - ubuntu-latest arch: @@ -118,7 +118,7 @@ jobs: fail-fast: false matrix: version: - - '1.10' + - '1.11' os: - ubuntu-latest arch: @@ -143,7 +143,7 @@ jobs: fail-fast: false matrix: version: - - '1.10' + - '1.11' os: - macos-latest arch: diff --git a/docs/Project.toml b/docs/Project.toml index 63ccefcce4..bf4c8f5a93 100644 --- a/docs/Project.toml +++ b/docs/Project.toml @@ -20,7 +20,7 @@ CUDA = "5.4 - 5.8.2" CairoMakie = "0.11, 0.12, 0.13, 0.14" Documenter = "1" DocumenterCitations = "1" -JLD2 = "0.4, 0,5" +JLD2 = "0.4, 0.5" Literate = "2.9" NCDatasets = "0.12.10, 0.13.1, 0.14" Polynomials = "4" diff --git a/docs/src/index.md b/docs/src/index.md index 6a2c0ccee3..e690f0939a 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -28,7 +28,7 @@ julia> Pkg.add("Oceananigans") Oceananigans requires Julia 1.9 or later. !!! info "Tested Julia versions" - Oceananigans is currently tested on Julia 1.10. + Oceananigans is currently tested on Julia 1.11. If you're [new to Julia](https://docs.julialang.org/en/v1/manual/getting-started/) and its [wonderful `Pkg` manager](https://docs.julialang.org/en/v1/stdlib/Pkg/), the [Oceananigans wiki](https://github.com/CliMA/Oceananigans.jl/wiki) provides [more detailed installation instructions](https://github.com/CliMA/Oceananigans.jl/wiki/Installation-and-getting-started-with-Oceananigans). diff --git a/src/Models/HydrostaticFreeSurfaceModels/update_hydrostatic_free_surface_model_state.jl b/src/Models/HydrostaticFreeSurfaceModels/update_hydrostatic_free_surface_model_state.jl index 16587f9d77..3a41bd1876 100644 --- a/src/Models/HydrostaticFreeSurfaceModels/update_hydrostatic_free_surface_model_state.jl +++ b/src/Models/HydrostaticFreeSurfaceModels/update_hydrostatic_free_surface_model_state.jl @@ -60,8 +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 !== η + foreach(keys(fields_to_mask)) do key + if key != :η + field = @inbounds fields_to_mask[key] mask_immersed_field!(field) end end diff --git a/test/test_enzyme.jl b/test/test_enzyme.jl index 23d6a4a9b0..76506e9273 100644 --- a/test/test_enzyme.jl +++ b/test/test_enzyme.jl @@ -6,6 +6,7 @@ using Oceananigans.TimeSteppers: reset! # Required presently Enzyme.API.looseTypeAnalysis!(true) Enzyme.API.maxtypeoffset!(2032) +Enzyme.Compiler.VERBOSE_ERRORS[] = true # OceananigansLogger doesn't work here -- not sure why Logging.global_logger(TestLogger())