Merge pull request #1513 from CliMA/js/up-sim

rm area_fraction from update_sim functions

Author: juliasloan25

experiments/ClimaEarth/components/land/climaland_integrated.jl

@@ -420,7 +420,7 @@ end
 Interfacer.close_output_writers(sim::ClimaLandSimulation) =
     isnothing(sim.output_writer) || close(sim.output_writer)
 
-function FieldExchanger.update_sim!(sim::ClimaLandSimulation, csf, area_fraction)
+function FieldExchanger.update_sim!(sim::ClimaLandSimulation, csf)
     # update fields for radiative transfer
     Interfacer.update_field!(sim, Val(:diffuse_fraction), csf.diffuse_fraction)
     Interfacer.update_field!(sim, Val(:sw_d), csf.SW_d)

experiments/ClimaEarth/components/ocean/oceananigans.jl

@@ -445,7 +445,7 @@ function Interfacer.update_field!(sim::OceananigansSimulation, ::Val{:area_fract
 end
 
 """
-    FieldExchanger.update_sim!(sim::OceananigansSimulation, csf, area_fraction)
+    FieldExchanger.update_sim!(sim::OceananigansSimulation, csf)
 
 Update the ocean simulation with the provided fields, which have been filled in
 by the coupler.
@@ -460,7 +460,7 @@ ClimaAtmos provides precipitation as a negative flux at the surface, and
 Oceananigans represents precipitation as a positive salinity flux,
 so a sign change is needed when we convert from precipitation to salinity flux.
 """
-function FieldExchanger.update_sim!(sim::OceananigansSimulation, csf, area_fraction)
+function FieldExchanger.update_sim!(sim::OceananigansSimulation, csf)
     (; ocean_reference_density, ocean_heat_capacity, ocean_fresh_water_density) =
         sim.ocean_properties
 

experiments/ClimaEarth/components/ocean/prescr_ocean.jl

@@ -187,12 +187,12 @@ function Checkpointer.restore_cache!(sim::PrescribedOceanSimulation, new_cache)
 end
 
 """
-    FieldExchanger.update_sim!(::PrescribedOceanSimulation, csf, area_fraction)
+    FieldExchanger.update_sim!(::PrescribedOceanSimulation, csf)
 
 Update the wind velocity (needed for the turbulent flux calculation) and the
 direct and diffuse albedos of the ocean.
 """
-function FieldExchanger.update_sim!(sim::PrescribedOceanSimulation, csf, area_fraction)
+function FieldExchanger.update_sim!(sim::PrescribedOceanSimulation, csf)
     Interfacer.update_field!(sim, Val(:u_int), csf.u_int)
     Interfacer.update_field!(sim, Val(:v_int), csf.v_int)
 

src/FieldExchanger.jl

@@ -199,15 +199,15 @@ function update_sim!(atmos_sim::Interfacer.AtmosModelSimulation, csf)
 end
 
 """
-    update_sim!(sim::SurfaceModelSimulation, csf, area_fraction)
+    update_sim!(sim::SurfaceModelSimulation, csf)
 
 Updates the surface component model cache with the current coupler fields besides turbulent fluxes.
 
 # Arguments
 - `sim`: [Interfacer.SurfaceModelSimulation] containing a surface model simulation object.
 - `csf`: [NamedTuple] containing coupler fields.
 """
-function update_sim!(sim::Interfacer.SurfaceModelSimulation, csf, area_fraction)
+function update_sim!(sim::Interfacer.SurfaceModelSimulation, csf)
     # radiative fluxes
     Interfacer.update_field!(sim, Val(:radiative_energy_flux_sfc), csf.F_radiative)
 
@@ -227,13 +227,8 @@ Iterates `update_sim!` over all component model simulations saved in `cs.model_s
 - `csf`: [NamedTuple] containing coupler fields.
 """
 function update_model_sims!(model_sims, csf)
-    boundary_space = axes(csf)
     for sim in model_sims
-        if sim isa Interfacer.SurfaceModelSimulation
-            update_sim!(sim, csf, Interfacer.get_field(sim, Val(:area_fraction)))
-        else
-            update_sim!(sim, csf)
-        end
+        update_sim!(sim, csf)
     end
 end
 

test/flux_calculator_tests.jl

@@ -40,7 +40,7 @@ Interfacer.get_field(sim::TestAtmos, ::Val{:liquid_precipitation}) =
     CC.Fields.zeros(axes(sim.integrator.T))
 Interfacer.get_field(sim::TestAtmos, ::Val{:snow_precipitation}) =
     CC.Fields.zeros(axes(sim.integrator.T))
-FieldExchanger.update_sim!(sim::TestAtmos, fields, _) = nothing
+FieldExchanger.update_sim!(sim::TestAtmos, fields) = nothing
 
 function FluxCalculator.update_turbulent_fluxes!(sim::TestAtmos, fields)
     (; F_turb_ρτxz, F_lh, F_sh, F_turb_moisture) = fields