Skip to content

Commit

Permalink
Merge #2044
Browse files Browse the repository at this point in the history
2044: Update to new implicit solver interface r=dennisYatunin a=dennisYatunin



Co-authored-by: Dennis Yatunin <dyatun@gmail.com>
  • Loading branch information
bors[bot] and dennisYatunin authored Oct 19, 2023
2 parents e6ed676 + 40cae18 commit 5f9f0e2
Show file tree
Hide file tree
Showing 13 changed files with 594 additions and 836 deletions.
6 changes: 6 additions & 0 deletions docs/src/api.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,9 @@ ClimaAtmos.InitialConditions.LifeCycleTan2018
ClimaAtmos.InitialConditions.Bomex
ClimaAtmos.InitialConditions.Soares
```

### Implicit Solver

```@docs
ClimaAtmos.ImplicitEquationJacobian
```
2 changes: 1 addition & 1 deletion regression_tests/ref_counter.jl
Original file line number Diff line number Diff line change
@@ -1 +1 @@
133
134
3 changes: 1 addition & 2 deletions src/ClimaAtmos.jl
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,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/?
Expand Down
7 changes: 2 additions & 5 deletions src/cache/cache.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using LinearAlgebra: ×, norm, dot
using LinearAlgebra: ×, norm, dot, Adjoint

import .Parameters as CAP
using ClimaCore: Operators, Fields, Limiters, Geometry, Spaces
Expand Down Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion src/dycore_equations_deprecated/sgs_flux_tendencies.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using LinearAlgebra
import OrdinaryDiffEq as ODE
import Logging
import TerminalLoggers
Expand Down
Loading

0 comments on commit 5f9f0e2

Please sign in to comment.