Skip to content

Commit 040572c

Browse files
committed
Revert "Revive SSPKnoth"
This reverts commit bbe3545. Merged by accident
1 parent da80de6 commit 040572c

File tree

16 files changed

+331
-940
lines changed

16 files changed

+331
-940
lines changed

docs/Manifest.toml

Lines changed: 268 additions & 200 deletions
Large diffs are not rendered by default.

docs/Project.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
1111
DocumenterCitations = "daee34ce-89f3-4625-b898-19384cb65244"
1212
Krylov = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7"
1313
LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
14-
Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
1514
NVTX = "5da4648a-3479-48b8-97b9-01cb529c0a1f"
1615
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
1716
PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
1817
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
19-
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
2018
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"

docs/make.jl

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,5 @@
11
using Documenter, DocumenterCitations
22
using ClimaTimeSteppers
3-
using Literate
4-
5-
tutorial_basedir = "tutorials"
6-
tutorial_basedir_from_here = joinpath(@__DIR__, "src", tutorial_basedir)
7-
8-
jl_files_in_basedir = filter(endswith(".jl"), readdir(tutorial_basedir_from_here))
9-
10-
println("Building literate tutorials...")
11-
generated_tutorials = String[]
12-
for filename in jl_files_in_basedir
13-
Literate.markdown(
14-
joinpath(tutorial_basedir_from_here, filename),
15-
tutorial_basedir_from_here;
16-
flavor = Literate.CommonMarkFlavor(),
17-
)
18-
push!(generated_tutorials, joinpath(tutorial_basedir, replace(filename, ".jl" => ".md")))
19-
end
203

214
# https://github.com/jheinen/GR.jl/issues/278#issuecomment-587090846
225
ENV["GKSwstype"] = "nul"
@@ -29,14 +12,12 @@ pages = [
2912
"Algorithm Formulations" => [
3013
"ODE Solvers" => "algorithm_formulations/ode_solvers.md",
3114
"Newtons Method" => "algorithm_formulations/newtons_method.md",
32-
"Rosenbrock Method" => "algorithm_formulations/rosenbrock.md",
3315
"Old LSRK Formulations" => "algorithm_formulations/lsrk.md",
3416
"Old MRRK Formulations" => "algorithm_formulations/mrrk.md",
3517
],
3618
"Test problems" => [
3719
"test_problems/index.md",
3820
],
39-
"Tutorials" => generated_tutorials,
4021
"API docs" => [
4122
"ODE Solvers" => "api/ode_solvers.md",
4223
"Newtons Method" => "api/newtons_method.md",

docs/src/algorithm_formulations/rosenbrock.md

Lines changed: 0 additions & 122 deletions
This file was deleted.

docs/src/api/ode_solvers.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ HOMMEM1
5151
ARK2GKC
5252
ARK437L2SA1
5353
ARK548L2SA2
54-
SSPKnoth
5554
```
5655

5756
## Explicit Algorithm Names

docs/src/dev/report_gen.jl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ let # Convergence
1717
title = "All Algorithms"
1818
algorithm_names = map(T -> T(), all_subtypes(ClimaTimeSteppers.AbstractAlgorithmName))
1919
algorithm_names = filter(name -> !(name isa ARK437L2SA1 || name isa ARK548L2SA2), algorithm_names) # too high order
20-
21-
# NOTE: Some imperfections in the convergence order for SSPKnoth are to be
22-
# expected because we are not using the exact Jacobian
23-
2420
verify_convergence(title, algorithm_names, ark_analytic_nonlin_test_cts(Float64), 200)
2521
verify_convergence(title, algorithm_names, ark_analytic_sys_test_cts(Float64), 400)
2622
verify_convergence(title, algorithm_names, ark_analytic_test_cts(Float64), 40000; super_convergence = (ARS121(),))
@@ -33,8 +29,6 @@ let # Convergence
3329
num_steps_scaling_factor = 4,
3430
numerical_reference_algorithm_name = ARS343(),
3531
)
36-
rosenbrock_schems = filter(name -> name isa ClimaTimeSteppers.RosenbrockAlgorithmName, algorithm_names)
37-
verify_convergence(title, rosenbrock_schems, climacore_1Dheat_test_implicit_cts(Float64), 400)
3832
verify_convergence(
3933
title,
4034
algorithm_names,

docs/src/plotting_utils.jl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ imex_convergence_orders(::ARK548L2SA2) = (5, 5, 5)
5959
imex_convergence_orders(::SSP22Heuns) = (2, 2, 2)
6060
imex_convergence_orders(::SSP33ShuOsher) = (3, 3, 3)
6161
imex_convergence_orders(::RK4) = (4, 4, 4)
62-
# SSPKnoth is not really an IMEX method
63-
imex_convergence_orders(::SSPKnoth) = (2, 2, 2)
6462

6563
# Compute a confidence interval for the convergence order, returning the
6664
# estimated convergence order and its uncertainty.
@@ -115,8 +113,6 @@ function verify_convergence(
115113
default_dt = t_end / num_steps
116114

117115
algorithm(algorithm_name::ClimaTimeSteppers.ERKAlgorithmName) = ExplicitAlgorithm(algorithm_name)
118-
algorithm(algorithm_name::ClimaTimeSteppers.SSPKnoth) =
119-
ClimaTimeSteppers.RosenbrockAlgorithm(ClimaTimeSteppers.tableau(ClimaTimeSteppers.SSPKnoth()))
120116
algorithm(algorithm_name::ClimaTimeSteppers.IMEXARKAlgorithmName) =
121117
IMEXAlgorithm(algorithm_name, NewtonsMethod(; max_iters = linear_implicit ? 1 : 2))
122118

0 commit comments

Comments
 (0)