Try out new implicit solver interface

CliMA · Oct 17, 2023 · 04102c1 · 04102c1
1 parent 2da96b1
commit 04102c1
Show file tree

Hide file tree

Showing 12 changed files with 532 additions and 837 deletions.
diff --git a/...model_configs/sphere_zalesak_upwind_tracer_energy_ssp_baroclinic_wave_rhoe_equilmoist.yml b/...model_configs/sphere_zalesak_upwind_tracer_energy_ssp_baroclinic_wave_rhoe_equilmoist.yml
@@ -1,7 +1,7 @@
 dt_save_to_disk: "5days"
 initial_condition: "MoistBaroclinicWave"
 max_newton_iters_ode: 4
-dt: "400secs"
+dt: "300secs"
 tracer_upwinding: zalesak
 t_end: "5days"
 ode_algo: "SSP333"

diff --git a/src/ClimaAtmos.jl b/src/ClimaAtmos.jl
@@ -43,9 +43,8 @@ include(joinpath("utils", "discrete_hydrostatic_balance.jl"))
 include(joinpath("prognostic_equations", "pressure_work.jl"))
 include(joinpath("prognostic_equations", "zero_velocity.jl"))
 
-include(joinpath("prognostic_equations", "implicit", "wfact.jl"))
-include(joinpath("prognostic_equations", "implicit", "schur_complement_W.jl"))
 include(joinpath("prognostic_equations", "implicit", "implicit_tendency.jl"))
+include(joinpath("prognostic_equations", "implicit", "implicit_solver.jl"))
 
 include(joinpath("prognostic_equations", "remaining_tendency.jl"))
 include(joinpath("prognostic_equations", "forcing", "large_scale_advection.jl")) # TODO: should this be in tendencies/?

diff --git a/src/cache/cache.jl b/src/cache/cache.jl
@@ -1,4 +1,4 @@
-using LinearAlgebra: ×, norm, dot
+using LinearAlgebra: ×, norm, dot, Adjoint
 
 import .Parameters as CAP
 using ClimaCore: Operators, Fields, Limiters, Geometry, Spaces
@@ -94,10 +94,7 @@ function default_cache(
         ᶜp_ref,
         ᶜT = similar(Y.c, FT),
         ᶜf,
-        ∂ᶜK∂ᶠu₃_data = similar(
-            Y.c,
-            Operators.StencilCoefs{-half, half, NTuple{2, FT}},
-        ),
+        ∂ᶜK∂ᶠu₃ = similar(Y.c, BidiagonalMatrixRow{Adjoint{FT, CT3{FT}}}),
         params,
         energy_upwinding,
         tracer_upwinding,

diff --git a/src/dycore_equations_deprecated/sgs_flux_tendencies.jl b/src/dycore_equations_deprecated/sgs_flux_tendencies.jl
@@ -1,4 +1,3 @@
-using LinearAlgebra
 import OrdinaryDiffEq as ODE
 import Logging
 import TerminalLoggers