diff --git a/Project.toml b/Project.toml index 9cf1016307..70195ddfea 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Oceananigans" uuid = "9e8cae18-63c1-5223-a75c-80ca9d6e9a09" authors = ["Climate Modeling Alliance and contributors"] -version = "0.85.0" +version = "0.86.0" [deps] Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" @@ -55,7 +55,7 @@ PencilFFTs = "0.13.5, 0.14, 0.15" Rotations = "1.0" SeawaterPolynomials = "0.3.2" StructArrays = "0.4, 0.5, 0.6" -julia = "1.6" +julia = "1.9" [extras] BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf" diff --git a/README.md b/README.md index 032d73ebb8..b08fb01ab6 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ Oceananigans.jl is developed by the [Climate Modeling Alliance](https://clima.ca Oceananigans is a [registered Julia package](https://julialang.org/packages/). So to install it, -1. [Download Julia](https://julialang.org/downloads/). +1. [Download Julia](https://julialang.org/downloads/) (version 1.9 or later). 2. Launch Julia and type diff --git a/docs/src/index.md b/docs/src/index.md index dcf6a3e244..0c71c26c18 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -24,9 +24,8 @@ julia> using Pkg julia> Pkg.add("Oceananigans") ``` -!!! compat "Julia 1.6 is required; Julia 1.9 or newer is suggested" - The latest version of Oceananigans strongly suggests _at least_ Julia 1.9 or later to run. - While most scripts will run on Julia 1.6, 1.7, or 1.8, Oceananigans is continuously tested _only_ on Julia 1.9. +!!! compat "Julia 1.9 is required" + Oceananigans requires Julia 1.9 or later. 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/Fields/field.jl b/src/Fields/field.jl index 4f0b8a6c86..4f4e9b3a27 100644 --- a/src/Fields/field.jl +++ b/src/Fields/field.jl @@ -545,13 +545,10 @@ const MinimumReduction = typeof(Base.minimum!) const AllReduction = typeof(Base.all!) const AnyReduction = typeof(Base.any!) -check_version_larger_than_7() = VERSION.minor > 7 - -initialize_reduced_field!(::SumReduction, f, r::ReducedField, c) = check_version_larger_than_7() ? Base.initarray!(interior(r), f, Base.add_sum, true, interior(c)) : Base.initarray!(interior(r), Base.add_sum, true, interior(c)) -initialize_reduced_field!(::ProdReduction, f, r::ReducedField, c) = check_version_larger_than_7() ? Base.initarray!(interior(r), f, Base.mul_prod, true, interior(c)) : Base.initarray!(interior(r), Base.mul_prod, true, interior(c)) -initialize_reduced_field!(::AllReduction, f, r::ReducedField, c) = check_version_larger_than_7() ? Base.initarray!(interior(r), f, &, true, interior(c)) : Base.initarray!(interior(r), &, true, interior(c)) -initialize_reduced_field!(::AnyReduction, f, r::ReducedField, c) = check_version_larger_than_7() ? Base.initarray!(interior(r), f, |, true, interior(c)) : Base.initarray!(interior(r), |, true, interior(c)) - +initialize_reduced_field!(::SumReduction, f, r::ReducedField, c) = Base.initarray!(interior(r), f, Base.add_sum, true, interior(c)) +initialize_reduced_field!(::ProdReduction, f, r::ReducedField, c) = Base.initarray!(interior(r), f, Base.mul_prod, true, interior(c)) +initialize_reduced_field!(::AllReduction, f, r::ReducedField, c) = Base.initarray!(interior(r), f, &, true, interior(c)) +initialize_reduced_field!(::AnyReduction, f, r::ReducedField, c) = Base.initarray!(interior(r), f, |, true, interior(c)) initialize_reduced_field!(::MaximumReduction, f, r::ReducedField, c) = Base.mapfirst!(f, interior(r), interior(c)) initialize_reduced_field!(::MinimumReduction, f, r::ReducedField, c) = Base.mapfirst!(f, interior(r), interior(c)) diff --git a/src/Oceananigans.jl b/src/Oceananigans.jl index 4d2f23e587..86766cf6b3 100644 --- a/src/Oceananigans.jl +++ b/src/Oceananigans.jl @@ -4,10 +4,6 @@ data-driven, ocean-flavored fluid dynamics on CPUs and GPUs. """ module Oceananigans -if VERSION < v"1.8" - @warn "Oceananigans is tested on Julia v1.8 and therefore it is strongly recommended you run Oceananigans on Julia v1.8 or newer." -end - export # Architectures CPU, GPU,