fix tests; format

Author: juliasloan25

experiments/ClimaEarth/components/land/climaland_bucket.jl

@@ -124,7 +124,16 @@ function BucketSimulation(
     τc = FT(float(dt))
     params = CL.Bucket.BucketModelParameters(toml_dict; albedo, τc)
 
-    args = (params, CL.CoupledAtmosphere{FT}(surface_space, atmos_h), CL.CoupledRadiativeFluxes{FT}(), domain)
+    # Interpolate atmosphere height field to surface space of land model,
+    #  since that's where we compute fluxes for this land model
+    atmos_h = Interfacer.remap(surface_space, atmos_h)
+
+    args = (
+        params,
+        CL.CoupledAtmosphere{FT}(surface_space, atmos_h),
+        CL.CoupledRadiativeFluxes{FT}(),
+        domain,
+    )
     model = CL.Bucket.BucketModel{FT, typeof.(args)...}(args...)
 
     # Initial conditions with no moisture
@@ -320,16 +329,14 @@ end
 function Interfacer.update_field!(sim::BucketSimulation, ::Val{:air_humidity}, field)
     Interfacer.remap!(sim.integrator.p.drivers.q, field)
 end
-function Interfacer.update_field!(
-    sim::BucketSimulation,
-    ::Val{:air_velocity},
-    u_int,
-    v_int,
-)
+function Interfacer.update_field!(sim::BucketSimulation, ::Val{:air_velocity}, u_int, v_int)
     Interfacer.remap!(sim.integrator.p.bucket.scratch1, u_int)
     Interfacer.remap!(sim.integrator.p.bucket.scratch2, v_int)
     sim.integrator.p.drivers.u .=
-        StaticArrays.SVector.(sim.integrator.p.bucket.scratch1, sim.integrator.p.bucket.scratch2)
+        StaticArrays.SVector.(
+            sim.integrator.p.bucket.scratch1,
+            sim.integrator.p.bucket.scratch2,
+        )
 end
 function Interfacer.update_field!(
     sim::BucketSimulation,
@@ -414,7 +421,7 @@ for this model. These are then summed using area-weighting across all surface
 models to get the total fluxes. Fluxes where the area fraction is zero are set to zero.
 
 Currently, this calculation is done on the land surface space, and the computed fluxes
-are remapped onto the coupler boundary space as the coupler fields are updated. In the future, 
+are remapped onto the coupler boundary space as the coupler fields are updated. In the future,
 we may compute fluxes in the bucket model's internal `step!` function.
 
 # Arguments

experiments/ClimaEarth/setup_run.jl

@@ -416,6 +416,7 @@ function CoupledSimulation(config_dict::AbstractDict)
             output_dir = dir_paths.land_output_dir,
             area_fraction = land_fraction,
             surface_elevation,
+            atmos_h,
             land_temperature_anomaly,
             use_land_diagnostics,
             albedo_type = bucket_albedo_type,

test/flux_calculator_tests.jl

@@ -189,6 +189,7 @@ for FT in (Float32, Float64)
                 atmos_sim.integrator.T,
                 TD.PhasePartition.(atmos_sim.integrator.q),
             )
+        surface_fluxes_params = FluxCalculator.get_surface_params(atmos_sim)
 
         # Get surface properties
         height_sfc = Interfacer.get_field(atmos_sim, Val(:height_sfc))
@@ -219,7 +220,6 @@ for FT in (Float32, Float64)
                 SF.ConstantGustinessSpec.(gustiness),
             )
 
-        surface_fluxes_params = FluxCalculator.get_surface_params(atmos_sim)
         fluxes_expected =
             FluxCalculator.get_surface_fluxes.(
                 surface_fluxes_params,
@@ -230,17 +230,15 @@ for FT in (Float32, Float64)
                 thermo_state_sfc,
                 height_sfc,
                 0, # d
-                config,
+                Ref(config),
             )
 
         # 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
-        # The ClimaCore DataLayout underlying the expected moisture flux uses
-        # Array instead of SubArray, so we can't compare the fields directly without copy.
-        @test copy(fields.F_turb_moisture) ≈ fluxes_expected.F_turb_moisture
+        @test fields.F_turb_moisture ≈ fluxes_expected.F_turb_moisture
     end
 
     @testset "get_surface_params for FT=$FT" begin