Changeset 297

Timestamp:

Sep 14, 2004, 7:20:30 PM (21 years ago)

Author:

ole

Message:

Adapted original pmesh_to_domain

Location:

inundation/ga/storm_surge/pyvolution

Files:

• HUSK.txt (modified) (1 diff)
• mesh.py (modified) (2 diffs)
• netherlands.py (modified) (1 diff)
• quantity.py (modified) (1 diff)
• test_mesh.py (modified) (1 diff)
• test_quantity.py (modified) (1 diff)

inundation/ga/storm_surge/pyvolution/HUSK.txt

@@ -1 +1 @@
 
-Do datamanager for non-smooth data + tests. Smooth is OK (7/9)
+Do data manager for non-smooth data + tests. Smooth is OK (7/9)
                 
         
 Perhaps control old/new style with minimum_allowed height
-In any case get rid of oldstyle.
+In any case get rid of old style.
 Then optimise protect_against.....
         

inundation/ga/storm_surge/pyvolution/mesh.py

@@ -307 +307 @@
 
     def build_boundary_dictionary(self, boundary = None):
-        """Build or input the dictionary of boundary tags.
+        """Build or check the dictionary of boundary tags.
          self.boundary is a dictionary of tags,
          keyed by volume id and edge:
@@ -448 +448 @@
 
 
+        #Check that all vertices have been registered
+        for v in self.vertexlist:
+            msg = 'Some points do not belong to an element.\n'
+            msg += 'Make sure all points appear as element vertices!'
+            if v is None:
+                print 'WARNING (mesh.py): %s' %msg
+                break
+
+            #Should this warning be an exception?
+            #assert v is not None, msg
+
+                
         #Check integrity of neighbour structure
         for i in range(N):

inundation/ga/storm_surge/pyvolution/netherlands.py

@@ -93 +93 @@
 N = 600 #Size = 720000
 N = 220
+N = 55
 
 

inundation/ga/storm_surge/pyvolution/quantity.py

@@ -295 +295 @@
                 #Go through all triangle, vertex pairs
                 #contributing to vertex k and register vertex value
-                contributions = []                
+
+                if L is None: continue #In case there are unused points
+                
+                contributions = []
                 for volume_id, vertex_id in L:
-
                     v = self.vertex_values[volume_id, vertex_id]
                     contributions.append(v)

inundation/ga/storm_surge/pyvolution/test_mesh.py

@@ -80 +80 @@
         #General tests:
 
-        #Test that points are arranged in a counter clock wise order
+        #Test that points are arranged in a counter clock wise order etc
         mesh.check_integrity()
 

inundation/ga/storm_surge/pyvolution/test_quantity.py

@@ -26 +26 @@
         elements = [ [1,0,2], [1,2,4], [4,2,5], [3,1,4] ]
 
-        self.mesh1 = Domain(points, [elements[0]])        
+        self.mesh1 = Domain(points[:3], [elements[0]])        
         self.mesh1.check_integrity()