Changeset 291

Timestamp:

Sep 11, 2004, 12:38:07 AM (20 years ago)

Author:

ole

Message:

Cleaned up in get_vertex_values

Location:

inundation/ga/storm_surge/pyvolution

Files:

• mesh.py (modified) (2 diffs)
• quantity.py (modified) (2 diffs)

inundation/ga/storm_surge/pyvolution/mesh.py

@@ -541 +541 @@
         return vertex_coordinates
   
-    def get_vertices(unique = False):
+    def get_vertices(self, unique=False):
         """Get connectivity
         If unique is True give them only once as stored internally.
@@ -548 +548 @@
 
         if unique is True:
-            V = self.domain.vertices
+            return self.vertices
         else:
-            
-
+            from Numeric import reshape, array, Int
+                
+            m = len(self)  #Number of volumes
+            M = 3*m        #Total number of unique vertices
+            return reshape(array(range(M)).astype(Int), (m,3))
 
 #FIXME: May get rid of

inundation/ga/storm_surge/pyvolution/quantity.py

@@ -279 +279 @@
         if reduction is None:
             reduction = self.domain.reduction
-
+            
+        #Create connectivity
+        V = self.domain.get_vertices(unique=smooth)
+                        
         if smooth == True:
 
             N = len(self.domain.vertexlist)
             A = zeros(N, precision)
-            V = self.domain.get_vertices(smooth=True)
-            
+
             #Smoothing loop
             for k in range(N):
@@ -311 +313 @@
             #Don't smooth
 
-            m = len(self)  #Number of volumes
-            M = 3*m        #Total number of unique vertices
-
             A = self.vertex_values.flat
 
-            #Create connectivity
-            V = reshape(array(range(M)).astype(Int), (m,3))
-            
             #Do vertex coordinates    
             if xy is True: