remove Y_init

Author: juliasloan25

experiments/ClimaEarth/components/atmosphere/climaatmos.jl

@@ -16,9 +16,8 @@ include("climaatmos_extra_diags.jl")
 ###
 ### Functions required by ClimaCoupler.jl for an AtmosModelSimulation
 ###
-struct ClimaAtmosSimulation{P, Y, D, I} <: Interfacer.AtmosModelSimulation
+struct ClimaAtmosSimulation{P, D, I} <: Interfacer.AtmosModelSimulation
     params::P
-    Y_init::Y
     domain::D
     integrator::I
 end
@@ -69,7 +68,7 @@ function ClimaAtmosSimulation(atmos_config)
         @. ᶠradiation_flux = CC.Geometry.WVector(FT(0))
     end
 
-    sim = ClimaAtmosSimulation(integrator.p.params, Y, spaces, integrator)
+    sim = ClimaAtmosSimulation(integrator.p.params, spaces, integrator)
 
     # DSS state to ensure we have continuous fields
     dss_state!(sim)

experiments/ClimaEarth/components/land/climaland_bucket.jl

@@ -15,13 +15,12 @@ using NCDatasets
 ### Functions required by ClimaCoupler.jl for a SurfaceModelSimulation
 ###
 """
-    BucketSimulation{M, Y, D, I}
+    BucketSimulation{M, D, I}
 
 The bucket model simulation object.
 """
-struct BucketSimulation{M, Y, D, I, A} <: Interfacer.LandModelSimulation
+struct BucketSimulation{M, D, I, A} <: Interfacer.LandModelSimulation
     model::M
-    Y_init::Y
     domain::D
     integrator::I
     area_fraction::A
@@ -222,7 +221,7 @@ function BucketSimulation(
         callback = SciMLBase.CallbackSet(diag_cb),
     )
 
-    sim = BucketSimulation(model, Y, (; domain = domain, soil_depth = d_soil), integrator, area_fraction)
+    sim = BucketSimulation(model, (; domain = domain, soil_depth = d_soil), integrator, area_fraction)
 
     # DSS state to ensure we have continuous fields
     dss_state!(sim)

experiments/ClimaEarth/components/ocean/eisenman_seaice.jl

@@ -7,17 +7,16 @@ import ClimaCoupler: Checkpointer, FluxCalculator, Interfacer, Utilities
 ### Functions required by ClimaCoupler.jl for a SurfaceModelSimulation
 ###
 """
-    EisenmanIceSimulation{P, Y, D, I}
+    EisenmanIceSimulation{P, D, I}
 
 Thermodynamic 0-layer, based on the Semtner 1976 model and later refined by
 Eisenmen 2009 and Zhang et al 2021.
 
 Note that Eisenman sea ice assumes gray radiation, no snow coverage, and
 PartitionedStateFluxes for the surface flux calculation.
 """
-struct EisenmanIceSimulation{P, Y, D, I} <: Interfacer.SeaIceModelSimulation
+struct EisenmanIceSimulation{P, D, I} <: Interfacer.SeaIceModelSimulation
     params_ice::P
-    Y_init::Y
     domain::D
     integrator::I
 end
