Changeset 1632 for inundation/ga/storm_surge/pyvolution/general_mesh.py

Timestamp:

Jul 22, 2005, 5:59:19 PM (20 years ago)

Author:

ole

Message:

Interpolation work and some refactoring

File:

• inundation/ga/storm_surge/pyvolution/general_mesh.py (modified) (4 diffs)

inundation/ga/storm_surge/pyvolution/general_mesh.py

@@ -173 +173 @@
 
 
-    def get_vertex_coordinates(self):
+    def get_vertex_coordinates(self, obj = False):
         """Return all vertex coordinates.
         Return all vertex coordinates for all triangles as an Nx6 array
         (ordered as x0, y0, x1, y1, x2, y2 for each triangle)
-        """
-        return self.vertex_coordinates
+
+        if obj is True, the x/y pairs are returned in a 3*N x 2 array.
+        FIXME, we might make that the default.
+
+        
+        """
+
+        if obj is True:
+            from Numeric import concatenate, reshape
+            V = self.vertex_coordinates
+            #return concatenate( (V[:,0:2], V[:,2:4], V[:,4:6]), axis=0)
+
+            N = V.shape[0]
+            return reshape(V, (3*N, 2))
+        else:    
+            return self.vertex_coordinates
 
 
@@ -193 +207 @@
         """
 
-        #FIXME: Perhaps they should be ordered as in obj files??
+        #FIXME (Ole): Perhaps they should be ordered as in obj files??
         #See quantity.get_vertex_values
+        #FIXME (Ole) - oh yes they should
 
         from Numeric import zeros, Float
@@ -210 +225 @@
         return vertex_coordinates
 
-    def get_vertices(self,  indexes=None):
+    def get_vertices(self, indexes=None):
         """Get connectivity
         indexes is the set of element ids of interest
@@ -221 +236 @@
 
         return  take(self.triangles, indexes)
+
+    #FIXME - merge these two
+    def get_triangles(self, obj = False):
+        """Get connetivity
+        Return triangles (triplets of indices into point coordinates)
+        
+        """
+
+        if obj is True:
+            from Numeric import array, reshape, Int        
+            m = len(self)  #Number of triangles
+            M = 3*m        #Total number of unique vertices
+            T = reshape(array(range(M)).astype(Int), (m,3))
+        else:
+            T = self.triangles
+
+        return T     
+
+    
 
     def get_unique_vertices(self,  indexes=None):