From a6caf836a5ad5461acfa02afa7de3e09799ef839 Mon Sep 17 00:00:00 2001
From: Charles Kawczynski <kawczynski.charles@gmail.com>
Date: Wed, 2 Aug 2023 23:12:59 -0700
Subject: [PATCH] Replace field_wrapper with fill

---
 test/Operators/finitedifference/column.jl           |  9 ++-------
 .../finitedifference/column_benchmark_utils.jl      | 13 ++++---------
 test/Operators/finitedifference/opt_examples.jl     | 13 ++++---------
 3 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/test/Operators/finitedifference/column.jl b/test/Operators/finitedifference/column.jl
index 98d0ef6a24..53ff7fef0c 100644
--- a/test/Operators/finitedifference/column.jl
+++ b/test/Operators/finitedifference/column.jl
@@ -1054,15 +1054,10 @@ end
     zc = getproperty(Fields.coordinate_field(cs), :z)
     zf = getproperty(Fields.coordinate_field(fs), :z)
 
-    function field_wrapper(space, nt::NamedTuple)
-        cmv(z) = nt
-        return cmv.(Fields.coordinate_field(space))
-    end
-
     field_vars() = (; y = FT(0))
 
-    cfield = field_wrapper(cs, field_vars())
-    ffield = field_wrapper(fs, field_vars())
+    cfield = fill(field_vars(), cs)
+    ffield = fill(field_vars(), fs)
 
     cy = cfield.y
     fy = ffield.y
diff --git a/test/Operators/finitedifference/column_benchmark_utils.jl b/test/Operators/finitedifference/column_benchmark_utils.jl
index b9467127f3..7e3e5503eb 100644
--- a/test/Operators/finitedifference/column_benchmark_utils.jl
+++ b/test/Operators/finitedifference/column_benchmark_utils.jl
@@ -69,8 +69,8 @@ function get_column_spaces(z_elems, ::Type{FT}) where {FT}
     fs = Spaces.FaceFiniteDifferenceSpace(cs)
     zc = getproperty(Fields.coordinate_field(cs), :z)
     zf = getproperty(Fields.coordinate_field(fs), :z)
-    cfield = field_wrapper(cs, field_vars(FT))
-    ffield = field_wrapper(fs, field_vars(FT))
+    cfield = fill(field_vars(FT), cs)
+    ffield = fill(field_vars(FT), fs)
 
     return (;cs, fs)
 end
@@ -88,16 +88,11 @@ function get_fields(z_elems, ::Type{FT}, h_space) where {FT}
     end
     zc = getproperty(Fields.coordinate_field(cs), :z)
     zf = getproperty(Fields.coordinate_field(fs), :z)
-    cfield = field_wrapper(cs, field_vars(FT))
-    ffield = field_wrapper(fs, field_vars(FT))
+    cfield = fill(field_vars(FT), cs)
+    ffield = fill(field_vars(FT), fs)
     return (; cfield, ffield)
 end
 
-function field_wrapper(space, nt::NamedTuple)
-    cmv(z) = nt
-    return cmv.(Fields.coordinate_field(space))
-end
-
 #####
 ##### Second order interpolation / derivatives
 #####
diff --git a/test/Operators/finitedifference/opt_examples.jl b/test/Operators/finitedifference/opt_examples.jl
index 757a11648f..3865ed952e 100644
--- a/test/Operators/finitedifference/opt_examples.jl
+++ b/test/Operators/finitedifference/opt_examples.jl
@@ -19,11 +19,6 @@ Base.@propagate_inbounds Base.getindex(
 a_bcs(::Type{FT}, i::Int) where {FT} =
     (; bottom = Operators.SetValue(FT(0)), top = Operators.Extrapolate())
 
-function field_wrapper(space, nt::NamedTuple)
-    cmv(z) = nt
-    return cmv.(Fields.coordinate_field(space))
-end
-
 function alloc_test_f2c_interp(cfield, ffield)
     (; fx, fy, fz, fϕ, fψ) = ffield
     (; cx, cy, cz, cϕ, cψ) = cfield
@@ -462,10 +457,10 @@ end
         (; fx = FT(0), fy = FT(0), fz = FT(0), fϕ = FT(0), fψ = FT(0))
     cntfield_vars() = (; nt = ntuple(i -> cfield_vars(), n_tuples))
     fntfield_vars() = (; nt = ntuple(i -> ffield_vars(), n_tuples))
-    cfield = field_wrapper(cs, cfield_vars())
-    ffield = field_wrapper(fs, ffield_vars())
-    ntcfield = field_wrapper(cs, cntfield_vars())
-    ntffield = field_wrapper(fs, fntfield_vars())
+    cfield = fill(cfield_vars(), cs)
+    ffield = fill(ffield_vars(), fs)
+    ntcfield = fill(cntfield_vars(), cs)
+    ntffield = fill(fntfield_vars(), fs)
     wvec_glob = Geometry.WVector
 
     alloc_test_f2c_interp(cfield, ffield)