|
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_e
|
|---|
| 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,0
|
|---|
| 127 | 12.5,0
|
|---|
| 128 | 12.6,0
|
|---|
| 129 | 12.7,0
|
|---|
| 130 | 12.8,0
|
|---|
| 131 | 12.9,0
|
|---|
| 132 | 13,0
|
|---|
| 133 | 13.1,0
|
|---|
| 134 | 13.2,0
|
|---|
| 135 | 13.3,0
|
|---|
| 136 | 13.4,0
|
|---|
| 137 | 13.5,0
|
|---|
| 138 | 13.6,0
|
|---|
| 139 | 13.7,0
|
|---|
| 140 | 13.8,0
|
|---|
| 141 | 13.9,0
|
|---|
| 142 | 14,0
|
|---|
| 143 | 14.1,0
|
|---|
| 144 | 14.2,0
|
|---|
| 145 | 14.3,0
|
|---|
| 146 | 14.4,0
|
|---|
| 147 | 14.5,0
|
|---|
| 148 | 14.6,0
|
|---|
| 149 | 14.7,0
|
|---|
| 150 | 14.8,0
|
|---|
| 151 | 14.9,0
|
|---|
| 152 | 15,0
|
|---|
| 153 | 15.1,0
|
|---|
| 154 | 15.2,0
|
|---|
| 155 | 15.3,0
|
|---|
| 156 | 15.4,0
|
|---|
| 157 | 15.5,0
|
|---|
| 158 | 15.6,0
|
|---|
| 159 | 15.7,0
|
|---|
| 160 | 15.8,0
|
|---|
| 161 | 15.9,0
|
|---|
| 162 | 16,0
|
|---|
| 163 | 16.1,0
|
|---|
| 164 | 16.2,0
|
|---|
| 165 | 16.3,0
|
|---|
| 166 | 16.4,0
|
|---|
| 167 | 16.5,0
|
|---|
| 168 | 16.6,0
|
|---|
| 169 | 16.7,0
|
|---|
| 170 | 16.8,0
|
|---|
| 171 | 16.9,0
|
|---|
| 172 | 17,0
|
|---|
| 173 | 17.1,1.24E-05
|
|---|
| 174 | 17.2,2.56E-05
|
|---|
| 175 | 17.3,5.18E-05
|
|---|
| 176 | 17.4,0.000102901
|
|---|
| 177 | 17.5,0.000200505
|
|---|
| 178 | 17.6,0.000383435
|
|---|
| 179 | 17.7,0.000719531
|
|---|
| 180 | 17.8,0.0013247
|
|---|
| 181 | 17.9,0.00239225
|
|---|
| 182 | 18,0.0042366
|
|---|
| 183 | 18.1,0.00735598
|
|---|
| 184 | 18.2,0.0125186
|
|---|
| 185 | 18.3,0.0208749
|
|---|
| 186 | 18.4,0.0340958
|
|---|
| 187 | 18.5,0.0545279
|
|---|
| 188 | 18.6,0.0853482
|
|---|
| 189 | 18.7,0.130684
|
|---|
| 190 | 18.8,0.195647
|
|---|
| 191 | 18.9,0.286216
|
|---|
| 192 | 19,0.408882
|
|---|
| 193 | 19.1,0.56999
|
|---|
| 194 | 19.2,0.774712
|
|---|
| 195 | 19.3,1.02568
|
|---|
| 196 | 19.4,1.32134
|
|---|
| 197 | 19.5,1.65438
|
|---|
| 198 | 19.6,2.01036
|
|---|
| 199 | 19.7,2.36731
|
|---|
| 200 | 19.8,2.69658
|
|---|
| 201 | 19.9,2.96542
|
|---|
| 202 | 20,3.14143
|
|---|
| 203 | 20.1,3.19847
|
|---|
| 204 | 20.2,3.12308
|
|---|
| 205 | 20.3,2.92013
|
|---|
| 206 | 20.4,2.61567
|
|---|
| 207 | 20.5,2.25557
|
|---|
| 208 | 20.6,1.89887
|
|---|
| 209 | 20.7,1.60639
|
|---|
| 210 | 20.8,1.42655
|
|---|
| 211 | 20.9,1.3819
|
|---|
| 212 | 21,1.46083
|
|---|
| 213 | 21.1,1.61793
|
|---|
| 214 | 21.2,1.78478
|
|---|
| 215 | 21.3,1.88927
|
|---|
| 216 | 21.4,1.87852
|
|---|
| 217 | 21.5,1.7375
|
|---|
| 218 | 21.6,1.4961
|
|---|
| 219 | 21.7,1.22015
|
|---|
| 220 | 21.8,0.987803
|
|---|
| 221 | 21.9,0.858884
|
|---|
| 222 | 22,0.849042
|
|---|
| 223 | 22.1,0.920407
|
|---|
| 224 | 22.2,0.99485
|
|---|
| 225 | 22.3,0.986646
|
|---|
| 226 | 22.4,0.841901
|
|---|
| 227 | 22.5,0.567177
|
|---|
| 228 | 22.6,0.232564
|
|---|
| 229 | 22.7,-0.0549338
|
|---|
| 230 | 22.8,-0.197655
|
|---|
| 231 | 22.9,-0.152151
|
|---|
| 232 | 23,0.0498082
|
|---|
| 233 | 23.1,0.316351
|
|---|
| 234 | 23.2,0.540938
|
|---|
| 235 | 23.3,0.655472
|
|---|
| 236 | 23.4,0.662446
|
|---|
| 237 | 23.5,0.627231
|
|---|
| 238 | 23.6,0.63332
|
|---|
| 239 | 23.7,0.725577
|
|---|
| 240 | 23.8,0.875917
|
|---|
| 241 | 23.9,0.994982
|
|---|
| 242 | 24,0.986658
|
|---|
| 243 | 24.1,0.814492
|
|---|
| 244 | 24.2,0.537944
|
|---|
| 245 | 24.3,0.291118
|
|---|
| 246 | 24.4,0.210728
|
|---|
| 247 | 24.5,0.353687
|
|---|
| 248 | 24.6,0.655616
|
|---|
| 249 | 24.7,0.96014
|
|---|
| 250 | 24.8,1.10589
|
|---|
| 251 | 24.9,1.02008
|
|---|
| 252 | 25,0.760168
|
|---|
Note: See
TracBrowser
for help on using the repository browser.
