Changeset 5120 for issm/trunk/src/c/objects/Bamg/Triangle.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/Triangle.cpp (modified) (5 diffs)

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

@@ -11 +11 @@
         /*FUNCTION Triangle(Mesh *Th,long i,long j,long k) {{{1*/
         Triangle::Triangle(Mesh *Th,long i,long j,long k) {
-                MeshVertex *v=Th->vertices;
+                BamgVertex *v=Th->vertices;
                 long nbv = Th->nbv;
                 if (i<0 || j<0 || k<0){
@@ -27 +27 @@
         }
         /*}}}*/
-        /*FUNCTION Triangle(MeshVertex *v0,MeshVertex *v1,MeshVertex *v2) {{{1*/
-        Triangle::Triangle(MeshVertex *v0,MeshVertex *v1,MeshVertex *v2){
+        /*FUNCTION Triangle(BamgVertex *v0,BamgVertex *v1,BamgVertex *v2) {{{1*/
+        Triangle::Triangle(BamgVertex *v0,BamgVertex *v1,BamgVertex *v2){
                 TriaVertices[0]=v0;
                 TriaVertices[1]=v1;
@@ -154 +154 @@
         /*}}}1*/
         /*FUNCTION Triangle::Quadrangle {{{1*/
-        Triangle* Triangle::Quadrangle(MeshVertex * & v0,MeshVertex * & v1,MeshVertex * & v2,MeshVertex * & v3) const{
+        Triangle* Triangle::Quadrangle(BamgVertex * & v0,BamgVertex * & v1,BamgVertex * & v2,BamgVertex * & v3) const{
                 // return the other triangle of the quad if a quad or 0 if not a quat
                 Triangle * t =0;
@@ -186 +186 @@
                          q= -1;
                         else if(option){ 
-                                const MeshVertex & v2 = *TriaVertices[VerticesOfTriangularEdge[a][0]];
-                                const MeshVertex & v0 = *TriaVertices[VerticesOfTriangularEdge[a][1]];
-                                const MeshVertex & v1 = *TriaVertices[OppositeEdge[a]];
-                                const MeshVertex & v3 = * t->TriaVertices[OppositeEdge[TriaAdjSharedEdge[a]&3]];
+                                const BamgVertex & v2 = *TriaVertices[VerticesOfTriangularEdge[a][0]];
+                                const BamgVertex & v0 = *TriaVertices[VerticesOfTriangularEdge[a][1]];
+                                const BamgVertex & v1 = *TriaVertices[OppositeEdge[a]];
+                                const BamgVertex & v3 = * t->TriaVertices[OppositeEdge[TriaAdjSharedEdge[a]&3]];
                                 q =  QuadQuality(v0,v1,v2,v3); // do the float part
                         }
@@ -220 +220 @@
                 if(a2/4 !=0) return 0; // arete lock or MarkUnSwap
 
-                register MeshVertex  *sa=t1->TriaVertices[VerticesOfTriangularEdge[a1][0]];
-                register MeshVertex  *sb=t1->TriaVertices[VerticesOfTriangularEdge[a1][1]];
-                register MeshVertex  *s1=t1->TriaVertices[OppositeVertex[a1]];
-                register MeshVertex  *s2=t2->TriaVertices[OppositeVertex[a2]];
+                register BamgVertex  *sa=t1->TriaVertices[VerticesOfTriangularEdge[a1][0]];
+                register BamgVertex  *sb=t1->TriaVertices[VerticesOfTriangularEdge[a1][1]];
+                register BamgVertex  *s1=t1->TriaVertices[OppositeVertex[a1]];
+                register BamgVertex  *s2=t2->TriaVertices[OppositeVertex[a2]];
 
                 Icoor2 det1=t1->det , det2=t2->det ;