Merge pull request #1061 from CliMA/js/coupledsim

remove t and parsed_args from CoupledSimulation
CliMA · Nov 6, 2024 · 022f580 · 022f580
2 parents 91878a6 + d5a932c
commit 022f580
Show file tree

Hide file tree

Showing 13 changed files with 0 additions and 36 deletions.
diff --git a/experiments/ClimaEarth/run_amip.jl b/experiments/ClimaEarth/run_amip.jl
@@ -628,10 +628,8 @@ cs = Interfacer.CoupledSimulation{FT}(
     dates,
     boundary_space,
     coupler_fields,
-    config_dict,
     conservation_checks,
     [tspan[1], tspan[2]],
-    atmos_sim.integrator.t,
     Δt_cpl,
     model_sims,
     mode_specifics,

diff --git a/experiments/ClimaEarth/run_cloudless_aquaplanet.jl b/experiments/ClimaEarth/run_cloudless_aquaplanet.jl
@@ -251,10 +251,8 @@ cs = Interfacer.CoupledSimulation{FT}(
     dates,
     boundary_space,
     coupler_fields,
-    config_dict,
     nothing, # conservation checks
     [tspan[1], tspan[2]],
-    atmos_sim.integrator.t,
     Δt_cpl,
     model_sims,
     (;), # mode_specifics

diff --git a/experiments/ClimaEarth/run_cloudy_aquaplanet.jl b/experiments/ClimaEarth/run_cloudy_aquaplanet.jl
@@ -265,10 +265,8 @@ cs = Interfacer.CoupledSimulation{FT}(
     dates,
     boundary_space,
     coupler_fields,
-    config_dict,
     nothing, # conservation checks
     [tspan[1], tspan[2]],
-    atmos_sim.integrator.t,
     Δt_cpl,
     model_sims,
     (;), # mode_specifics

diff --git a/experiments/ClimaEarth/run_cloudy_slabplanet.jl b/experiments/ClimaEarth/run_cloudy_slabplanet.jl
@@ -318,10 +318,8 @@ cs = Interfacer.CoupledSimulation{FT}(
     dates,
     boundary_space,
     coupler_fields,
-    config_dict,
     nothing, # conservation checks
     [tspan[1], tspan[2]],
-    atmos_sim.integrator.t,
     Δt_cpl,
     model_sims,
     (;), # mode_specifics

diff --git a/experiments/ClimaEarth/run_dry_held_suarez.jl b/experiments/ClimaEarth/run_dry_held_suarez.jl
@@ -196,10 +196,8 @@ cs = Interfacer.CoupledSimulation{FT}(
     dates,
     boundary_space,
     coupler_fields,
-    config_dict,
     nothing, # conservation checks
     [tspan[1], tspan[2]],
-    atmos_sim.integrator.t,
     Δt_cpl,
     model_sims,
     (;), # mode_specifics

diff --git a/experiments/ClimaEarth/run_moist_held_suarez.jl b/experiments/ClimaEarth/run_moist_held_suarez.jl
@@ -247,10 +247,8 @@ cs = Interfacer.CoupledSimulation{FT}(
     dates,
     boundary_space,
     coupler_fields,
-    config_dict,
     nothing, # conservation checks
     [tspan[1], tspan[2]],
-    atmos_sim.integrator.t,
     Δt_cpl,
     model_sims,
     (;), # mode_specifics

diff --git a/src/Interfacer.jl b/src/Interfacer.jl
@@ -43,10 +43,8 @@ struct CoupledSimulation{
     D,
     B,
     FV,
-    P,
     E,
     TS,
-    TI <: Real,
     DTI <: Real,
     NTMS <: NamedTuple,
     NTM <: NamedTuple,
@@ -60,10 +58,8 @@ struct CoupledSimulation{
     dates::D
     boundary_space::B
     fields::FV
-    parsed_args::P
     conservation_checks::E
     tspan::TS
-    t::TI
     Δt_cpl::DTI
     model_sims::NTMS
     mode::NTM

diff --git a/test/conservation_checker_tests.jl b/test/conservation_checker_tests.jl
@@ -86,10 +86,8 @@ for FT in (Float32, Float64)
             nothing, # dates
             space, # boundary_space
             cf, # fields
-            nothing, # parsed_args
             cc, # conservation_checks
             (Int(0), Int(1000)), # tspan
-            Int(200), # t
             Int(200), # Δt_cpl
             model_sims, # model_sims
             (;), # mode
@@ -168,10 +166,8 @@ for FT in (Float32, Float64)
             nothing, # dates
             space, # boundary_space
             cf, # fields
-            nothing, # parsed_args
             cc, # conservation_checks
             (Int(0), Int(1000)), # tspan
-            Int(200), # t
             Int(200), # Δt_cpl
             model_sims, # model_sims
             (;), # mode

diff --git a/test/debug/debug_amip_plots.jl b/test/debug/debug_amip_plots.jl
@@ -70,10 +70,8 @@ plot_field_names(sim::Interfacer.SurfaceStub) = (:stub_field,)
         nothing, # dates
         nothing, # boundary_space
         coupler_fields, # fields
-        nothing, # parsed_args
         nothing, # conservation_checks
         (Int(0), Int(1)), # tspan
-        Int(200), # t
         Int(200), # Δt_cpl
         model_sims, # model_sims
         (;), # mode

diff --git a/test/flux_calculator_tests.jl b/test/flux_calculator_tests.jl
@@ -313,10 +313,8 @@ for FT in (Float32, Float64)
             nothing, # dates
             nothing, # boundary_space
             coupler_fields, # fields
-            nothing, # parsed_args
             nothing, # conservation_checks
             (Int(0), Int(1)), # tspan
-            0, # t
             0, # Δt_cpl
             model_sims, # model_sims
             (;), # mode

diff --git a/test/interfacer_tests.jl b/test/interfacer_tests.jl
@@ -37,10 +37,8 @@ for FT in (Float32, Float64)
             nothing, # dates
             nothing, # boundary_space
             nothing, # fields
-            nothing, # parsed_args
             nothing, # conservation_checks
             (Int(0), Int(1000)), # tspan
-            Int(200), # t
             Int(200), # Δt_cpl
             (;), # model_sims
             (;), # mode

diff --git a/test/regridder_tests.jl b/test/regridder_tests.jl
@@ -72,10 +72,8 @@ for FT in (Float32, Float64)
             nothing, # dates
             nothing, # boundary_space
             nothing, # fields
-            nothing, # parsed_args
             nothing, # conservation_checks
             (Int(0), Int(1000)), # tspan
-            Int(200), # t
             Int(200), # Δt_cpl
             (;
                 ice_sim = DummyStub((; area_fraction = ice_d)),

diff --git a/test/time_manager_tests.jl b/test/time_manager_tests.jl
@@ -20,10 +20,8 @@ for FT in (Float32, Float64)
             dates, # dates
             nothing, # boundary_space
             nothing, # fields
-            nothing, # parsed_args
             nothing, # conservation_checks
             tspan, # tspan
-            Int(0), # t
             Int(Δt_cpl), # Δt_cpl
             (;), # model_sims
             (;), # mode
@@ -60,10 +58,8 @@ end
         dates, # dates
         nothing, # boundary_space
         nothing, # fields
-        nothing, # parsed_args
         nothing, # conservation_checks
         (Int(0), Int(1000)), # tspan
-        Int(200), # t
         Int(200), # Δt_cpl
         (;), # model_sims
         (;), # mode
@@ -96,10 +92,8 @@ end
         dates, # dates
         nothing, # boundary_space
         nothing, # fields
-        nothing, # parsed_args
         nothing, # conservation_checks
         (Int(0), Int(1000)), # tspan
-        Int(200), # t
         Int(200), # Δt_cpl
         (;), # model_sims
         (;), # mode
@@ -164,10 +158,8 @@ end
         dates, # dates
         nothing, # boundary_space
         nothing, # fields
-        nothing, # parsed_args
         nothing, # conservation_checks
         (Int(0), Int(1000)), # tspan
-        Int(200), # t
         Int(200), # Δt_cpl
         (;), # model_sims
         (;), # mode