Changeset 5673

Timestamp:

Aug 22, 2008, 11:56:30 AM (16 years ago)

Author:

duncan

Message:

update to add_points_and_segments

Location:

anuga_core

Files:

• documentation/user_manual/anuga_user_manual.tex (modified) (5 diffs)
• source/anuga/pmesh/mesh.py (modified) (2 diffs)
• source/anuga/pmesh/test_mesh.py (modified) (4 diffs)

anuga_core/documentation/user_manual/anuga_user_manual.tex

@@ -1468 +1468 @@
 
 
-The variables \code{points}, \code{vertices} and \code{boundary}
+The variables \code{points}, \code{triangles} and \code{boundary}
 represent the data displayed in Figure \ref{fig:simplemesh} as
 follows. The list \code{points} stores the coordinates of the
@@ -1498 +1498 @@
 \end{table}
 
-The list \code{vertices} specifies the triangles that make up the
+The list \code{triangles} specifies the triangles that make up the
 mesh. It does this by specifying, for each triangle, the indices
 (the numbers shown in the first column above) that correspond to the
-three points at its vertices, taken in an anti-clockwise order
+three points at the triangles vertices, taken in an anti-clockwise order
 around the triangle. Thus, in the example shown in Figure
-\ref{fig:simplemesh}, the variable \code{vertices} contains the
-entries shown in Table \ref{tab:vertices}. The starting point is
+\ref{fig:simplemesh}, the variable \code{triangles} contains the
+entries shown in Table \ref{tab:triangles}. The starting point is
 arbitrary so triangle $(0,1,3)$ is considered the same as $(1,3,0)$
 and $(3,0,1)$.
@@ -1512 +1512 @@
   \begin{center}
     \begin{tabular}{|c|ccc|} \hline
-      index & \multicolumn{3}{c|}{\code{vertices}}\\ \hline
+      index & \multicolumn{3}{c|}{\code{points}}\\ \hline
       0 & 0 & 1 & 3\\
       1 & 1 & 2 & 4\\
@@ -1526 +1526 @@
   \end{center}
 
-  \caption{Vertices for mesh in Figure \protect \ref{fig:simplemesh}}
-  \label{tab:vertices}
+  \caption{Triangles for mesh in Figure \protect \ref{fig:simplemesh}}
+  \label{tab:triangles}
 \end{table}
 
@@ -1626 +1626 @@
 
 This method is used to build the mesh outline. It adds points and
-segments connecting the points.  A tag for each segment can optionally
-be added.
+segments connecting the points.  Points is a list of points. Segments
+is a list of segments.  Each segment is defined by the start and end
+of the line by it's point index, e.g. use \code{segments =
+[[0,1],[1,2]]} to make a polyline between points 0, 1 and 2. A tag for
+each segment can optionally be added.
 
 \end{methoddesc}

anuga_core/source/anuga/pmesh/mesh.py

@@ -872 +872 @@
 
     def add_points_and_segments(self, points,
-                                  segments, segment_tags = None):
+                                  segments=None, segment_tags = None):
         """
         Add an outline of the mesh.
-        Vertices is a list of points/ a standard representation of points.
+        Points is a list of points a standard representation of points.
         Segments is a list of tuples of integers.  Each tuple defines the
-           start and end of the segment by it's vertex index, in relation to
-           the list of vertices.
+           start and end of the segment by it's point index.
         segment_tags is an optional dictionary which is used to add tags to
            the segments.  The key is the tag name, value is the list of segment
@@ -887 +886 @@
         #make sure the points are absolute
         points = ensure_absolute(points)
-        
+
+        if segments is None:
+            segments = []
+            for i in range(len(points)-1):
+                segments.append([i, i+1])
+            
         #create points, segs and tags
         region_dict = {}

anuga_core/source/anuga/pmesh/test_mesh.py

@@ -1500 +1500 @@
         points =  [[0.0, 0.0], [1.0, 0.0], [1.0, 1.0]]
         segments = [[0, 1], [1, 2]]
-        segment_tags = {'do-op':[1]}
+        segment_tags = {'hair':[1]}
         m.add_points_and_segments(points,
                                     segments, segment_tags)
@@ -1513 +1513 @@
         self.failUnless(m.userSegments[0].tag =='food',
                         'Wrong segment tag length.')
-        self.failUnless(m.userSegments[1].tag =='do-op',
+        self.failUnless(m.userSegments[1].tag =='hair',
+                        'Wrong segment tag.')
+        
+    def test_add_points_and_segmentsII(self):
+        m = Mesh()
+        Segment.set_default_tag("food")
+        dict = {}
+        points =  [[0.0, 0.0], [1.0, 0.0], [1.0, 1.0]]
+        segments = None #[[0, 1], [1, 2]]
+        segment_tags = {'hair':[1]}
+        m.add_points_and_segments(points,
+                                    segments, segment_tags)
+        # have to reset this , since it's a class attribute
+        Segment.set_default_tag("")
+
+        
+        self.failUnless(len(m.userSegments) ==2,
+                        'Wrong segment list length.')
+        self.failUnless(len(m.userVertices) == 3,
+                        'Wrong vertex list length.')
+        self.failUnless(m.userSegments[0].tag =='food',
+                        'Wrong segment tag length.')
+        self.failUnless(m.userSegments[1].tag =='hair',
                         'Wrong segment tag.')
         
@@ -1842 +1864 @@
          
         self.failUnless(segs[2].tag=='bom',
-                        'FAILED!') 
+                        'FAILED!')
         self.failUnless(segs[3].tag=='',
                         'FAILED!') 
@@ -2287 +2309 @@
     #suite = unittest.makeSuite(meshTestCase,'test_asciiFile')
     #suite = unittest.makeSuite(meshTestCase,'test_mesh2IO')
-    #suite = unittest.makeSuite(meshTestCase,'test_import_ungenerate_file')
+    #suite = unittest.makeSuite(meshTestCase,'test_add_points_and_segmentsII')
     runner = unittest.TextTestRunner() #verbosity=2)
     runner.run(suite)