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:
951 bytes
|
Rev | Line | |
---|
[7172] | 1 | <?xml version='1.0' encoding='iso-8859-1'?> |
---|
| 2 | <ga_license_file> |
---|
| 3 | <metadata> |
---|
| 4 | <author>Jane Sexton</author> |
---|
| 5 | </metadata> |
---|
| 6 | |
---|
| 7 | <datafile> |
---|
| 8 | <filename>z_1_1.csv</filename> |
---|
| 9 | <checksum>3317164595</checksum> |
---|
| 10 | <publishable>Yes</publishable> |
---|
| 11 | <accountable>Jane Sexton</accountable> |
---|
| 12 | <source>Generated by Chris Thomas as part of tsunami risk modelling team July 2008 |
---|
| 13 | to develop a series of datasets to test urs2sts functionality. |
---|
| 14 | Problem is to use three sources (defined in mux2 files, source 1, 2 and 3) |
---|
| 15 | at 5 stations (0,1,2,3,4) and to compare output from urs2sts to these csv files. |
---|
| 16 | The comparison will be done on an individual source basis and the combined with |
---|
| 17 | the weighting of 1 for source 1, 2 for source 2 and 3 for source 3. |
---|
| 18 | This file provides the waveheight timeseries |
---|
| 19 | for source 1 and station 1.</source> |
---|
| 20 | <IP_owner>Geoscience Australia.</IP_owner> |
---|
| 21 | <IP_info /> |
---|
| 22 | </datafile> |
---|
| 23 | |
---|
| 24 | |
---|
| 25 | </ga_license_file> |
---|
Note: See
TracBrowser
for help on using the repository browser.