@@ -83,7 +82,7 @@ function EisenmanIceSimulation(
     problem = SciMLBase.ODEProblem(ode_function, Y, Float64.(tspan), cache)
     integrator = SciMLBase.init(problem, ode_algo, dt = Float64(dt), saveat = Float64.(saveat), adaptive = false)
 
-    sim = EisenmanIceSimulation(params, Y, space, integrator)
+    sim = EisenmanIceSimulation(params, space, integrator)
     return sim
 end
 

experiments/ClimaEarth/components/ocean/prescr_seaice.jl

@@ -11,7 +11,7 @@ import ClimaCoupler: Checkpointer, FluxCalculator, Interfacer, Utilities
 ### Functions required by ClimaCoupler.jl for a SurfaceModelSimulation
 ###
 """
-    PrescribedIceSimulation{P, Y, D, I}
+    PrescribedIceSimulation{P, D, I}
 
 Ice concentration is prescribed, and we solve the following energy equation:
 
@@ -27,9 +27,8 @@ Ice concentration is prescribed, and we solve the following energy equation:
 
 In the current version, the sea ice has a prescribed thickness.
 """
-struct PrescribedIceSimulation{P, Y, D, I} <: Interfacer.SeaIceModelSimulation
+struct PrescribedIceSimulation{P, D, I} <: Interfacer.SeaIceModelSimulation
     params::P
-    Y_init::Y
     domain::D
     integrator::I
 end
@@ -143,7 +142,7 @@ function PrescribedIceSimulation(
     problem = SciMLBase.ODEProblem(ode_function, Y, Float64.(tspan), (; cache..., params = params))
     integrator = SciMLBase.init(problem, ode_algo, dt = Float64(dt), saveat = Float64.(saveat), adaptive = false)
 
-    sim = PrescribedIceSimulation(params, Y, space, integrator)
+    sim = PrescribedIceSimulation(params, space, integrator)
 
     # DSS state to ensure we have continuous fields
     dss_state!(sim)

experiments/ClimaEarth/components/ocean/slab_ocean.jl

@@ -7,16 +7,15 @@ import ClimaCoupler: Checkpointer, FluxCalculator, Interfacer, Utilities
 ### Functions required by ClimaCoupler.jl for a SurfaceModelSimulation
 ###
 """
-    SlabOceanSimulation{P, Y, D, I}
+    SlabOceanSimulation{P, D, I}
 
 Equation:
 
     (h * ρ * c) dTdt = -(F_turb_energy + F_radiative)
 
 """
-struct SlabOceanSimulation{P, Y, D, I} <: Interfacer.OceanModelSimulation
+struct SlabOceanSimulation{P, D, I} <: Interfacer.OceanModelSimulation
     params::P
-    Y_init::Y
     domain::D
     integrator::I
 end
@@ -96,7 +95,7 @@ function SlabOceanSimulation(
     problem = SciMLBase.ODEProblem(ode_function, Y, Float64.(tspan), cache)
     integrator = SciMLBase.init(problem, ode_algo, dt = Float64(dt), saveat = Float64.(saveat), adaptive = false)
 
-    sim = SlabOceanSimulation(params, Y, space, integrator)
+    sim = SlabOceanSimulation(params, space, integrator)
 
     # DSS state to ensure we have continuous fields
     dss_state!(sim)

experiments/ClimaEarth/test/component_model_tests/climaatmos_tests.jl

@@ -16,7 +16,7 @@ for FT in (Float32, Float64)
             u = (; state_field1 = CC.Fields.ones(boundary_space), state_field2 = CC.Fields.zeros(boundary_space)),
             p = (; cache_field = CC.Fields.zeros(boundary_space)),
         )
-        sim = ClimaAtmosSimulation(nothing, nothing, nothing, integrator)
+        sim = ClimaAtmosSimulation(nothing, nothing, integrator)
 
         # make field non-constant to check the impact of the dss step
         coords_lat = CC.Fields.coordinate_field(sim.integrator.u.state_field2).lat

experiments/ClimaEarth/test/component_model_tests/prescr_seaice_tests.jl

@@ -100,7 +100,7 @@ for FT in (Float32, Float64)
         )
         p = (; cache_field = CC.Fields.zeros(boundary_space), dss_buffer = CC.Spaces.create_dss_buffer(u))
         integrator = (; u, p)
-        sim = PrescribedIceSimulation(nothing, nothing, nothing, integrator)
+        sim = PrescribedIceSimulation(nothing, nothing, integrator)
 
         # make field non-constant to check the impact of the dss step
         coords_lat = CC.Fields.coordinate_field(sim.integrator.u.state_field2).lat

experiments/ClimaEarth/test/component_model_tests/slab_ocean_tests.jl

@@ -21,7 +21,7 @@ for FT in (Float32, Float64)
         )
         p = (; cache_field = CC.Fields.zeros(boundary_space), dss_buffer = CC.Spaces.create_dss_buffer(u))
         integrator = (; u, p)
-        sim = SlabOceanSimulation(nothing, nothing, nothing, integrator)
+        sim = SlabOceanSimulation(nothing, nothing, integrator)
 
         # make field non-constant to check the impact of the dss step
         coords_lat = CC.Fields.coordinate_field(sim.integrator.u.state_field2).lat

test/flux_calculator_tests.jl

@@ -26,9 +26,8 @@ function FluxCalculator.atmos_turbulent_fluxes_most!(sim::DummySimulation, csf)
 end
 
 # atmos sim object and extensions
-struct TestAtmos{P, Y, D, I} <: Interfacer.AtmosModelSimulation
+struct TestAtmos{P, D, I} <: Interfacer.AtmosModelSimulation
     params::P
-    Y_init::Y
     domain::D
     integrator::I
 end
@@ -66,9 +65,8 @@ end
 
 
 # ocean sim object and extensions
