Changeset 3236

Timestamp:

03/09/10 15:23:47 (15 years ago)

Author:

Mathieu Morlighem

Message:

minor

Location:

issm/trunk/src/c/Bamgx

Files:

• BamgObjects.h (modified) (4 diffs)
• objects/CrackedEdge.h (modified) (1 diff)
• objects/Vertex.cpp (modified) (1 diff)
• objects/Vertex.h (modified) (1 diff)
• shared/TheVertex.h (added)
• shared/shared.h (modified) (1 diff)
• shared/swap.h (modified) (1 diff)

issm/trunk/src/c/Bamgx/BamgObjects.h

@@ -28 +28 @@
 #include "objects/Triangles.h"
 #include "objects/Geometry.h"
+
+#include "shared/shared.h"
 
 namespace bamg {
@@ -160 +162 @@
                 return TriangleAdjacent(0,0);//for compiler
         }
-        inline Vertex* TheVertex(Vertex * a){
-                // give a unique vertex with smallest number
-                // in case on crack in mesh 
-                Vertex * r(a), *rr;
-                Triangle * t = a->t;
-                int i = a->vint;
-                TriangleAdjacent ta(t,EdgesVertexTriangle[i][0]); // Previous edge
-                if (!t || i<0 || i>=3){
-                        throw ErrorException(__FUNCT__,exprintf("!t || i<0 !! i>=3"));
-                }
-                if ( a!=(*t)(i)){
-                        throw ErrorException(__FUNCT__,exprintf("a!=(*t)(i)"));
-                }
-                int k=0;
-                do { // turn around vertex in direct sens (trigo)
-                        k++;
-                        if (k>=20000){
-                                throw ErrorException(__FUNCT__,exprintf("k>=20000"));
-                        }
-                        //  in no crack => ta.EdgeVertex(1) == a
-                        if ((rr=ta.EdgeVertex(0)) < r) r = rr;
-                        ta = ta.Adj();
-                        if ((rr=ta.EdgeVertex(1)) < r) r =rr;
-                        --ta;
-                } while (t != (Triangle*) ta);  
-                return r;
-        }
-
         /*}}}1*/
 
@@ -271 +245 @@
                         else if (TriaAdjSharedEdge[0] & 16 || TriaAdjSharedEdge[1] & 16  || TriaAdjSharedEdge[2] & 16 || t->TriaAdjSharedEdge[0] & 16 || t->TriaAdjSharedEdge[1] & 16 || t->TriaAdjSharedEdge[2] & 16 )
                          q= -1;
-                        else if(option) 
-                          { 
+                        else if(option){ 
                                 const Vertex & v2 = *TriaVertices[VerticesOfTriangularEdge[a][0]];
                                 const Vertex & v0 = *TriaVertices[VerticesOfTriangularEdge[a][1]];
@@ -278 +251 @@
                                 const Vertex & v3 = * t->TriaVertices[OppositeEdge[TriaAdjSharedEdge[a]&3]];
                                 q =  QuadQuality(v0,v1,v2,v3); // do the float part
-                          }
+                        }
                         else q= 1;
                 }

issm/trunk/src/c/Bamgx/objects/CrackedEdge.h

@@ -12 +12 @@
 #include "Edge.h"
 #include "Triangle.h"
+#include "../shared/TheVertex.h"
 
 namespace bamg {

issm/trunk/src/c/Bamgx/objects/Vertex.cpp

@@ -92 +92 @@
                                                 Real8 qold =QuadQuality(*v0,*v1,*v2,*v3);
                                                 vP = vPnew;
-                                                Real8 qnew = QuadQuality(*v0,*v1,*v2,*v3);
+                                                Real8 qnew =QuadQuality(*v0,*v1,*v2,*v3);
                                                 if (qnew<qold) ok = 1;
                                           }

issm/trunk/src/c/Bamgx/objects/Vertex.h

@@ -52 +52 @@
                         inline Int4 Optim(int =1,int =0); 
                         inline void Set(const Vertex & rec,const Triangles &,Triangles &);
-
-
         };
 
         //FOR NOW (WARNING)
-        inline Vertex* TheVertex(Vertex * a); // for remove crak in mesh 
         double QuadQuality(const Vertex &,const Vertex &,const Vertex &,const Vertex &);
 }

issm/trunk/src/c/Bamgx/shared/shared.h

@@ -15 +15 @@
 #include "SwapForForcingEdge.h"
 #include "swap.h"
+#include "TheVertex.h"
 
 #endif

issm/trunk/src/c/Bamgx/shared/swap.h

@@ -13 +13 @@
 namespace bamg {
 
-        //class Vertex;
-        //class Triangle;
-
         void  swap(Triangle *t1,Int1 a1, Triangle *t2,Int1 a2, Vertex *s1,Vertex *s2,Icoor2 det1,Icoor2 det2);