Changeset 2778

Timestamp:

Apr 27, 2006, 3:44:41 PM (19 years ago)

Author:

steve

Message:

On our 64 bit machine, ran into problem in pmesh/mesh.py where seg[0], seg[1], triangle,
and neighbor where not seen as integers. Had to wrap them in int(..)

Files:

• inundation/pmesh/mesh.py (modified) (9 diffs)
• inundation/pmesh/test_mesh.py (modified) (1 diff)
• inundation/pypar_dist/compile.py (modified) (2 diffs)
• inundation/pypar_dist/setup.py (modified) (1 diff)
• inundation/pyvolution/general_mesh.py (modified) (4 diffs)
• inundation/pyvolution/least_squares.py (modified) (5 diffs)
• inundation/pyvolution/mesh.py (modified) (1 diff)
• inundation/pyvolution/shallow_water_vtk.py (modified) (2 diffs)
• inundation/pyvolution/test_least_squares.py (modified) (2 diffs)
• inundation/utilities/compile.py (modified) (2 diffs)
• inundation/utilities/numerical_tools.py (modified) (1 diff)
• inundation/utilities/test_numerical_tools.py (modified) (1 diff)
• production/merimbula_2005/project.pyc (modified) (previous)

inundation/pmesh/mesh.py

@@ -840 +840 @@
         for seg,seg_tag in map(None,outlineDict['segments'],
                        outlineDict['segment_tags']):
-            segObject = Segment( localUserVertices[seg[0]],
-                           localUserVertices[seg[1]] )
+            segObject = Segment( localUserVertices[int(seg[0])],
+                           localUserVertices[int(seg[1])] )
             if not seg_tag == '':
                 segObject.set_tag(seg_tag)
@@ -1331 +1331 @@
         for seg,marker in map(None,genDict['generatedsegmentlist'],
                               genDict['generatedsegmentmarkerlist']):
-            segObject = Segment( self.meshVertices[seg[0]],
-                           self.meshVertices[seg[1]], tag = marker )
+            segObject = Segment( self.meshVertices[int(seg[0])],
+                           self.meshVertices[int(seg[1])], tag = marker )
             segObject.index = index
             index +=1
@@ -1339 +1339 @@
         index = 0
         for triangle in genDict['generatedtrianglelist']:
-            tObject =Triangle( self.meshVertices[triangle[0]],
-                        self.meshVertices[triangle[1]],
-                        self.meshVertices[triangle[2]] )
+            tObject =Triangle( self.meshVertices[int(triangle[0])],
+                        self.meshVertices[int(triangle[1])],
+                        self.meshVertices[int(triangle[2])] )
             tObject.index = index
             index +=1
@@ -1368 +1368 @@
             for neighbor in triangle:
                 if ( neighbor != -1):
-                    ObjectNeighbor.append(self.meshTriangles[neighbor])
+                    ObjectNeighbor.append(self.meshTriangles[int(neighbor)])
                 else:
                     ObjectNeighbor.append(None)
@@ -1410 +1410 @@
         for seg,tag in map(None,genDict['segmentlist'],
                            genDict['segmenttaglist']):
-            segObject = Segment( self.userVertices[seg[0]],
-                           self.userVertices[seg[1]], tag = tag )
+            segObject = Segment( self.userVertices[int(seg[0])],
+                           self.userVertices[int(seg[1])], tag = tag )
             #segObject.index = index
             #index +=1
@@ -2143 +2143 @@
         index = 0
         for seg,tag in map(None,genDict['segments'],genDict['segment_tags']):
-            segObject = Segment( self.meshVertices[seg[0]],
-                           self.meshVertices[seg[1]], tag = tag )
+            segObject = Segment( self.meshVertices[int(seg[0])],
+                           self.meshVertices[int(seg[1])], tag = tag )
             segObject.index = index
             index +=1
@@ -2151 +2151 @@
         index = 0
         for triangle in genDict['triangles']:
