Some code clean-up (#4806)

Author: tomchor

src/AbstractOperations/AbstractOperations.jl

@@ -15,9 +15,8 @@ using Oceananigans.BoundaryConditions
 using Oceananigans.Fields
 using Oceananigans.Utils
 
-using Oceananigans: location, AbstractModel
+using Oceananigans: location
 using Oceananigans.Operators: interpolation_operator
-using Oceananigans.Architectures: device
 
 import Adapt
 

src/AbstractOperations/binary_operations.jl

@@ -67,7 +67,7 @@ function define_binary_operator(op)
         local ConstantField = Oceananigans.Fields.ConstantField
         local AF = AbstractField
 
-        @inline $op(i, j, k, grid::AbstractGrid, ▶a, ▶b, a, b) = 
+        @inline $op(i, j, k, grid::AbstractGrid, ▶a, ▶b, a, b) =
             @inbounds apply_op($op, ▶a(i, j, k, grid, a), ▶b(i, j, k, grid, b))
 
         # These shenanigans seem to help / encourage the compiler to infer types of objects

src/AbstractOperations/conditional_operations.jl

@@ -1,8 +1,8 @@
-using Oceananigans.Fields: OneField, ReducedAbstractField, filltype, reduced_location, initialize_reduced_field!
+using Oceananigans.Fields: OneField
 using Oceananigans.Grids: architecture
 using Base: @propagate_inbounds
 
-import Base: minimum, maximum, sum, all, any, prod
+import Base: sum
 import Oceananigans.Architectures: on_architecture
 import Oceananigans.Fields: condition_operand, conditional_length, set!, compute_at!, indices
 

src/AbstractOperations/metric_field_reductions.jl

@@ -1,4 +1,4 @@
-using Statistics: mean!, sum!
+using Statistics: sum!
 
 using Oceananigans.Utils: tupleit
 using Oceananigans.Grids: regular_dimensions

src/Advection/centered_reconstruction.jl

@@ -17,7 +17,7 @@ function Centered(FT::DataType=Oceananigans.defaults.FloatType; order = 2)
     else
         buffer_scheme = nothing
     end
-    
+
     return Centered{N, FT}(buffer_scheme)
 end
 
@@ -47,7 +47,7 @@ for buffer in advection_buffers, FT in fully_supported_float_types
         @inline symmetric_interpolate_xᶠᵃᵃ(i, j, k, grid, ::Centered{$buffer, $FT}, ψ, args...) = @inbounds @muladd $(calc_reconstruction_stencil(FT, buffer, :symmetric, :x, false))
         @inline symmetric_interpolate_yᵃᶠᵃ(i, j, k, grid, ::Centered{$buffer, $FT}, ψ, args...) = @inbounds @muladd $(calc_reconstruction_stencil(FT, buffer, :symmetric, :y, false))
         @inline symmetric_interpolate_zᵃᵃᶠ(i, j, k, grid, ::Centered{$buffer, $FT}, ψ, args...) = @inbounds @muladd $(calc_reconstruction_stencil(FT, buffer, :symmetric, :z, false))
-        
+
         @inline symmetric_interpolate_xᶠᵃᵃ(i, j, k, grid, ::Centered{$buffer, $FT}, ψ::Callable, args...) = @inbounds @muladd $(calc_reconstruction_stencil(FT, buffer, :symmetric, :x,  true))
         @inline symmetric_interpolate_yᵃᶠᵃ(i, j, k, grid, ::Centered{$buffer, $FT}, ψ::Callable, args...) = @inbounds @muladd $(calc_reconstruction_stencil(FT, buffer, :symmetric, :y,  true))
         @inline symmetric_interpolate_zᵃᵃᶠ(i, j, k, grid, ::Centered{$buffer, $FT}, ψ::Callable, args...) = @inbounds @muladd $(calc_reconstruction_stencil(FT, buffer, :symmetric, :z,  true))

src/Advection/upwind_biased_reconstruction.jl

@@ -59,28 +59,28 @@ const AUAS = AbstractUpwindBiasedAdvectionScheme
 # Uniform upwind biased reconstruction
 for buffer in advection_buffers, FT in fully_supported_float_types
     @eval begin
-        @inline biased_interpolate_xᶠᵃᵃ(i, j, k, grid, ::UpwindBiased{$buffer, $FT}, bias, ψ, args...) = 
-            @inbounds @muladd ifelse(bias isa LeftBias, $(calc_reconstruction_stencil(FT, buffer, :left,  :x, false)), 
+        @inline biased_interpolate_xᶠᵃᵃ(i, j, k, grid, ::UpwindBiased{$buffer, $FT}, bias, ψ, args...) =
+            @inbounds @muladd ifelse(bias isa LeftBias, $(calc_reconstruction_stencil(FT, buffer, :left,  :x, false)),
                                                         $(calc_reconstruction_stencil(FT, buffer, :right, :x, false)))
 
-        @inline biased_interpolate_xᶠᵃᵃ(i, j, k, grid, ::UpwindBiased{$buffer, $FT}, bias, ψ::Callable, args...) = 
-            @inbounds @muladd ifelse(bias isa LeftBias, $(calc_reconstruction_stencil(FT, buffer, :left,  :x, true)), 
+        @inline biased_interpolate_xᶠᵃᵃ(i, j, k, grid, ::UpwindBiased{$buffer, $FT}, bias, ψ::Callable, args...) =
+            @inbounds @muladd ifelse(bias isa LeftBias, $(calc_reconstruction_stencil(FT, buffer, :left,  :x, true)),
                                                         $(calc_reconstruction_stencil(FT, buffer, :right, :x, true)))
-    
-        @inline biased_interpolate_yᵃᶠᵃ(i, j, k, grid, ::UpwindBiased{$buffer, $FT}, bias, ψ, args...) = 
-            @inbounds @muladd ifelse(bias isa LeftBias, $(calc_reconstruction_stencil(FT, buffer, :left,  :y, false)), 
+
+        @inline biased_interpolate_yᵃᶠᵃ(i, j, k, grid, ::UpwindBiased{$buffer, $FT}, bias, ψ, args...) =
+            @inbounds @muladd ifelse(bias isa LeftBias, $(calc_reconstruction_stencil(FT, buffer, :left,  :y, false)),
                                                         $(calc_reconstruction_stencil(FT, buffer, :right, :y, false)))
-                                                 
-        @inline biased_interpolate_yᵃᶠᵃ(i, j, k, grid, ::UpwindBiased{$buffer, $FT}, bias, ψ::Callable, args...) = 
-            @inbounds @muladd ifelse(bias isa LeftBias, $(calc_reconstruction_stencil(FT, buffer, :left,  :y, true)), 
+
+        @inline biased_interpolate_yᵃᶠᵃ(i, j, k, grid, ::UpwindBiased{$buffer, $FT}, bias, ψ::Callable, args...) =
+            @inbounds @muladd ifelse(bias isa LeftBias, $(calc_reconstruction_stencil(FT, buffer, :left,  :y, true)),
                                                         $(calc_reconstruction_stencil(FT, buffer, :right, :y, true)))
-    
-        @inline biased_interpolate_zᵃᵃᶠ(i, j, k, grid, ::UpwindBiased{$buffer, $FT}, bias, ψ, args...) = 
-            @inbounds @muladd ifelse(bias isa LeftBias, $(calc_reconstruction_stencil(FT, buffer, :left,  :z, false)), 
+
+        @inline biased_interpolate_zᵃᵃᶠ(i, j, k, grid, ::UpwindBiased{$buffer, $FT}, bias, ψ, args...) =
+            @inbounds @muladd ifelse(bias isa LeftBias, $(calc_reconstruction_stencil(FT, buffer, :left,  :z, false)),
                                                         $(calc_reconstruction_stencil(FT, buffer, :right, :z, false)))
 
-        @inline biased_interpolate_zᵃᵃᶠ(i, j, k, grid, ::UpwindBiased{$buffer, $FT}, bias, ψ::Callable, args...) = 
-            @inbounds @muladd ifelse(bias isa LeftBias, $(calc_reconstruction_stencil(FT, buffer, :left,  :z, true)), 
-                                                        $(calc_reconstruction_stencil(FT, buffer, :right, :z, true)))         
+        @inline biased_interpolate_zᵃᵃᶠ(i, j, k, grid, ::UpwindBiased{$buffer, $FT}, bias, ψ::Callable, args...) =
+            @inbounds @muladd ifelse(bias isa LeftBias, $(calc_reconstruction_stencil(FT, buffer, :left,  :z, true)),
+                                                        $(calc_reconstruction_stencil(FT, buffer, :right, :z, true)))
     end
 end

src/Advection/weno_interpolants.jl

@@ -259,7 +259,7 @@ while for `buffer == 4` unrolls into
 # Smoothness indicators for stencil `stencil` for left and right biased reconstruction
 for buffer in advection_buffers[2:end] # WENO{<:Any, 1} does not exist
     @eval @inline smoothness_operation(scheme::WENO{$buffer}, ψ, C) = @inbounds @muladd $(metaprogrammed_smoothness_operation(buffer))
-    
+
     for stencil in 0:buffer-1, FT in fully_supported_float_types
         @eval @inline smoothness_indicator(ψ, scheme::WENO{$buffer, $FT}, ::Val{$stencil}) =
                       smoothness_operation(scheme, ψ, $(smoothness_coefficients(Val(FT), Val(buffer), Val(stencil))))

src/Biogeochemistry.jl

@@ -1,8 +1,6 @@
 module Biogeochemistry
 
 using Oceananigans.Grids: Center, xnode, ynode, znode
-using Oceananigans.Advection: div_Uc, Centered
-using Oceananigans.Architectures: device, architecture
 using Oceananigans.Fields: ZeroField
 
 import Oceananigans.Fields: CenterField

src/BoundaryConditions/field_boundary_conditions.jl

@@ -97,7 +97,7 @@ on_architecture(arch, fbcs::FieldBoundaryConditions) =
                             on_architecture(arch, fbcs.north),
                             on_architecture(arch, fbcs.bottom),
                             on_architecture(arch, fbcs.top),
-                            on_architecture(arch, fbcs.immersed), 
+                            on_architecture(arch, fbcs.immersed),
                             fbcs.kernels,
                             on_architecture(arch, fbcs.ordered_bcs))
 
@@ -251,7 +251,7 @@ function regularize_field_boundary_conditions(bcs::FieldBoundaryConditions,
                                               loc::Tuple,
                                               prognostic_names=nothing,
                                               field_name=nothing)
-    
+
     west   = regularize_west_boundary_condition(bcs.west,     grid, loc, 1, LeftBoundary,  prognostic_names)
     east   = regularize_east_boundary_condition(bcs.east,     grid, loc, 1, RightBoundary, prognostic_names)
     south  = regularize_south_boundary_condition(bcs.south,   grid, loc, 2, LeftBoundary,  prognostic_names)

src/BoundaryConditions/fill_halo_kernels.jl

@@ -6,7 +6,7 @@ using Oceananigans.Utils: configure_kernel
                                           grid::AbstractGrid,
                                           loc, indices)
 
-Construct preconfigured boundary condition kernels for a given `data` array, `grid`, 
+Construct preconfigured boundary condition kernels for a given `data` array, `grid`,
 and the provided `bcs` (a FieldBoundaryConditions` object).
 Return a new `FieldBoundaryConditions` object with the preconfigured kernels and
 ordered boundary conditions.
@@ -48,7 +48,7 @@ construct_boundary_conditions_kernels(::Missing, data, grid, loc, indices) = mis
     for task in 1:length(sides)
         side = sides[task]
         bc   = select_bc(ordered_bcs[task])
-        
+
         size    = fill_halo_size(data, side, indices, bc, loc, grid)
         offset  = fill_halo_offset(size, side, indices)
         kernel! = fill_halo_kernel!(side, bc, grid, size, offset, data, reduced_dimensions)
@@ -84,26 +84,26 @@ fill_halo_kernel!(value, bc::NoBC, args...) = nothing
 ##### Two-sided fill halo kernels
 #####
 
-fill_halo_kernel!(::WestAndEast, bc::BoundaryCondition, grid, size, offset, data, reduced_dimensions) = 
+fill_halo_kernel!(::WestAndEast, bc::BoundaryCondition, grid, size, offset, data, reduced_dimensions) =
     configure_kernel(architecture(grid), grid, kernel_parameters(size, offset), _fill_west_and_east_halo!; reduced_dimensions)[1]
 
 fill_halo_kernel!(::SouthAndNorth, bc::BoundaryCondition, grid, size, offset, data, reduced_dimensions) =
     configure_kernel(architecture(grid), grid, kernel_parameters(size, offset), _fill_south_and_north_halo!; reduced_dimensions)[1]
 
-fill_halo_kernel!(::BottomAndTop, bc::BoundaryCondition, grid, size, offset, data, reduced_dimensions) = 
+fill_halo_kernel!(::BottomAndTop, bc::BoundaryCondition, grid, size, offset, data, reduced_dimensions) =
     configure_kernel(architecture(grid), grid, kernel_parameters(size, offset), _fill_bottom_and_top_halo!; reduced_dimensions)[1]
 
 #####
 ##### One-sided fill halo kernels
 #####
 
-fill_halo_kernel!(::West, bc::BoundaryCondition, grid, size, offset, data, reduced_dimensions) = 
+fill_halo_kernel!(::West, bc::BoundaryCondition, grid, size, offset, data, reduced_dimensions) =
     configure_kernel(architecture(grid), grid, kernel_parameters(size, offset), _fill_only_west_halo!; reduced_dimensions)[1]
 
-fill_halo_kernel!(::East, bc::BoundaryCondition, grid, size, offset, data, reduced_dimensions) = 
+fill_halo_kernel!(::East, bc::BoundaryCondition, grid, size, offset, data, reduced_dimensions) =
     configure_kernel(architecture(grid), grid, kernel_parameters(size, offset), _fill_only_east_halo!; reduced_dimensions)[1]
 
-fill_halo_kernel!(::South, bc::BoundaryCondition, grid, size, offset, data, reduced_dimensions) = 
+fill_halo_kernel!(::South, bc::BoundaryCondition, grid, size, offset, data, reduced_dimensions) =
     configure_kernel(architecture(grid), grid, kernel_parameters(size, offset), _fill_only_south_halo!; reduced_dimensions)[1]
 
 fill_halo_kernel!(::North, bc::BoundaryCondition, grid, size, offset, data, reduced_dimensions) =
@@ -119,17 +119,17 @@ fill_halo_kernel!(::Top, bc::BoundaryCondition, grid, size, offset, data, reduce
 ##### Periodic fill halo kernels (Always two-sided)
 #####
 
-function fill_halo_kernel!(::WestAndEast, bc::PBC, grid, size, offset, data, reduced_dimensions) 
+function fill_halo_kernel!(::WestAndEast, bc::PBC, grid, size, offset, data, reduced_dimensions)
     yz_size, offset = periodic_size_and_offset(data, 2, 3, size, offset)
     return configure_kernel(architecture(grid), grid, kernel_parameters(yz_size, offset), _fill_periodic_west_and_east_halo!)[1]
 end
 
-function fill_halo_kernel!(::SouthAndNorth, bc::PBC, grid, size, offset, data, reduced_dimensions) 
+function fill_halo_kernel!(::SouthAndNorth, bc::PBC, grid, size, offset, data, reduced_dimensions)
     xz_size, offset = periodic_size_and_offset(data, 1, 3, size, offset)
     return configure_kernel(architecture(grid), grid, kernel_parameters(xz_size, offset), _fill_periodic_south_and_north_halo!)[1]
 end
 
-function fill_halo_kernel!(::BottomAndTop, bc::PBC, grid, size, offset, data, reduced_dimensions) 
+function fill_halo_kernel!(::BottomAndTop, bc::PBC, grid, size, offset, data, reduced_dimensions)
     xy_size, offset = periodic_size_and_offset(data, 1, 2, size, offset)
     return configure_kernel(architecture(grid), grid, kernel_parameters(xy_size, offset), _fill_periodic_bottom_and_top_halo!)[1]
 end
@@ -149,7 +149,7 @@ for Side in (:WestAndEast, :SouthAndNorth, :BottomAndTop, :West, :East, :South,
 end
 
 #####
-##### MultiRegion Boundary Conditions 
+##### MultiRegion Boundary Conditions
 #####
 
 # A struct to hold the side of the fill_halo kernel