summarylogtreecommitdiffstats
path: root/r838.patch
blob: 89104386f156a72ed391dee59d572923c62b0d0a (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
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
Index: src/solvers/glimda.py
===================================================================
--- assimulo/solvers/glimda.py	(revision 837)
+++ assimulo/solvers/glimda.py	(revision 838)
@@ -16,6 +16,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import numpy as N
+import sys
 
 from assimulo.exception import *
 from assimulo.ode import *
@@ -25,7 +26,7 @@
 try:
     from assimulo.lib.glimda import glimda
 except ImportError:
-    print("Could not find GLIMDA")
+    sys.stderr.write("Could not find GLIMDA.\n")
 
 class GLIMDA(Implicit_ODE):
     """
Index: src/solvers/__init__.py
===================================================================
--- assimulo/solvers/__init__.py	(revision 837)
+++ assimulo/solvers/__init__.py	(revision 838)
@@ -18,12 +18,14 @@
 __all__ = ["euler","radau5","sundials","runge_kutta","rosenbrock",
            "glimda","odepack","radar5","dasp3","odassl"]
 
+import sys
+
 #Import all the solvers from the different modules
 try:
     from .euler import ExplicitEuler
     from .euler import ImplicitEuler
 except ImportError as ie:
-    print("Could not find {}".format(ie.args[0].split("'")[1]))
+    sys.stderr.write("Could not find {}\n".format(ie.args[0].split("'")[1]))
 try:
     from .radau5 import Radau5ODE
     from .radau5 import Radau5DAE
@@ -30,43 +32,43 @@
     from .radau5 import _Radau5ODE
     from .radau5 import _Radau5DAE 
 except ImportError as ie:
-    print("Could not find {}".format(ie.args[0].split("'")[1]))
+    sys.stderr.write("Could not find {}\n".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].split("'")[1]))
+    sys.stderr.write("Could not find {}\n".format(ie.args[0].split("'")[1]))
 try:
     from .kinsol import KINSOL
 except ImportError as ie:
-    print("Could not find {}".format(ie.args[0].split("'")[1]))
+    sys.stderr.write("Could not find {}\n".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].split("'")[1]))
+    sys.stderr.write("Could not find {}\n".format(ie.args[0].split("'")[1]))
 try:
     from .rosenbrock import RodasODE
 except ImportError as ie:
-    print("Could not find {}".format(ie.args[0].split("'")[1]))
+    sys.stderr.write("Could not find {}\n".format(ie.args[0].split("'")[1]))
 try:
     from .odassl import ODASSL
 except ImportError as ie:
-    print("Could not find {}".format(ie.args[0].split("'")[1]))
+    sys.stderr.write("Could not find {}\n".format(ie.args[0].split("'")[1]))
 try:
     from .odepack import LSODAR
 except ImportError as ie:
-    print("Could not find {}".format(ie.args[0].split("'")[1]))
+    sys.stderr.write("Could not find {}\n".format(ie.args[0].split("'")[1]))
 try:
     from .radar5 import Radar5ODE
 except ImportError as ie:
-    print("Could not find {}".format(ie.args[0].split("'")[1]))
+    sys.stderr.write("Could not find {}\n".format(ie.args[0].split("'")[1]))
 try:
     from .dasp3 import DASP3ODE
 except ImportError as ie:
-    print("Could not find {}".format(ie.args[0].split("'")[1]))
+    sys.stderr.write("Could not find {}\n".format(ie.args[0].split("'")[1]))
 try:
     from .glimda import GLIMDA
 except ImportError as ie:
-    print("Could not find {}".format(ie.args[0].split("'")[1]))
+    sys.stderr.write("Could not find {}\n".format(ie.args[0].split("'")[1]))
Index: src/solvers/odepack.py
===================================================================
--- assimulo/solvers/odepack.py	(revision 837)
+++ assimulo/solvers/odepack.py	(revision 838)
@@ -17,6 +17,7 @@
 
 import numpy as N
 import scipy.linalg as Sc
+import sys
 from assimulo.exception import *
 from assimulo.ode import *
 import logging
@@ -27,7 +28,7 @@
     from assimulo.lib.odepack import dlsodar, dcfode, dintdy
     from assimulo.lib.odepack import set_lsod_common, get_lsod_common
 except ImportError:
-    print("Could not find ODEPACK functions")
+    sys.stderr.write("Could not find ODEPACK functions.\n")
 
 # Real work array  
 class common_like(object):