Changeset 2154

Timestamp:

Dec 19, 2005, 3:27:46 PM (18 years ago)

Author:

ole

Message:

Made boundary ordering unique in File_boundary

Location:

inundation/pyvolution

Files:

• generic_boundary_conditions.py (modified) (1 diff)
• test_generic_boundary_conditions.py (modified) (1 diff)

inundation/pyvolution/generic_boundary_conditions.py

@@ -202 +202 @@
         
 
-        #Record ordering #FIXME: should this happen in domain.py?
+        #Make ordering unique #FIXME: should this happen in domain.py?
+        boundary_keys.sort()
+
+
+        #Record ordering #FIXME: should this also happen in domain.py?
         self.boundary_indices = {}
-
         for i, (vol_id, edge_id) in enumerate(boundary_keys):
 

inundation/pyvolution/test_generic_boundary_conditions.py

@@ -164 +164 @@
 
 
+        
+
         #Check that midpoint coordinates at boundary are correctly computed
         assert allclose( F.midpoint_coordinates,
-                         [[0.0, 3.0], [1.0, 3.0], [0.0, 1.0],
-                         [1.0, 0.0], [3.0, 0.0], [3.0, 1.0]])
+                         [[1.0, 0.0], [0.0, 1.0], [3.0, 0.0],
+                          [3.0, 1.0], [1.0, 3.0], [0.0, 3.0]])
 
         #assert allclose(F.midpoint_coordinates[(3,2)], [0.0, 3.0])