Changeset 2345

Timestamp:

Feb 7, 2006, 2:49:24 PM (18 years ago)

Author:

duncan

Message:

fixed error in building command line for generte mesh

File:

• inundation/pmesh/mesh.py (modified) (6 diffs)

inundation/pmesh/mesh.py

@@ -916 +916 @@
             self.mode = ""
         else:
-            self.mode = mode
-        
-        if not self.mode.find('p'):
+            self.mode = mode 
+        
+        if self.mode.find('p') < 0:
             self.mode += 'p' #p - read a planar straight line graph.
             #there must be segments to use this switch
             # TODO throw an aception if there aren't seg's
             # it's more comlex than this.  eg holes
-        if not self.mode.find('z'):
+        if self.mode.find('z') < 0:
             self.mode += 'z' # z - Number all items starting from zero
                              # (rather than one)
         if self.mode.find('n'):
             self.mode += 'n' # n - output a list of neighboring triangles 
-        if not self.mode.find('A'):
+        if self.mode.find('A') < 0:
             self.mode += 'A' # A - output region attribute list for triangles
 
@@ -934 +934 @@
             self.mode += 'V' # V - output info about what Triangle is doing
         
-        if not self.mode.find('q') and minAngle is not None:
+        if self.mode.find('q') < 0 and minAngle is not None:
             #   print "**********8minAngle******** ",minAngle
             min_angle = 'q' + str(minAngle)
@@ -945 +945 @@
         if isRegionalMaxAreas:
             self.mode += 'a'
-            
+         
         meshDict = self.Mesh2triangList()
-        #print "!@!@ This is going to triangle   !@!@"
+        #print "*************************!@!@ This is going to triangle   !@!@"
         #print meshDict
-        #print "!@!@ This is going to triangle   !@!@"
+        #print "************************!@!@ This is going to triangle   !@!@"
 
         #print "meshDict['segmenttaglist']", meshDict['segmenttaglist']
@@ -958 +958 @@
         [meshDict['regionlist'],
          regionconverter] =  region_strings2ints(meshDict['regionlist'])
-        #print "regionlist",meshDict['regionlist']
+        #print "%%%%%%%%%%%%%%%%%%%%%%%%%%%regionlist",meshDict['regionlist']
         #print "meshDict['segmenttaglist']", meshDict['segmenttaglist'
         generatedMesh = triang.genMesh(
@@ -969 +969 @@
                               [],  # since the trianglelist isn't used
                               self.mode)
-        #print "generated",generatedMesh
+        #print "%%%%%%%%%%%%%%%%%%%%%%%%%%%generated",generatedMesh
         generatedMesh['generatedsegmentmarkerlist'] = \
              segment_ints2strings(generatedMesh['generatedsegmentmarkerlist'],
@@ -983 +983 @@
         generatedMesh['generatedpointattributetitlelist']= \
                                             self.attributeTitles
-
+        #print "################  FROM TRIANGLE"
+        #print "generatedMesh",generatedMesh
+        #print "##################"
+        
         self.setTriangulation(generatedMesh)