Changeset 3241

Timestamp:

03/10/10 08:36:55 (15 years ago)

Author:

Mathieu Morlighem

Message:

minor

Location:

issm/trunk/src/c/Bamgx

Files:

• meshtype.h (modified) (2 diffs)
• objects/R2.h (modified) (1 diff)
• objects/Triangles.cpp (modified) (1 diff)

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

@@ -2 +2 @@
 #define MESHTYPE_H
 
-#include "objects/R2.h"
 #include <cstdio>
 #include <cstdlib>
@@ -8 +7 @@
 #include <cmath>
 #include <ctime>
+
+#include "objects/R2.h"
+#include "../shared/shared.h"
+#include "../include/macros.h"
+#include "../toolkits/toolkits.h"
+
 
 namespace bamg {

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

@@ -1 +1 @@
 #ifndef _R2_H
 #define _R2_H
+
+#include "../../shared/shared.h"
+#include "../../include/macros.h"
+#include "../../toolkits/toolkits.h"
 
 namespace bamg {

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

@@ -5404 +5404 @@
         } // end swap 
         /*}}}1*/
-        /*FUNCTION FindTriangle{{{1*/
-        Int4 FindTriangle(Triangles &Th, Real8 x, Real8 y, double* a,int & inside){
-                I2 I = Th.toI2(R2(Min(Max(Th.pmin.x,x),Th.pmax.x),Min(Max(Th.pmin.y,y),Th.pmax.y))); 
-                Icoor2 dete[3];
-                Triangle & tb = *Th.FindTriangleContaining(I,dete);
-
-                if  (tb.link) 
-                  { // internal point in a true triangles
-                        a[0]= (Real8) dete[0]/ tb.det;
-                        a[1]= (Real8) dete[1] / tb.det;
-                        a[2] = (Real8) dete[2] / tb.det;
-                        inside = 1;      
-                        return Th.Number(tb);
-                  } 
-                else 
-                  {
-                        inside = 0; 
-                        double aa,bb;
-                        TriangleAdjacent  ta=CloseBoundaryEdgeV2(I,&tb,aa,bb);   
-                        int k = ta;
-                        Triangle * tc = ta;
-                        if (!tc->link) 
-                          { ta = ta.Adj();
-                                tc=ta;
-                                k = ta;
-                                Exchange(aa,bb);
-                                if (!tc->link){
-                                        throw ErrorException(__FUNCT__,exprintf("!tc->link"));
-                                }
-                          }
-                        a[VerticesOfTriangularEdge[k][0]] = aa;
-                        a[VerticesOfTriangularEdge[k][1]] = bb;
-                        a[OppositeVertex[k]] = 1- aa -bb;
-                        return Th.Number(tc);
-                  }
-        }
-        /*}}}1*/
         /*FUNCTION CloseBoundaryEdge{{{1*/
         TriangleAdjacent CloseBoundaryEdge(I2 A,Triangle *t, double &a,double &b) {