Changeset 4449

Timestamp:

May 16, 2007, 11:53:35 AM (18 years ago)

Author:

duncan

Message:

Getting triangle to automatically remove lone vertices

Location:

anuga_core/source/anuga/mesh_engine

Files:

• mesh_engine.py (modified) (1 diff)
• test_generate_mesh.py (modified) (5 diffs)

anuga_core/source/anuga/mesh_engine/mesh_engine.py

@@ -102 +102 @@
         segment array."""
         raise ANUGAError, msg
+
+    
+    #print "mode", mode
+    if mode.find('n'):
+        mode = 'j' + mode
+        # j- Jettisons vertices that are not part of the final
+        #    triangulation from the output .node file (including duplicate
+        #    input vertices and vertices ``eaten'' by holes).  - output a
+        #    list of neighboring triangles
+            
     #print "points",points 
     #print "segments", segments

anuga_core/source/anuga/mesh_engine/test_generate_mesh.py

@@ -1 +1 @@
 #!/usr/bin/env python
 #
-
+"""
+I removed lone test vert's, since I'm working on removing lone verts at a lower
+level of the code, using the -j flag in triangle.
+"""
 import sys
 
@@ -407 +410 @@
                         'lonepointlist is wrong!')
 
-    def test_lone_vertsII(self):
+    def dont_test_lone_vertsII(self):
 
         points = []
@@ -443 +446 @@
                         'lonepointlist is wrong!')
 
-    def test_lone_vertsIII(self):
+    def dont_test_lone_vertsIII(self):
 
         points = []
@@ -494 +497 @@
                         'lonepointlist is wrong!')
         
-    def test_lone_verts4(self):
+    def dont_test_lone_verts4(self):
         points = []
         seglist = []
@@ -510 +513 @@
         #print "data['generatedtrianglelist']", data['generatedtrianglelist']
         #self.failUnless(data['generatedtrianglelist'] ==[(4, 0, 2),(2, 3, 4)],
-         #               'trianglelist is wrong!')
+        #               'trianglelist is wrong!')
+        print "seglist", seglist
+        print "data['generatedsegmentlist']", data['generatedsegmentlist']
+        print "points", points
+        print "data['generatedpointlist'] ",data['generatedpointlist'] 
+        print "points", points
         self.failUnless(data['generatedsegmentlist'] ==seglist,
                         'segmentlist is wrong!')