hiro/jobmanager
1
0
Fork 0
mirror of https://github.com/vale981/jobmanager synced 2025-03-05 09:51:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

added new integrator methods, std from scipy

Browse source
This commit is contained in:
cimatosa 2015-09-01 10:47:10 +02:00
parent 4e21dec157
commit da594a0ee9
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
jobmanager/ode_wrapper.py
View file

@ -45,7 +45,7 @@ def integrate_cplx(c, t0, t1, N, f, args, x0, integrator, verbose=0, res_dim=Non
# define complex derivative
f_ = f_partial_complex
x0_ = x0
elif (integrator == 'vode') | (integrator == 'lsoda'):
elif (integrator == 'vode') | (integrator == 'lsoda') | (integrator == 'dopri5') | (integrator == 'dop853'):
# define real derivative (separation for real and imaginary part)
f_ = lambda t, x: wrap_complex_intgeration(f_partial_complex)(t, x)
x0_ = complex_to_real(x0)
@ -56,6 +56,10 @@ def integrate_cplx(c, t0, t1, N, f, args, x0, integrator, verbose=0, res_dim=Non
r = ode(f_)
if (integrator == 'dopri5') | (integrator == 'dop853'):
if 'order' in kwargs:
del kwargs['order']
kws = list(kwargs.keys())
for kw in kws:
if kwargs[kw] is None: