blob: 7385443600c125e2b2ab03743e60b2b84dc80eaa (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
Index: src/solvers/radar5.py
===================================================================
--- assimulo/solvers/radar5.py (revision 832)
+++ assimulo/solvers/radar5.py (revision 833)
@@ -26,9 +26,11 @@
from assimulo.explicit_ode import Explicit_ODE
from assimulo.implicit_ode import Implicit_ODE
-from assimulo.lib import radar5
+try:
+ from assimulo.lib import radar5
+except ImportError:
+ print("Could not find RADAR5")
-
class Radar_Exception(Exception):
pass
Index: src/solvers/__init__.py
===================================================================
--- assimulo/solvers/__init__.py (revision 832)
+++ assimulo/solvers/__init__.py (revision 833)
@@ -23,7 +23,7 @@
from .euler import ExplicitEuler
from .euler import ImplicitEuler
except ImportError as ie:
- print("Could not find {}".format(ie.args[0][16:]))
+ print("Could not find {}".format(ie.args[0].split("'")[1]))
try:
from .radau5 import Radau5ODE
from .radau5 import Radau5DAE
@@ -30,43 +30,43 @@
from .radau5 import _Radau5ODE
from .radau5 import _Radau5DAE
except ImportError as ie:
- print("Could not find {}".format(ie.args[0][16:]))
+ print("Could not find {}".format(ie.args[0].split("'")[1]))
try:
from .sundials import IDA
from .sundials import CVode
except ImportError as ie:
- print("Could not find {}".format(ie.args[0][16:]))
+ print("Could not find {}".format(ie.args[0].split("'")[1]))
try:
from .kinsol import KINSOL
except ImportError as ie:
- print("Could not find {}".format(ie.args[0][16:]))
+ print("Could not find {}".format(ie.args[0].split("'")[1]))
try:
from .runge_kutta import RungeKutta34
from .runge_kutta import RungeKutta4
from .runge_kutta import Dopri5
except ImportError as ie:
- print("Could not find {}".format(ie.args[0][16:]))
+ print("Could not find {}".format(ie.args[0].split("'")[1]))
try:
from .rosenbrock import RodasODE
except ImportError as ie:
- print("Could not find {}".format(ie.args[0][16:]))
+ print("Could not find {}".format(ie.args[0].split("'")[1]))
try:
from .odassl import ODASSL
except ImportError as ie:
- print("Could not find {}".format(ie.args[0][16:]))
+ print("Could not find {}".format(ie.args[0].split("'")[1]))
try:
from .odepack import LSODAR
except ImportError as ie:
- print("Could not find {}".format(ie.args[0][16:]))
+ print("Could not find {}".format(ie.args[0].split("'")[1]))
try:
from .radar5 import Radar5ODE
except ImportError as ie:
- print("Could not find {}".format(ie.args[0][16:]))
+ print("Could not find {}".format(ie.args[0].split("'")[1]))
try:
from .dasp3 import DASP3ODE
except ImportError as ie:
- print("Could not find {}".format(ie.args[0][16:]))
+ print("Could not find {}".format(ie.args[0].split("'")[1]))
try:
from .glimda import GLIMDA
except ImportError as ie:
- print("Could not find {}".format(ie.args[0][16:]))
+ print("Could not find {}".format(ie.args[0].split("'")[1]))
|