Merge pull request #762 from JuliaDiffEq/tests

Restructure tests
SciML · Jun 5, 2019 · d5b9534 · d5b9534
2 parents b440729 + c328561
commit d5b9534
Show file tree

Hide file tree

Showing 68 changed files with 1,192 additions and 91 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,11 @@ env:
   - GROUP=AlgConvergence_I
   - GROUP=AlgConvergence_II
   - GROUP=AlgConvergence_III
+  - GROUP=ODEInterfaceRegression
+addons:
+  apt:
+    packages:
+      - gfortran
 #matrix:
 #  allow_failures:
 #    - julia: nightly

diff --git a/src/perform_step/kencarp_kvaerno_perform_step.jl b/src/perform_step/kencarp_kvaerno_perform_step.jl
@@ -49,7 +49,7 @@ end
   nlsolver.z = z₂ = z₁
 
   nlsolver.tmp = uprev + γ*z₁
-  nlsolver.c = 2γ
+  nlsolver.c = γ
   z₂ = nlsolve!(integrator, cache)
   nlsolvefail(nlsolver) && return
 
@@ -115,7 +115,7 @@ end
   nlsolver.z = z₂
 
   @.. tmp = uprev + γ*z₁
-  nlsolver.c = 2γ
+  nlsolver.c = γ
   z₂ = nlsolve!(integrator, cache)
   nlsolvefail(nlsolver) && return
   set_new_W!(nlsolver, false)
@@ -210,7 +210,7 @@ end
     nlsolver.tmp += ea21*k1
   end
 
-  nlsolver.c = 2γ
+  nlsolver.c = γ
   z₂ = nlsolve!(integrator, cache)
   nlsolvefail(nlsolver) && return
 
@@ -337,7 +337,7 @@ end
     @.. tmp += ea21*k1
   end
 
-  nlsolver.c = 2γ
+  nlsolver.c = γ
   z₂ = nlsolve!(integrator, cache)
   nlsolvefail(nlsolver) && return
   set_new_W!(nlsolver, false)
@@ -452,7 +452,7 @@ end
   nlsolver.z = z₂ = zero(u)
 
   nlsolver.tmp = uprev + γ*z₁
-  nlsolver.c = 2γ
+  nlsolver.c = γ
   z₂ = nlsolve!(integrator, cache)
   nlsolvefail(nlsolver) && return
 
@@ -530,7 +530,7 @@ end
   nlsolver.z = z₂
 
   @.. tmp = uprev + γ*z₁
-  nlsolver.c = 2γ
+  nlsolver.c = γ
   z₂ = nlsolve!(integrator, cache)
   nlsolvefail(nlsolver) && return
   set_new_W!(nlsolver, false)
@@ -636,7 +636,7 @@ end
     tmp += ea21*k1
   end
   nlsolver.tmp = tmp
-  nlsolver.c = 2γ
+  nlsolver.c = γ
 
   z₂ = nlsolve!(integrator, cache)
   nlsolvefail(nlsolver) && return
@@ -808,7 +808,7 @@ end
     @.. tmp += ea21*k1
   end
 
-  nlsolver.c = 2γ
+  nlsolver.c = γ
   z₂ = nlsolve!(integrator, cache)
   nlsolvefail(nlsolver) && return
   set_new_W!(nlsolver, false)
@@ -979,7 +979,7 @@ end
   nlsolver.z = z₂ = zero(u)
 
   nlsolver.tmp = uprev + γ*z₁
-  nlsolver.c = 2γ
+  nlsolver.c = γ
   z₂ = nlsolve!(integrator, cache)
   nlsolvefail(nlsolver) && return
 
@@ -1075,7 +1075,7 @@ end
   nlsolver.z = z₂
 
   @.. tmp = uprev + γ*z₁
-  nlsolver.c = 2γ
+  nlsolver.c = γ
   z₂ = nlsolve!(integrator, cache)
   nlsolvefail(nlsolver) && return
   set_new_W!(nlsolver, false)
@@ -1213,7 +1213,7 @@ end
     tmp += ea21*k1
   end
   nlsolver.tmp = tmp
-  nlsolver.c = 2γ
+  nlsolver.c = γ
 
   z₂ = nlsolve!(integrator, cache)
   nlsolvefail(nlsolver) && return
@@ -1426,7 +1426,7 @@ end
     @.. tmp += ea21*k1
   end
 
-  nlsolver.c = 2γ
+  nlsolver.c = γ
   z₂ = nlsolve!(integrator, cache)
   nlsolvefail(nlsolver) && return
   set_new_W!(nlsolver, false)

diff --git a/src/perform_step/sdirk_perform_step.jl b/src/perform_step/sdirk_perform_step.jl
@@ -1003,7 +1003,7 @@ end
   nlsolver.z = z₂ = zero(z₁)
 
   nlsolver.tmp = uprev + γ*z₁
-  nlsolver.c = 2γ
+  nlsolver.c = γ
   z₂ = nlsolve!(integrator, cache)
   nlsolvefail(nlsolver) && return
 
@@ -1107,7 +1107,7 @@ end
   nlsolver.z = z₂
 
   @.. tmp = uprev + γ*z₁
-  nlsolver.c = 2γ
+  nlsolver.c = γ
   z₂ = nlsolve!(integrator, cache)
   nlsolvefail(nlsolver) && return
   set_new_W!(nlsolver, false)

diff --git a/test/REQUIRE b/test/REQUIRE
@@ -6,3 +6,5 @@ DiffEqCallbacks
 DiffEqOperators
 SafeTestsets
 Calculus