-            tObject =Triangle( self.meshVertices[triangle[0]],
-                        self.meshVertices[triangle[1]],
-                        self.meshVertices[triangle[2]] )
+            tObject =Triangle( self.meshVertices[int(triangle[0])],
+                        self.meshVertices[int(triangle[1])],
+                        self.meshVertices[int(triangle[2])] )
             tObject.index = index
             index +=1
@@ -2180 +2180 @@
             for neighbor in triangle:
                 if ( neighbor != -1):
-                    ObjectNeighbor.append(self.meshTriangles[neighbor])
+                    ObjectNeighbor.append(self.meshTriangles[int(neighbor)])
                 else:
                     ObjectNeighbor.append(None)
@@ -2215 +2215 @@
         for seg,tag in map(None,genDict['outline_segments'],
                            genDict['outline_segment_tags']):
-            segObject = Segment( self.userVertices[seg[0]],
-                           self.userVertices[seg[1]], tag = tag )
+
+            segObject = Segment( self.userVertices[int(seg[0])],
+                           self.userVertices[int(seg[1])], tag = tag )
             #segObject.index = index
             #index +=1

inundation/pmesh/test_mesh.py

@@ -1915 +1915 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    suite = unittest.makeSuite(meshTestCase,'test')
-    #suite = unittest.makeSuite(meshTestCase,'test_asciiFile')
+    #suite = unittest.makeSuite(meshTestCase,'test')
+    suite = unittest.makeSuite(meshTestCase,'test_import_mesh')
     runner = unittest.TextTestRunner() #verbosity=2)
     runner.run(suite)

inundation/pypar_dist/compile.py

@@ -149 +149 @@
     if os.name == 'posix' and os.uname()[4] == 'x86_64':
       #Extra flags for 64 bit architectures
-      #s += ' -fPIC -m64' #gcc
-      s += ' -fPIC -tp amd64' #pgcc
+      s += ' -fPIC -m64' #gcc
+      #s += ' -fPIC -tp amd64' #pgcc
       
     
@@ -169 +169 @@
   if os.name == 'posix' and os.uname()[4] == 'x86_64':
       #Extra flags for 64 bit architectures using Portland compilers
-      s += ' -mcmodel=medium'
+      #s += ' -mcmodel=medium'
   
   if verbose:

inundation/pypar_dist/setup.py

@@ -86 +86 @@
 def get_mpi_flags():
     output = _get_mpi_cmd()
+    print output
     if not output:
         if sys.platform=='win32': #From Simon Frost

inundation/pyvolution/general_mesh.py

