rm weighted_dss_slab

CliMA · Sep 20, 2024 · f744cb7 · f744cb7
1 parent 59abc31
commit f744cb7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 18 deletions.
diff --git a/experiments/ClimaEarth/components/ocean/eisenman_seaice.jl b/experiments/ClimaEarth/components/ocean/eisenman_seaice.jl
@@ -65,7 +65,8 @@ function eisenman_seaice_init(
     Y, Ya = state_init(params_ice, space)
 
     ode_algo = CTS.ExplicitAlgorithm(stepper)
-    ode_function = CTS.ClimaODEFunction(T_exp! = ∑tendencies, dss! = weighted_dss_slab!)
+    ode_function =
+        CTS.ClimaODEFunction(T_exp! = ∑tendencies, dss! = dss!((Y, p, t) -> CC.Spaces.weighted_dss!(Y, p.dss_buffer)))
 
     cache = (;
         Ya = Ya,

diff --git a/experiments/ClimaEarth/components/ocean/prescr_seaice.jl b/experiments/ClimaEarth/components/ocean/prescr_seaice.jl
@@ -80,7 +80,8 @@ function ice_init(::Type{FT}; tspan, saveat, dt, space, area_fraction, thermo_pa
     )
 
     ode_algo = CTS.ExplicitAlgorithm(stepper)
-    ode_function = CTS.ClimaODEFunction(T_exp! = ice_rhs!, dss! = weighted_dss_slab!)
+    ode_function =
+        CTS.ClimaODEFunction(T_exp! = ice_rhs!, dss! = dss!((Y, p, t) -> CC.Spaces.weighted_dss!(Y, p.dss_buffer)))
 
     problem = SciMLBase.ODEProblem(ode_function, Y, Float64.(tspan), (; additional_cache..., params = params))
     integrator = SciMLBase.init(problem, ode_algo, dt = Float64(dt), saveat = Float64(saveat), adaptive = false)

diff --git a/experiments/ClimaEarth/components/ocean/slab_ocean.jl b/experiments/ClimaEarth/components/ocean/slab_ocean.jl
@@ -94,7 +94,10 @@ function ocean_init(
     )
 
     ode_algo = CTS.ExplicitAlgorithm(stepper)
-    ode_function = CTS.ClimaODEFunction(T_exp! = slab_ocean_rhs!, dss! = weighted_dss_slab!)
+    ode_function = CTS.ClimaODEFunction(
+        T_exp! = slab_ocean_rhs!,
+        dss! = dss!((Y, p, t) -> CC.Spaces.weighted_dss!(Y, p.dss_buffer)),
+    )
 
     problem = SciMLBase.ODEProblem(ode_function, Y, Float64.(tspan), cache)
     integrator = SciMLBase.init(problem, ode_algo, dt = Float64(dt), saveat = Float64(saveat), adaptive = false)

diff --git a/experiments/ClimaEarth/components/slab_utils.jl b/experiments/ClimaEarth/components/slab_utils.jl