Cleaner main branch again with default velocity formulation in Radau.

JonasBreuling · Aug 23, 2024 · 089f67b · 089f67b
1 parent b89f99f
commit 089f67b
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 2,064 deletions.
diff --git a/examples/daes/robertson.py b/examples/daes/robertson.py
@@ -95,11 +95,7 @@ def jac(t, y, yp):
 
     ##############
     # dae solution
-    ##############
-    # method = "Radau"
-    # method = "PSIDE"
-    method = "PTIRK"
-
+    ##############    
     start = time.time()
     sol = solve_dae(F, t_span, y0, yp0, atol=atol, rtol=rtol, method=method, t_eval=t_eval, jac=jac, dense_output=True)
     end = time.time()

diff --git a/examples/odes/one_element_timoshenko_rod.py b/examples/odes/one_element_timoshenko_rod.py
@@ -174,10 +174,9 @@ def f(t, vy):
     t_eval = np.linspace(t0, t1, num=int(1e4))
     t_eval = None
 
+    # method = "RK23"
     # method = "BDF"
     method = "Radau"
-    # method = "RK23"
-    # method = "PSIDE"
 
     # initial positions
     q0 = np.array([length, 0, 0], dtype=float)
@@ -213,7 +212,7 @@ def f(t, vy):
     # dae solution
     ##############
     start = time.time()
-    sol = solve_dae(F, t_span, y0, yp0, atol=atol, rtol=rtol, method=method, t_eval=t_eval, stages=5)
+    sol = solve_dae(F, t_span, y0, yp0, atol=atol, rtol=rtol, method=method, t_eval=t_eval, stages=3)
     # sol = solve_ivp(f, t_span, y0, method=method, t_eval=t_eval, atol=atol, rtol=rtol)
     end = time.time()
     t = sol.t

diff --git a/scipy_dae/integrate/_dae/dae.py b/scipy_dae/integrate/_dae/dae.py
@@ -9,17 +9,13 @@
 from .base import DaeSolver
 from .bdf import BDFDAE
 from .radau import RadauDAE
-from .pside import PPSIDEDAE
-from .ptirk import PTIRKDAE
 from scipy.optimize import OptimizeResult
 from .common import DaeSolution
 
 
 METHODS = {
     "BDF": BDFDAE,
     "Radau": RadauDAE,
-    "PSIDE": PPSIDEDAE,
-    "PTIRK": PTIRKDAE,
 }
 
 

diff --git a/scipy_dae/integrate/_dae/meson.build b/scipy_dae/integrate/_dae/meson.build
@@ -5,8 +5,6 @@ py3.install_sources([
     'common.py',
     'dae.py',
     'radau.py',
-    'pside.py',
-    'ptirk.py',
   ],
   subdir: 'scipy_dae/integrate/_dae'
 )