Changeset 16560 for issm/trunk/src/c/bamg/AdjacentTriangle.cpp

Timestamp:

10/28/13 14:43:03 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16554

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/bamg/AdjacentTriangle.cpp (modified) (2 diffs)

issm/trunk/src/c/bamg/AdjacentTriangle.cpp

@@ -16 +16 @@
         int  AdjacentTriangle::Locked() const {
                 return t->AdjEdgeIndex[a] & 4;
-        }
-        /*}}}*/
-        /*FUNCTION AdjacentTriangle::MarkUnSwap {{{*/
-        int  AdjacentTriangle::MarkUnSwap() const {
-                return t->AdjEdgeIndex[a] & 8;
         }
         /*}}}*/
@@ -42 +37 @@
         BamgVertex* AdjacentTriangle::EdgeVertex(const int & i) const {
                 return t->vertices[VerticesOfTriangularEdge[a][i]];
-        }
-        /*}}}*/
-        /*FUNCTION AdjacentTriangle::OppositeVertex {{{*/
-        BamgVertex* AdjacentTriangle::OppositeVertex() const {
-                return t->vertices[bamg::OppositeVertex[a]]; 
         }
         /*}}}*/