Changeset 1036

Timestamp:

Mar 8, 2005, 12:33:03 PM (20 years ago)

Author:

ole

Message:

Removed warning about psyco on 64 bit platforms

Location:

inundation/ga/storm_surge/pyvolution

Files:

• domain.py (modified) (1 diff)
• shallow_water.py (modified) (1 diff)

inundation/ga/storm_surge/pyvolution/domain.py

@@ -583 +583 @@
         import psyco
     except:
-        msg = 'WARNING: psyco (speedup) could not import'+\
-              ', you may want to consider installing it'
-        print msg
+        import os
+        if os.uname()[4] == 'x86_64':
+            pass
+            #Psyco isn't supported on 64 bit systems, but it doesn't matter
+        else:
+            msg = 'WARNING: psyco (speedup) could not import'+\
+                  ', you may want to consider installing it'
+            print msg
     else:
         psyco.bind(Domain.update_boundary)

inundation/ga/storm_surge/pyvolution/shallow_water.py

@@ -1621 +1621 @@
         import psyco
     except:
-        msg = 'WARNING: psyco (speedup) could not import'+\
-              ', you may want to consider installing it'
-        print msg
+        import os
+        if os.uname()[4] == 'x86_64':
+            pass
+            #Psyco isn't supported on 64 bit systems, but it doesn't matter
+        else:
+            msg = 'WARNING: psyco (speedup) could not import'+\
+                  ', you may want to consider installing it'
+            print msg
     else:
         psyco.bind(Domain.distribute_to_vertices_and_edges)