store fields as NamedTuple of Fields

Author: juliasloan25

src/FluxCalculator.jl

@@ -46,7 +46,7 @@ TODO:
 (NB: Radiation surface fluxes are calculated by the atmosphere.)
 """
 function turbulent_fluxes!(csf, model_sims, thermo_params)
-    boundary_space = axes(csf)
+    boundary_space = axes(first(csf))
     atmos_sim = model_sims.atmos_sim
     FT = CC.Spaces.undertype(boundary_space)
 
@@ -232,7 +232,7 @@ function compute_surface_fluxes!(
     atmos_sim::Interfacer.AbstractAtmosSimulation,
     thermo_params,
 )
-    boundary_space = axes(csf)
+    boundary_space = axes(first(csf))
     FT = CC.Spaces.undertype(boundary_space)
     surface_fluxes_params = FluxCalculator.get_surface_params(atmos_sim)
 

src/Interfacer.jl

@@ -145,19 +145,16 @@ default_coupler_fields() = [
 """
     init_coupler_fields(FT, coupler_field_names, boundary_space)
 
-Allocate a Field of NamedTuples on the provided boundary space to store
+Allocate a NamedTuple of Fields on the provided boundary space to store
 the provided coupler fields.
 """
 function init_coupler_fields(FT, coupler_field_names, boundary_space)
     # First remove any duplicate field names
     unique!(coupler_field_names)
 
-    key_types = (coupler_field_names...,)
-    val_types = Tuple{(FT for _ in 1:length(coupler_field_names))...}
-
-    nt_type = NamedTuple{key_types, val_types}
-    coupler_fields = zeros(nt_type, boundary_space)
-    return coupler_fields
+    keys = Tuple(coupler_field_names)
+    vals = ntuple(_ -> zeros(FT, boundary_space), length(coupler_field_names))
+    return NamedTuple{keys}(vals)
 end
 
 """
@@ -667,7 +664,7 @@ AtmosSimulation(::Val{model_type}; kwargs...) where {model_type} =
 Return the `ClimaCore.Field` over which the exchange fields are defined.
 """
 function boundary_space(sim::CoupledSimulation)
-    return axes(sim.fields)
+    return axes(first(sim.fields))
 end
 
 """
@@ -676,7 +673,7 @@ end
 Return the `ClimaComms.context` associated to the simulation.
 """
 function ClimaComms.context(sim::CoupledSimulation)
-    return ClimaComms.context(sim.fields)
+    return ClimaComms.context(first(sim.fields))
 end
 
 """
@@ -685,7 +682,7 @@ end
 Return the `ClimaComms.device` associated to the simulation.
 """
 function ClimaComms.device(sim::CoupledSimulation)
-    return ClimaComms.device(sim.fields)
+    return ClimaComms.device(first(sim.fields))
 end
 
 """

test/flux_calculator_tests.jl

@@ -234,11 +234,11 @@ for FT in (Float32, Float64)
             )
 
         # Compare expected and computed fluxes
-        @test fields.F_turb_ρτxz ≈ fluxes_expected.F_turb_ρτxz
-        @test fields.F_turb_ρτyz ≈ fluxes_expected.F_turb_ρτyz
-        @test fields.F_lh ≈ fluxes_expected.F_lh
-        @test fields.F_sh ≈ fluxes_expected.F_sh
-        @test fields.F_turb_moisture ≈ fluxes_expected.F_turb_moisture
+        @test all(parent(fields.F_turb_ρτxz) .≈ parent(fluxes_expected.F_turb_ρτxz))
+        @test all(parent(fields.F_turb_ρτyz) .≈ parent(fluxes_expected.F_turb_ρτyz))
+        @test all(parent(fields.F_lh) .≈ parent(fluxes_expected.F_lh))
+        @test all(parent(fields.F_sh) .≈ parent(fluxes_expected.F_sh))
+        @test all(parent(fields.F_turb_moisture) .≈ parent(fluxes_expected.F_turb_moisture))
     end
 
     @testset "get_surface_params for FT=$FT" begin

test/interfacer_tests.jl

@@ -44,7 +44,7 @@ for FT in (Float32, Float64)
             context,
         )
 
-        fields = ones(boundary_space_)
+        fields = Interfacer.init_coupler_fields(FT, [:field], boundary_space_)
 
         cs = Interfacer.CoupledSimulation{FT}(
             nothing, # dates