Changeset 714 for inundation/ga/storm_surge

Timestamp:

Dec 22, 2004, 2:17:36 PM (20 years ago)

Author:

duncan

Message:

changed default external boundary from external to exterior

Location:

inundation/ga/storm_surge/pmesh

Files:

• mesh.py (modified) (2 diffs)
• meshHarness.py (modified) (3 diffs)

inundation/ga/storm_surge/pmesh/mesh.py

@@ -27 +27 @@
 
 # 1st and third values must be the same
-#initialconversions = ['internal', 'external','internal']
 # FIXME: maybe make this a switch that the user can change? - DSG
-initialconversions = ['', 'external','']
+initialconversions = ['', 'exterior','']
 
 #from os import sep
@@ -477 +476 @@
 
         #print "meshDict['segmentmarkerlist']", meshDict['segmentmarkerlist']
-        #initialconversions = ['internal boundary', 'external boundary','internal boundary']
         [meshDict['segmentmarkerlist'],
          segconverter] =  segment_strings2ints(meshDict['segmentmarkerlist'],

inundation/ga/storm_surge/pmesh/meshHarness.py

@@ -453 +453 @@
 
         seg = m.getMeshSegments()
-        self.failUnless(seg[0].marker == "external" and
-                        seg[1].marker == "external" and
-                        seg[2].marker == "external" and
+        self.failUnless(seg[0].marker == "exterior" and
+                        seg[1].marker == "exterior" and
+                        seg[2].marker == "exterior" and
                         seg[3].marker == "" and
-                        seg[4].marker == "external",
+                        seg[4].marker == "exterior",
                         '2nd seg markers are wrong')
 
@@ -513 +513 @@
 
         self.failUnless(lFile[12] == "5 # <segment #> <vertex #>  <vertex #> [boundary marker] ...Triangulation Segments..." and
-                        lFile[13] == "0 0 1 external" and
-                        lFile[14] == "1 1 4 external" and
-                        lFile[15] == "2 2 0 external" and
+                        lFile[13] == "0 0 1 exterior" and
+                        lFile[14] == "1 1 4 exterior" and
+                        lFile[15] == "2 2 0 exterior" and
                         lFile[16] == "3 0 3 " and
-                        lFile[17] == "4 4 2 external" ,
+                        lFile[17] == "4 4 2 exterior" ,
                         'Ascii file is wrong, segment')
         
@@ -593 +593 @@
 
         self.failUnless(lFile[12] == "5 # <segment #> <vertex #>  <vertex #> [boundary marker] ...Triangulation Segments..." and
-                        lFile[13] == "0 0 1 external" and
-                        lFile[14] == "1 1 4 external" and
-                        lFile[15] == "2 2 0 external" and
+                        lFile[13] == "0 0 1 exterior" and
+                        lFile[14] == "1 1 4 exterior" and
+                        lFile[15] == "2 2 0 exterior" and
                         lFile[16] == "3 0 3 " and
-                        lFile[17] == "4 4 2 external" ,
+                        lFile[17] == "4 4 2 exterior" ,
                         'Ascii file is wrong, segment')