Last change
on this file since 7276 was
7276,
checked in by ole, 15 years ago
|
Merged numpy branch back into the trunk.
In ~/sandpit/anuga/anuga_core/source
svn merge -r 6246:HEAD ../../branches/numpy .
In ~/sandpit/anuga/anuga_validation
svn merge -r 6417:HEAD ../branches/numpy_anuga_validation .
In ~/sandpit/anuga/misc
svn merge -r 6809:HEAD ../branches/numpy_misc .
For all merges, I used numpy version where conflicts existed
The suites test_all.py (in source/anuga) and validate_all.py passed using Python2.5 with numpy on my Ubuntu Linux box.
|
File size:
2.4 KB
|
Line | |
---|
1 | time,urs_n
|
---|
2 | 0,0
|
---|
3 | 0.1,0
|
---|
4 | 0.2,0
|
---|
5 | 0.3,0
|
---|
6 | 0.4,0
|
---|
7 | 0.5,0
|
---|
8 | 0.6,0
|
---|
9 | 0.7,0
|
---|
10 | 0.8,0
|
---|
11 | 0.9,0
|
---|
12 | 1,0
|
---|
13 | 1.1,0
|
---|
14 | 1.2,0
|
---|
15 | 1.3,0
|
---|
16 | 1.4,0
|
---|
17 | 1.5,0
|
---|
18 | 1.6,0
|
---|
19 | 1.7,0
|
---|
20 | 1.8,0
|
---|
21 | 1.9,0
|
---|
22 | 2,0
|
---|
23 | 2.1,0
|
---|
24 | 2.2,0
|
---|
25 | 2.3,0
|
---|
26 | 2.4,0
|
---|
27 | 2.5,0
|
---|
28 | 2.6,0
|
---|
29 | 2.7,0
|
---|
30 | 2.8,0
|
---|
31 | 2.9,0
|
---|
32 | 3,0
|
---|
33 | 3.1,0
|
---|
34 | 3.2,0
|
---|
35 | 3.3,0
|
---|
36 | 3.4,0
|
---|
37 | 3.5,0
|
---|
38 | 3.6,0
|
---|
39 | 3.7,0
|
---|
40 | 3.8,0
|
---|
41 | 3.9,0
|
---|
42 | 4,0
|
---|
43 | 4.1,0
|
---|
44 | 4.2,0
|
---|
45 | 4.3,0
|
---|
46 | 4.4,0
|
---|
47 | 4.5,0
|
---|
48 | 4.6,0
|
---|
49 | 4.7,0
|
---|
50 | 4.8,0
|
---|
51 | 4.9,0
|
---|
52 | 5,0
|
---|
53 | 5.1,0
|
---|
54 | 5.2,0
|
---|
55 | 5.3,0
|
---|
56 | 5.4,0
|
---|
57 | 5.5,0
|
---|
58 | 5.6,0
|
---|
59 | 5.7,0
|
---|
60 | 5.8,0
|
---|
61 | 5.9,0
|
---|
62 | 6,0
|
---|
63 | 6.1,0
|
---|
64 | 6.2,0
|
---|
65 | 6.3,0
|
---|
66 | 6.4,0
|
---|
67 | 6.5,0
|
---|
68 | 6.6,0
|
---|
69 | 6.7,0
|
---|
70 | 6.8,0
|
---|
71 | 6.9,0
|
---|
72 | 7,0
|
---|
73 | 7.1,0
|
---|
74 | 7.2,0
|
---|
75 | 7.3,0
|
---|
76 | 7.4,0
|
---|
77 | 7.5,0
|
---|
78 | 7.6,0
|
---|
79 | 7.7,0
|
---|
80 | 7.8,0
|
---|
81 | 7.9,0
|
---|
82 | 8,0
|
---|
83 | 8.1,0
|
---|
84 | 8.2,0
|
---|
85 | 8.3,0
|
---|
86 | 8.4,0
|
---|
87 | 8.5,0
|
---|
88 | 8.6,0
|
---|
89 | 8.7,0
|
---|
90 | 8.8,0
|
---|
91 | 8.9,0
|
---|
92 | 9,0
|
---|
93 | 9.1,0
|
---|
94 | 9.2,0
|
---|
95 | 9.3,0
|
---|
96 | 9.4,0
|
---|
97 | 9.5,0
|
---|
98 | 9.6,0
|
---|
99 | 9.7,0
|
---|
100 | 9.8,0
|
---|
101 | 9.9,0
|
---|
102 | 10,0
|
---|
103 | 10.1,0
|
---|
104 | 10.2,0
|
---|
105 | 10.3,0
|
---|
106 | 10.4,0
|
---|
107 | 10.5,0
|
---|
108 | 10.6,0
|
---|
109 | 10.7,0
|
---|
110 | 10.8,0
|
---|
111 | 10.9,0
|
---|
112 | 11,0
|
---|
113 | 11.1,0
|
---|
114 | 11.2,0
|
---|
115 | 11.3,0
|
---|
116 | 11.4,0
|
---|
117 | 11.5,0
|
---|
118 | 11.6,0
|
---|
119 | 11.7,0
|
---|
120 | 11.8,0
|
---|
121 | 11.9,0
|
---|
122 | 12,0
|
---|
123 | 12.1,0
|
---|
124 | 12.2,0
|
---|
125 | 12.3,0
|
---|
126 | 12.4,7.37E-13
|
---|
127 | 12.5,3.05E-12
|
---|
128 | 12.6,1.13E-11
|
---|
129 | 12.7,3.09E-11
|
---|
130 | 12.8,9.17E-11
|
---|
131 | 12.9,2.38E-10
|
---|
132 | 13,5.51E-10
|
---|
133 | 13.1,1.46E-09
|
---|
134 | 13.2,4.99E-09
|
---|
135 | 13.3,1.47E-08
|
---|
136 | 13.4,4.12E-08
|
---|
137 | 13.5,1.08E-07
|
---|
138 | 13.6,2.73E-07
|
---|
139 | 13.7,6.90E-07
|
---|
140 | 13.8,1.65E-06
|
---|
141 | 13.9,3.87E-06
|
---|
142 | 14,9.02E-06
|
---|
143 | 14.1,2.01E-05
|
---|
144 | 14.2,4.30E-05
|
---|
145 | 14.3,8.95E-05
|
---|
146 | 14.4,0.000181894
|
---|
147 | 14.5,0.000359024
|
---|
148 | 14.6,0.000687914
|
---|
149 | 14.7,0.00128011
|
---|
150 | 14.8,0.00230883
|
---|
151 | 14.9,0.00403713
|
---|
152 | 15,0.00684909
|
---|
153 | 15.1,0.0112642
|
---|
154 | 15.2,0.0179375
|
---|
155 | 15.3,0.0276461
|
---|
156 | 15.4,0.0412221
|
---|
157 | 15.5,0.0594232
|
---|
158 | 15.6,0.0827579
|
---|
159 | 15.7,0.111278
|
---|
160 | 15.8,0.144381
|
---|
161 | 15.9,0.180692
|
---|
162 | 16,0.218104
|
---|
163 | 16.1,0.254022
|
---|
164 | 16.2,0.285834
|
---|
165 | 16.3,0.311523
|
---|
166 | 16.4,0.330259
|
---|
167 | 16.5,0.342759
|
---|
168 | 16.6,0.3512
|
---|
169 | 16.7,0.358623
|
---|
170 | 16.8,0.36793
|
---|
171 | 16.9,0.380814
|
---|
172 | 17,0.397032
|
---|
173 | 17.1,0.414398
|
---|
174 | 17.2,0.429637
|
---|
175 | 17.3,0.439767
|
---|
176 | 17.4,0.44341
|
---|
177 | 17.5,0.441374
|
---|
178 | 17.6,0.436137
|
---|
179 | 17.7,0.43043
|
---|
180 | 17.8,0.425679
|
---|
181 | 17.9,0.42124
|
---|
182 | 18,0.414971
|
---|
183 | 18.1,0.404894
|
---|
184 | 18.2,0.390968
|
---|
185 | 18.3,0.375794
|
---|
186 | 18.4,0.363649
|
---|
187 | 18.5,0.358254
|
---|
188 | 18.6,0.360657
|
---|
189 | 18.7,0.368595
|
---|
190 | 18.8,0.377814
|
---|
191 | 18.9,0.384493
|
---|
192 | 19,0.387159
|
---|
193 | 19.1,0.386855
|
---|
194 | 19.2,0.385627
|
---|
195 | 19.3,0.384648
|
---|
196 | 19.4,0.383568
|
---|
197 | 19.5,0.381527
|
---|
198 | 19.6,0.378808
|
---|
199 | 19.7,0.377419
|
---|
200 | 19.8,0.379773
|
---|
201 | 19.9,0.386386
|
---|
202 | 20,0.394669
|
---|
203 | 20.1,0.400228
|
---|
204 | 20.2,0.399997
|
---|
205 | 20.3,0.394777
|
---|
206 | 20.4,0.388955
|
---|
207 | 20.5,99
|
---|
208 | 20.6,99
|
---|
209 | 20.7,99
|
---|
210 | 20.8,99
|
---|
211 | 20.9,99
|
---|
212 | 21,99
|
---|
213 | 21.1,99
|
---|
214 | 21.2,99
|
---|
215 | 21.3,99
|
---|
216 | 21.4,99
|
---|
217 | 21.5,99
|
---|
218 | 21.6,99
|
---|
219 | 21.7,99
|
---|
220 | 21.8,99
|
---|
221 | 21.9,99
|
---|
222 | 22,99
|
---|
223 | 22.1,99
|
---|
224 | 22.2,99
|
---|
225 | 22.3,99
|
---|
226 | 22.4,99
|
---|
227 | 22.5,99
|
---|
228 | 22.6,99
|
---|
229 | 22.7,99
|
---|
230 | 22.8,99
|
---|
231 | 22.9,99
|
---|
232 | 23,99
|
---|
233 | 23.1,99
|
---|
234 | 23.2,99
|
---|
235 | 23.3,99
|
---|
236 | 23.4,99
|
---|
237 | 23.5,99
|
---|
238 | 23.6,99
|
---|
239 | 23.7,99
|
---|
240 | 23.8,99
|
---|
241 | 23.9,99
|
---|
242 | 24,99
|
---|
243 | 24.1,99
|
---|
244 | 24.2,99
|
---|
245 | 24.3,99
|
---|
246 | 24.4,99
|
---|
247 | 24.5,99
|
---|
248 | 24.6,99
|
---|
249 | 24.7,99
|
---|
250 | 24.8,99
|
---|
251 | 24.9,99
|
---|
252 | 25,99
|
---|
Note: See
TracBrowser
for help on using the repository browser.