Changeset 7276 for anuga_validation/automated_validation_tests/okushiri_tank_validation/test_caching_of_set_quantity.py

Timestamp:

Jun 30, 2009, 2:07:41 PM (14 years ago)

Author:

ole

Message:

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:

• anuga_validation/automated_validation_tests/okushiri_tank_validation/test_caching_of_set_quantity.py (modified) (1 diff)

anuga_validation/automated_validation_tests/okushiri_tank_validation/test_caching_of_set_quantity.py

@@ -13 +13 @@
 from anuga.fit_interpolate.fit import _fit_to_mesh
 import project
-import Numeric as num
+import numpy as num
 import time