Changeset 5120 for issm/trunk/src/c/objects/Bamg/ListofIntersectionTriangles.cpp

Timestamp:

08/10/10 13:39:21 (15 years ago)

Author:

Mathieu Morlighem

Message:

improved Bamg objects

File:

• issm/trunk/src/c/objects/Bamg/ListofIntersectionTriangles.cpp (modified) (6 diffs)

issm/trunk/src/c/objects/Bamg/ListofIntersectionTriangles.cpp

@@ -44 +44 @@
                                 double ba,bb;
                                 TriangleAdjacent edge=CloseBoundaryEdge(a,t,ba,bb);
-                                MeshVertex & v0 = *edge.EdgeVertex(0), & v1 = *edge.EdgeVertex(1);
+                                BamgVertex & v0 = *edge.EdgeVertex(0), & v1 = *edge.EdgeVertex(1);
                                 NewItem(A,Metric(ba,v0,bb,v1));
                                 t=edge;
@@ -50 +50 @@
                                 if (det(v0.i,v1.i,b)>=0) {
                                         TriangleAdjacent edge=CloseBoundaryEdge(a,t,ba,bb);
-                                        MeshVertex & v0 = *edge.EdgeVertex(0), & v1 = *edge.EdgeVertex(1);
+                                        BamgVertex & v0 = *edge.EdgeVertex(0), & v1 = *edge.EdgeVertex(1);
                                         NewItem(A,Metric(ba,v0,bb,v1));
                                         return;
@@ -80 +80 @@
                                         long int verbose=2;
                                         TriangleAdjacent edge=CloseBoundaryEdge(a,t,ba,bb);
-                                        MeshVertex & v0 = *edge.EdgeVertex(0), & v1 = *edge.EdgeVertex(1);
+                                        BamgVertex & v0 = *edge.EdgeVertex(0), & v1 = *edge.EdgeVertex(1);
                                         NewItem(A,Metric(ba,v0,bb,v1));
                                         return;
@@ -232 +232 @@
                         lIntTria[Size].x = x;
                         Metric m0,m1,m2;
-                        register MeshVertex * v;
+                        register BamgVertex * v;
                         if ((v=(*tt)(0))) m0    = v->m;
                         if ((v=(*tt)(1))) m1    = v->m;
@@ -307 +307 @@
         /*}}}1*/
         /*FUNCTION ListofIntersectionTriangles::NewPoints{{{1*/
-        long ListofIntersectionTriangles::NewPoints(MeshVertex* vertices,long &nbv,long nbvx){
+        long ListofIntersectionTriangles::NewPoints(BamgVertex* vertices,long &nbv,long maxnbv){
                 /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/NewPoints)*/
 
@@ -354 +354 @@
 
                         si += sint;
-                        if ( nbv<nbvx) {
+                        if ( nbv<maxnbv) {
                                 vertices[nbv].r = C;
                                 vertices[nbv++].m = Metric(cx,lIntTria[ii-1].m,cy,lIntTria[ii].m);