-struct TestOcean{M, Y, D, I} <: Interfacer.SurfaceModelSimulation
+struct TestOcean{M, D, I} <: Interfacer.SurfaceModelSimulation
     model::M
-    Y_init::Y
     domain::D
     integrator::I
 end
@@ -98,9 +96,8 @@ function FluxCalculator.update_turbulent_fluxes!(sim::TestOcean, fields::NamedTu
 end
 
 # simple surface sim object and extensions
-struct DummySurfaceSimulation3{M, Y, D, I} <: Interfacer.SurfaceModelSimulation
+struct DummySurfaceSimulation3{M, D, I} <: Interfacer.SurfaceModelSimulation
     model::M
-    Y_init::Y
     domain::D
     integrator::I
 end
@@ -181,7 +178,7 @@ for FT in (Float32, Float64)
             Y_init =
                 (; ρ = ones(boundary_space) .* FT(1.2), T = ones(boundary_space) .* FT(310), q = zeros(boundary_space))
             integrator = (; Y_init..., p = p)
-            atmos_sim = TestAtmos(params, Y_init, nothing, integrator)
+            atmos_sim = TestAtmos(params, nothing, integrator)
 
             # ocean
             p = (;
@@ -197,10 +194,10 @@ for FT in (Float32, Float64)
             )
             Y_init = (; T = ones(boundary_space) .* FT(300))
             integrator = (; Y_init..., p = p)
-            ocean_sim = TestOcean(nothing, Y_init, nothing, integrator)
+            ocean_sim = TestOcean(nothing, nothing, integrator)
 
             # ocean
-            ocean_sim2 = TestOcean(nothing, Y_init, nothing, integrator)
+            ocean_sim2 = TestOcean(nothing, nothing, integrator)
 
             model_sims = (; atmos_sim, ocean_sim, ocean_sim2)
 
@@ -270,15 +267,15 @@ for FT in (Float32, Float64)
     @testset "get_surface_params for FT=$FT" begin
         sf_params = SurfaceFluxesParameters(FT, UF.BusingerParams)
 
-        @test FluxCalculator.get_surface_params(TestAtmos((; FT = FT), [], [], [])) == sf_params
+        @test FluxCalculator.get_surface_params(TestAtmos((; FT = FT), [], [])) == sf_params
         sim = DummySimulation([], [])
         @test_throws ErrorException(
             "get_surface_params is required to be dispatched on" * Interfacer.name(sim) * ", but no method defined",
         ) FluxCalculator.get_surface_params(DummySimulation([], []))
     end
 
     @testset "update_turbulent_fluxes! for FT=$FT" begin
-        sim = DummySurfaceSimulation3([], [], [], [])
+        sim = DummySurfaceSimulation3([], [], [])
         @test_throws ErrorException(
             "update_turbulent_fluxes! is required to be dispatched on" *
             Interfacer.name(sim) *
@@ -290,13 +287,11 @@ for FT in (Float32, Float64)
         boundary_space = TestHelper.create_space(FT)
         _ones = CC.Fields.ones(boundary_space)
         surface_sim = DummySurfaceSimulation3(
-            [],
             [],
             [],
             (; T = _ones .* FT(300), ρ = _ones .* FT(1.2), p = (; q = _ones .* FT(0.01))),
         )
-        atmos_sim =
-            TestAtmos((; FT = FT), [], [], (; T = _ones .* FT(300), ρ = _ones .* FT(1.2), q = _ones .* FT(0.01)))
+        atmos_sim = TestAtmos((; FT = FT), [], (; T = _ones .* FT(300), ρ = _ones .* FT(1.2), q = _ones .* FT(0.01)))
         thermo_params = get_thermo_params(atmos_sim)
         thermo_state_int = Interfacer.get_field(atmos_sim, Val(:thermo_state_int))
         @test FluxCalculator.surface_thermo_state(surface_sim, thermo_params, thermo_state_int).ρ == thermo_state_int.ρ
@@ -305,7 +300,7 @@ for FT in (Float32, Float64)
     @testset "water_albedo_from_atmosphere!" begin
         boundary_space = TestHelper.create_space(FT)
         ocean_sim = Interfacer.SurfaceStub((; α_direct = zeros(boundary_space), α_diffuse = zeros(boundary_space)))
-        atmos_sim = TestAtmos(1, 2, 3, 4)
+        atmos_sim = TestAtmos(1, 2, 3)
         coupler_fields = (; temp1 = ones(boundary_space), temp2 = ones(boundary_space))
         model_sims = (; atmos_sim, ocean_sim)
         cs = Interfacer.CoupledSimulation{FT}(