Merge #105

105: Remove old and unused imex ark algo r=charleskawczynski a=charleskawczynski This PR does a bit of house cleaning and removes some of the old imex ark algorithm pieces Co-authored-by: Charles Kawczynski <kawczynski.charles@gmail.com>
CliMA · Dec 16, 2022 · 54aeeb6 · 54aeeb6
2 parents aa6677c + 5a35a2b
commit 54aeeb6
Show file tree

Hide file tree

Showing 14 changed files with 97 additions and 824 deletions.
diff --git a/docs/src/algorithms.md b/docs/src/algorithms.md
@@ -15,8 +15,8 @@ ForwardEulerODEFunction
 ## IMEX ARK methods
 
 ```@docs
-OldIMEXARKAlgorithm
-Oldmake_IMEXARKTableau
+IMEXARKAlgorithm
+IMEXARKTableau
 ```
 
 The convergence orders of the provided methods are verified using test cases from [ARKode](http://runge.math.smu.edu/ARKode_example.pdf). Plots of the solutions to these test cases, the errors of these solutions, and the convergence orders with respect to `dt` are shown below.

diff --git a/perf/flame.jl b/perf/flame.jl
@@ -17,9 +17,9 @@ end
 (s, parsed_args) = parse_commandline()
 cts = joinpath(dirname(@__DIR__));
 include(joinpath(cts, "test", "problems.jl"))
-function do_work!(integrator, not_generated_cache)
+function do_work!(integrator, cache)
     for _ in 1:100_000
-        CTS.not_generated_step_u!(integrator, not_generated_cache)
+        CTS.step_u!(integrator, cache)
     end
 end
 problem_str = parsed_args["problem"]
@@ -30,16 +30,16 @@ elseif problem_str=="fe"
 else
     error("Bad option")
 end
-algorithm = CTS.OldIMEXARKAlgorithm(OldARS343(), NewtonsMethod(; max_iters = 2))
+algorithm = CTS.IMEXARKAlgorithm(ARS343(), NewtonsMethod(; max_iters = 2))
 dt = 0.01
 integrator = DiffEqBase.init(prob, algorithm; dt)
-not_generated_cache = CTS.not_generated_cache(prob, algorithm)
-do_work!(integrator, not_generated_cache) # compile first
+cache = CTS.cache(prob, algorithm)
+do_work!(integrator, cache) # compile first
 import Profile
 Profile.clear_malloc_data()
 Profile.clear()
 prof = Profile.@profile begin
-    do_work!(integrator, not_generated_cache)
+    do_work!(integrator, cache)
 end
 
 import ProfileCanvas

diff --git a/perf/jet.jl b/perf/jet.jl
@@ -15,13 +15,11 @@ end
 cts = joinpath(dirname(@__DIR__));
 include(joinpath(cts, "test", "problems.jl"))
 function config_integrators(problem)
-    algorithm = CTS.OldIMEXARKAlgorithm(OldARS343(), NewtonsMethod(; linsolve = linsolve_direct, max_iters = 2))
+    algorithm = CTS.IMEXARKAlgorithm(ARS343(), NewtonsMethod(; linsolve = linsolve_direct, max_iters = 2))
     dt = 0.01
     integrator = DiffEqBase.init(problem, algorithm; dt)
-    not_generated_integrator = DiffEqBase.init(problem, algorithm; dt)
     integrator.cache = CTS.cache(problem, algorithm)
-    not_generated_integrator.cache = CTS.not_generated_cache(problem, algorithm)
-    return (; integrator_generated=integrator, not_generated_integrator)
+    return (; integrator)
 end
 prob = if parsed_args["problem"]=="ode_fun"
     split_linear_prob_wfact_split()
@@ -30,8 +28,7 @@ elseif parsed_args["problem"]=="fe"
 else
     error("Bad option")
 end
-(; not_generated_integrator) = config_integrators(prob)
-integrator = not_generated_integrator
+(; integrator) = config_integrators(prob)
 
-JET.@test_opt CTS.not_generated_step_u!(integrator, integrator.cache)
+JET.@test_opt CTS.step_u!(integrator, integrator.cache)
 
diff --git a/src/ClimaTimeSteppers.jl b/src/ClimaTimeSteppers.jl
@@ -94,11 +94,10 @@ include("solvers/update_signal_handler.jl")
 include("solvers/convergence_condition.jl")
 include("solvers/convergence_checker.jl")
 include("solvers/newtons_method.jl")
-include("solvers/imex_ark.jl")
+include("solvers/imex_ark_tableaus.jl")
 include("solvers/imex_ark2.jl")
 
 # Include concrete implementations
-include("solvers/imex_ark_tableaus.jl")
 include("solvers/multirate.jl")
 include("solvers/lsrk.jl")
 include("solvers/ssprk.jl")

diff --git a/src/convergence_orders.jl b/src/convergence_orders.jl
@@ -36,7 +36,6 @@ const second_order_tableau = [
 #####
 const third_order_tableau = [
     ARS233,
-    OldARS343,
     ARS343,
     ARS443,
     IMKG342a,