+Unitful
+DiffEqSensitivity
diff --git a/test/ode/adams_tests.jl → test/algconvergence/adams_tests.jl b/test/ode/adams_tests.jl → test/algconvergence/adams_tests.jl
diff --git a/test/linear_method_tests.jl → test/algconvergence/linear_method_tests.jl b/test/linear_method_tests.jl → test/algconvergence/linear_method_tests.jl
diff --git a/test/linear_nonlinear_convergence_tests.jl → ...nce/linear_nonlinear_convergence_tests.jl b/test/linear_nonlinear_convergence_tests.jl → ...nce/linear_nonlinear_convergence_tests.jl
diff --git a/test/linear_nonlinear_krylov_tests.jl → ...vergence/linear_nonlinear_krylov_tests.jl b/test/linear_nonlinear_krylov_tests.jl → ...vergence/linear_nonlinear_krylov_tests.jl
diff --git a/test/ode/nordsieck_tests.jl → test/algconvergence/nordsieck_tests.jl b/test/ode/nordsieck_tests.jl → test/algconvergence/nordsieck_tests.jl
diff --git a/test/ode/ode_convergence_tests.jl → test/algconvergence/ode_convergence_tests.jl b/test/ode/ode_convergence_tests.jl → test/algconvergence/ode_convergence_tests.jl
diff --git a/test/ode/ode_extrapolation_tests.jl → ...algconvergence/ode_extrapolation_tests.jl b/test/ode/ode_extrapolation_tests.jl → ...algconvergence/ode_extrapolation_tests.jl
diff --git a/test/algconvergence/ode_feagin_tests.jl b/test/algconvergence/ode_feagin_tests.jl
@@ -0,0 +1,54 @@
+using OrdinaryDiffEq, DiffEqBase, Test, DiffEqProblemLibrary, DiffEqDevTools,
+      Random
+
+using DiffEqProblemLibrary.ODEProblemLibrary: importodeproblems; importodeproblems()
+import DiffEqProblemLibrary.ODEProblemLibrary: prob_ode_bigfloatlinear,
+                                               prob_ode_bigfloat2Dlinear,
+                                               prob_ode_2Dlinear
+
+## Convergence Testing
+println("Convergence Test on Linear")
+
+testTol = 1
+prob = prob_ode_2Dlinear
+println("Feagin RKs")
+dts = (1//2) .^ (4:-1:2)
+sol = solve(prob,Feagin10(),dt=dts[1])
+prob = remake(prob_ode_bigfloat2Dlinear,tspan=(big(0)//1,big(1)//1))
+sol = solve(prob,Feagin10(),dt=dts[1])
+
+prob = remake(prob_ode_bigfloat2Dlinear,tspan=(big(0.0),big(1.0)))
+dts = (1//2) .^ (4:-1:2)
+sim = test_convergence(dts,prob,Feagin10())
+@test abs(sim.𝒪est[:final]-8) < testTol #Lowered due to low test dt
+
+sim = test_convergence(dts,prob,Feagin12())
+@test abs(sim.𝒪est[:final]-12) < testTol
+
+sim = test_convergence(dts,prob,Feagin14())
+@test abs(sim.𝒪est[:final]-15) < testTol #Upped to 15 for test
+
+prob = prob_ode_bigfloatlinear
+
+dts = (1//2) .^ (6:-1:3)
+sim = test_convergence(dts,prob,Feagin10())
+@test abs(sim.𝒪est[:final]-10) < testTol
+
+dts = (1//2) .^ (4:-1:2)
+sim = test_convergence(dts,prob,Feagin12())
+@test abs(sim.𝒪est[:final]-12) < testTol
+
+sim = test_convergence(dts,prob,Feagin14())
+@test abs(sim.𝒪est[:final]-15) < testTol #Upped to 15 for test
+
+prob = prob_ode_bigfloat2Dlinear
+
+#compile
+sol =solve(prob,Feagin10(),dt=dts[1])
+sol =solve(prob,Feagin12(),dt=dts[1])
+sol =solve(prob,Feagin14(),dt=dts[1])
+
+#test
+@time sol =solve(prob,Feagin10(),dt=dts[1])
+@time sol =solve(prob,Feagin12(),dt=dts[1])
+@time sol =solve(prob,Feagin14(),dt=dts[1])
diff --git a/test/ode/ode_firk_tests.jl → test/algconvergence/ode_firk_tests.jl b/test/ode/ode_firk_tests.jl → test/algconvergence/ode_firk_tests.jl
diff --git a/test/ode/ode_low_storage_rk_tests.jl → ...lgconvergence/ode_low_storage_rk_tests.jl b/test/ode/ode_low_storage_rk_tests.jl → ...lgconvergence/ode_low_storage_rk_tests.jl
diff --git a/test/ode/ode_rosenbrock_tests.jl → test/algconvergence/ode_rosenbrock_tests.jl b/test/ode/ode_rosenbrock_tests.jl → test/algconvergence/ode_rosenbrock_tests.jl
diff --git a/test/ode/ode_ssprk_tests.jl → test/algconvergence/ode_ssprk_tests.jl b/test/ode/ode_ssprk_tests.jl → test/algconvergence/ode_ssprk_tests.jl
diff --git a/test/owrenzen_tests.jl → test/algconvergence/owrenzen_tests.jl b/test/owrenzen_tests.jl → test/algconvergence/owrenzen_tests.jl
diff --git a/test/partitioned_methods_tests.jl → ...gconvergence/partitioned_methods_tests.jl b/test/partitioned_methods_tests.jl → ...gconvergence/partitioned_methods_tests.jl
diff --git a/test/ode/rkc_tests.jl → test/algconvergence/rkc_tests.jl b/test/ode/rkc_tests.jl → test/algconvergence/rkc_tests.jl
diff --git a/test/split_methods_tests.jl → test/algconvergence/split_methods_tests.jl b/test/split_methods_tests.jl → test/algconvergence/split_methods_tests.jl