Changeset 5920

Timestamp:

Nov 6, 2008, 5:58:48 PM (17 years ago)

Author:

ole

Message:

Fixed up code for Itanium 64 bit.
All tests pass except for the CRC checksum calculation

Location:

anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/domain.py (modified) (1 diff)
• shallow_water/shallow_water_domain.py (modified) (1 diff)
• shallow_water/test_data_manager.py (modified) (1 diff)

anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py

@@ -1634 +1634 @@
     except:
         import os
-        if os.name == 'posix' and os.uname()[4] == 'x86_64':
+        if os.name == 'posix' and os.uname()[4] in ['x86_64', 'ia64']:
             pass
             # Psyco isn't supported on 64 bit systems, but it doesn't matter

anuga_core/source/anuga/shallow_water/shallow_water_domain.py

@@ -2083 +2083 @@
     except:
         import os
-        if os.name == 'posix' and os.uname()[4] == 'x86_64':
+        if os.name == 'posix' and os.uname()[4] in ['x86_64', 'ia64']:
             pass
             #Psyco isn't supported on 64 bit systems, but it doesn't matter

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -2083 +2083 @@
         for i, line in enumerate(lines[6:]):
             for j, value in enumerate( line.split() ):
-                #assert allclose(float(value), -(10-i+j)*cellsize)
-                assert float(value) == -(10-i+j)*cellsize
+                assert allclose(float(value), -(10-i+j)*cellsize,
+                                atol=1.0e-12, rtol=1.0e-12)
+
+                # Note: Equality can be obtained in this case,
+                # but it is better to use allclose.
+                #assert float(value) == -(10-i+j)*cellsize