@@ -63 +63 @@
         """
 
-        from Numeric import array, zeros, Int, Float, maximum, sqrt, sum
-
-        self.triangles = array(triangles).astype(Int)
-        self.coordinates = array(coordinates)
+        from Numeric import array, zeros, Int, Float, sqrt, sum
+
+        self.triangles = array(triangles,Int)
+        self.coordinates = array(coordinates,Float)
+        
 
         # FIXME: this stores a geo_reference, but when coords are returned
@@ -90 +91 @@
 
         #FIXME: Maybe move to statistics?
+
         xy_extent = [ min(self.coordinates[:,0]), min(self.coordinates[:,1]) ,
                       max(self.coordinates[:,0]), max(self.coordinates[:,1]) ]
@@ -103 +105 @@
         #Get x,y coordinates for all triangles and store
         self.vertex_coordinates = V = self.compute_vertex_coordinates()
+
 
         #Initialise each triangle
@@ -152 +155 @@
             self.edgelengths[i, :] = [l0, l1, l2]
 
+        
         #Build vertex list
         self.build_vertexlist()

inundation/pyvolution/least_squares.py

@@ -24 +24 @@
 
 #from general_mesh import General_mesh
-from Numeric import zeros, array, Float, Int, dot, transpose, concatenate, ArrayType, NewAxis
+from Numeric import zeros, array, Float, Int, transpose, concatenate, ArrayType, NewAxis
 from pyvolution.mesh import Mesh
 
-from Numeric import zeros, take, compress, array, Float, Int, dot, transpose, concatenate, ArrayType
+from Numeric import dot, zeros, take, compress, array, Float, Int, transpose, concatenate, ArrayType
 from utilities.sparse import Sparse, Sparse_CSR
 from utilities.cg_solve import conjugate_gradient, VectorShapeError
@@ -36 +36 @@
 
 import time
-
-
 
 DEFAULT_ALPHA = 0.001
@@ -437 +435 @@
         else:
             geo = Geo_reference(mesh_origin[0],mesh_origin[1],mesh_origin[2])
+
+                
         self.mesh = Mesh(vertex_coordinates, triangles,
                          geo_reference = geo)
@@ -653 +653 @@
             is_more_elements = True
 
+
             element_found, sigma0, sigma1, sigma2, k = \
-                self.search_triangles_of_vertices(candidate_vertices, x)
+                           self.search_triangles_of_vertices(candidate_vertices, x)
             first_expansion = True
             while not element_found and is_more_elements and expand_search:
@@ -702 +703 @@
 
     def search_triangles_of_vertices(self, candidate_vertices, x):
+
+            
             #Find triangle containing x:
             element_found = False

inundation/pyvolution/mesh.py

@@ -73 +73 @@
         from Numeric import array, zeros, Int, Float, maximum, sqrt, sum
 
+        
         General_mesh.__init__(self, coordinates, triangles, geo_reference)
 

inundation/pyvolution/shallow_water_vtk.py

@@ -48 +48 @@
 
 
-    def evolve(self, yieldstep = None, finaltime = None,
+    def evolve(self,
+               yieldstep = None,
+               finaltime = None,
+               duration = None,
                skip_initial_step = False):
         """Specialisation of basic evolve method from parent class
@@ -87 +90 @@
 
         #Call basic machinery from parent class
-        for t in Generic_Domain.evolve(self, yieldstep, finaltime,
-                                       skip_initial_step):
+        for t in Generic_Domain.evolve(self,
+                                       yieldstep=yieldstep,
+                                       finaltime = finaltime,
+                                       duration = duration,
+                                       skip_initial_step = skip_initial_step):
             #Real time viz
             if self.visualise is True:

inundation/pyvolution/test_least_squares.py

@@ -37 +37 @@
         data = [ [2.0/3, 2.0/3] ] #Use centroid as one data point
 
+        
         interp = Interpolation(points, vertices, data)
         assert allclose(interp.get_A(), [[1./3, 1./3, 1./3]])
@@ -1919 +1920 @@
 if __name__ == "__main__":
     #suite = unittest.makeSuite(Test_Least_Squares,'test_smooth_attributes_to_mesh_function')
+    #suite = unittest.makeSuite(Test_Least_Squares,'test_datapoint_at_centroid')
     suite = unittest.makeSuite(Test_Least_Squares,'test')
 

inundation/utilities/compile.py

@@ -179 +179 @@
   utilities_include_dir = None
   for pathdir in sys.path:
+
     utilities_include_dir = pathdir + os.sep + 'utilities'
-
+    #print pathdir
+    #print utilities_include_dir
     try:
       os.stat(utilities_include_dir)
@@ -188 +190 @@
       #print 'Found %s to be used as include dir' %utilities_include_dir
       break
-
      
 

inundation/utilities/numerical_tools.py

@@ -197 +197 @@
                 return array(A)  #FIXME: Shouldn't this just return A?
             else:
-                return A.astype(typecode)
+                return array(A,typecode)
         else:
-            return array(A).astype(typecode)
+            return array(A,typecode)
 
 

inundation/utilities/test_numerical_tools.py

@@ -5 +5 @@
 from Numeric import zeros, array, allclose
 from math import sqrt, pi
-from pyvolution.config import epsilon
+from config import epsilon
 
 from numerical_tools import *