(0.96.0) Improve the NetCDFOutputWriter experience

Project.toml

@@ -1,7 +1,7 @@
 name = "Oceananigans"
 uuid = "9e8cae18-63c1-5223-a75c-80ca9d6e9a09"
 authors = ["Climate Modeling Alliance and contributors"]
-version = "0.95.6"
+version = "0.96.0"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"

src/Grids/grid_utils.jl

@@ -3,7 +3,7 @@ using LinearAlgebra: dot, cross
 using OffsetArrays: IdOffsetRange
 
 """
-    _property(ξ, T, ℓ, N, with_halos=false)
+    _property(ξ, T, ℓ, N, with_halos)
 
 Return the grid property `ξ`, either `with_halos` or without,
 for topology `T`, (instantiated) location `ℓ`, and dimension length `N`.
@@ -298,13 +298,13 @@ end
 
 function dimension_summary(topo, name, dom, z::AbstractVerticalCoordinate, pad_domain=0)
     prefix = domain_summary(topo, name, dom)
-    padding = " "^(pad_domain+1) 
+    padding = " "^(pad_domain+1)
     return string(prefix, padding, coordinate_summary(topo, z.Δᵃᵃᶜ, name))
 end
 
 function dimension_summary(topo, name, dom, spacing, pad_domain=0)
     prefix = domain_summary(topo, name, dom)
-    padding = " "^(pad_domain+1) 
+    padding = " "^(pad_domain+1)
     return string(prefix, padding, coordinate_summary(topo, spacing, name))
 end
 
@@ -495,7 +495,7 @@ function add_halos(data, loc, topo, sz, halo_sz; warnings=true)
 
     offset_array[1:nx, 1:ny, 1:nz] = data[1:nx, 1:ny, 1:nz]
 
-    # return to data's original architecture 
+    # return to data's original architecture
     map(a -> on_architecture(arch, a), offset_array)
 
     return offset_array
@@ -505,4 +505,3 @@ function add_halos(data::AbstractArray{FT, 2} where FT, loc, topo, sz, halo_sz;
     Nx, Ny = size(data)
     return add_halos(reshape(data, (Nx, Ny, 1)), loc, topo, sz, halo_sz; warnings)
 end
-

src/OutputWriters/fetch_output.jl

@@ -27,17 +27,19 @@ end
 
 convert_output(output, writer) = output
 
-function convert_output(output::AbstractArray, writer)
+function convert_output(output::AbstractArray, array_type)
     if architecture(output) isa GPU
-        output_array = writer.array_type(undef, size(output)...)
+        output_array = array_type(undef, size(output)...)
         copyto!(output_array, output)
     else
-        output_array = convert(writer.array_type, output)
+        output_array = convert(array_type, output)
     end
 
     return output_array
 end
 
+convert_output(output::AbstractArray, writer::AbstractOutputWriter) = convert_output(output, writer.array_type)
+
 # Need to broadcast manually because of https://github.com/JuliaLang/julia/issues/30836
 convert_output(outputs::NamedTuple, writer) =
     NamedTuple(name => convert_output(outputs[name], writer) for name in keys(outputs))
@@ -48,4 +50,3 @@ function fetch_and_convert_output(output, model, writer)
 end
 
 fetch_and_convert_output(output::ZeroField, model, writer) = zero(eltype(output))
-