Skip to content

Commit

Permalink
Merge pull request #228 from CliMA/ck/rm_dss
Browse files Browse the repository at this point in the history
Remove extraneous `dss!` and `post_explicit!` calls
  • Loading branch information
charleskawczynski authored Oct 5, 2023
2 parents 67abbcd + 5b9d849 commit 6839f2e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "ClimaTimeSteppers"
uuid = "595c0a79-7f3d-439a-bc5a-b232dc3bde79"
authors = ["Climate Modeling Alliance"]
version = "0.7.13"
version = "0.7.14"

[deps]
CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
Expand Down
10 changes: 5 additions & 5 deletions src/solvers/imex_ark.jl
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@ function step_u!(integrator, cache::IMEXARKCache)
end
end

dss!(U, p, t_exp)
i 1 && dss!(U, p, t_exp)

if !(!isnothing(T_imp!) && !iszero(a_imp[i, i])) # Implicit solve
post_explicit!(U, p, t_imp)
else
if !(!isnothing(T_imp!) && !iszero(a_imp[i, i]))
i 1 && post_explicit!(U, p, t_imp)
else # Implicit solve
@assert !isnothing(newtons_method)
@. temp = U
post_explicit!(U, p, t_imp)
i 1 && post_explicit!(U, p, t_imp)
# TODO: can/should we remove these closures?
implicit_equation_residual! = (residual, Ui) -> begin
T_imp!(residual, Ui, p, t_imp)
Expand Down
8 changes: 4 additions & 4 deletions src/solvers/imex_ssprk.jl
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ function step_u!(integrator, cache::IMEXSSPRKCache)
@. U_exp = (1 - β[i - 1]) * u + β[i - 1] * U_exp
end

dss!(U_exp, p, t_exp)
i 1 && dss!(U_exp, p, t_exp)

@. U = U_exp
if !isnothing(T_imp!) # Update based on implicit tendencies from previous stages
Expand All @@ -104,9 +104,9 @@ function step_u!(integrator, cache::IMEXSSPRKCache)
end
end

if !(!isnothing(T_imp!) && !iszero(a_imp[i, i])) # Implicit solve
post_explicit!(U, p, t_imp)
else
if !(!isnothing(T_imp!) && !iszero(a_imp[i, i]))
i 1 && post_explicit!(U, p, t_imp)
else # Implicit solve
@assert !isnothing(newtons_method)
@. temp = U
post_explicit!(U, p, t_imp)
Expand Down

2 comments on commit 6839f2e

@charleskawczynski
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/92858

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.7.14 -m "<description of version>" 6839f2e32bde2f702f5d8f67b6891b729a47320f
git push origin v0.7.14

Please sign in to comment.