Changeset 12934

Timestamp:

08/07/12 13:44:19 (13 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removed MaxICoor22, which was only used by CloseBoundaryEdgeV2, which is in turn never used

Location:

issm/trunk-jpl/src/c/classes/bamg

Files:

• Mesh.cpp (modified) (1 diff)
• Mesh.h (modified) (1 diff)
• macros.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/bamg/Mesh.cpp

@@ -5644 +5644 @@
         }
         /*}}}*/
-        /*FUNCTION CloseBoundaryEdgeV2{{{*/
-        AdjacentTriangle CloseBoundaryEdgeV2(I2 C,Triangle *t, double &a,double &b) { 
-                /*Original code from Frederic Hecht <hecht@ann.jussieu.fr> (BAMG v1.01, Mesh2.cpp/CloseBoundaryEdgeV2)*/
-                // walk around the vertex 
-                // version 2 for remove the probleme if we fill the hole
-                //int bug=1;
-                //  Triangle *torigine = t;
-                // restart:
-                //   int dir=0;
-                if (t->link != 0){
-                        _error2_("t->link != 0");
-                }
-                // to have a starting edges 
-                // try the 3 edge bourna-- in case of internal hole 
-                // and choice  the best 
-                // 
-                // the probleme is in case of  the fine and long internal hole
-                // for exemple neart the training edge of a wing
-                BamgVertex * s=0,*s1=0, *s0=0;
-                Icoor2 imax = MaxICoor22;
-                Icoor2 l0 = imax,l1 = imax;
-                double dd2 =  imax;// infinity
-                AdjacentTriangle er; 
-                int  cas=-2;
-                for (int j=0;j<3;j++)
-                  { 
-                        AdjacentTriangle ta=t->FindBoundaryEdge(j);
-                        if  (! (Triangle *) ta) continue;
-                        s0 = ta.EdgeVertex(0);
-                        s1 = ta.EdgeVertex(1);
-                        I2 A = * s0;
-                        I2 B = *ta.EdgeVertex(1);
-                        I2 AB = B-A,AC=C-A,BC=B-C;
-                        Icoor2  ACAC = (AC,AC), BCBC = (BC,BC);
-                        Icoor2  AB2  =   Norme2_2(AB); //  ||AB||^2
-                        Icoor2  ABAC  =   (AB,AC);         //  AB.AC|
-
-                        double d2;
-                        if ( ABAC < 0 )   // DIST A
-                          {
-                                if ( (d2=(double) ACAC)  <  dd2) 
-                                  {
-                                        er = ta;
-                                        l0 = ACAC;
-                                        l1 = BCBC;
-                                        cas = 0;
-                                        s = s0;
-                                  }
-                          }
-                        else if (ABAC > AB2)  // DIST B
-                          {
-                                if ( (d2=(double) BCBC)  <  dd2) 
-                                  {
-                                        dd2 = d2;
-                                        er = Adj(ta); // other direction
-                                        l0 = BCBC;
-                                        l1 = ACAC;
-                                        cas = 1;
-                                        s = s1;
-                                  }
-                          }
-                        else  // DIST AB
-                          { 
-
-                                double det_2 =  (double) Det(AB,AC); 
-                                det_2 *= det_2; // square of area*2 of triangle ABC
-                                d2 = det_2/ (double) AB2; // hauteur^2 in C of of triangle ABC      
-
-                                if (d2 < dd2) 
-                                  {
-                                        dd2 = d2;
-                                        er = ta;
-                                        l0 = (AC,AC);
-                                        l1 = (BC,BC);
-                                        s = 0;
-                                        cas = -1;
-                                        b = ((double) ABAC/(double) AB2);
-                                        a = 1 - b;
-                                  }
-                          }
-                  }
-                if (cas ==-2){
-                        _error2_("cas==-2");
-                }
-                // l1 = ||C s1||  , l0 = ||C s0||
-                // where s0,s1 are the vertex of the edge er
-
-                if ( s) 
-                  { 
-                        t=er;
-                        AdjacentTriangle edge(er); 
-
-                        int kkk=0;  
-                        int linkp = t->link == 0;
-
-                        Triangle * tt=t=edge=Adj(Previous(edge));
-                        do  {  // loop over vertex s
-                                kkk++;
-                                if (edge.EdgeVertex(0)!=s && kkk>=10000){
-                                        _error2_("edge.EdgeVertex(0)!=s && kkk>=10000");
-                                }
-
-                                int link = tt->link == 0;
-                                if ((link + linkp) == 1) 
-                                  { // a boundary edge 
-                                        BamgVertex * st = edge.EdgeVertex(1);
-                                        I2 I=*st;
-                                        Icoor2  ll = Norme2_2 (C-I);
-                                        if (ll < l1) {  // the other vertex is neart 
-                                                s1=st;
-                                                l1=ll;
-                                                er = edge;
-                                                if(ll<l0) { // change of direction --
-                                                        s1=s;
-                                                        l1=l0;
-                                                        s=st;
-                                                        l0=ll;
-                                                        t=tt;
-                                                        edge=Adj(edge);
-                                                        link=linkp;
-                                                        er = edge;
-                                                }
-                                        }
-                                  }
-
-                                linkp=link;
-                                edge=Adj(Previous(edge));
-                                tt = edge;
-                        } while (t!=tt);
-
-                        if (!(Triangle *) er){
-                                _error2_("!(Triangle *) er");
-                        }
-                        I2 A((I2)*er.EdgeVertex(0));
-                        I2 B((I2)*er.EdgeVertex(1));
-                        I2 AB=B-A,AC=C-A,CB=B-C;
-                        double aa =  (double) (AB,AC);
-                        double bb =  (double) (AB,CB);
-                        if (aa<0)       a=1,b=0;
-                        else if(bb<0)   a=0,b=1;
-                        else  
-                          {
-                                a  = bb/(aa+bb);
-                                b  = aa/(aa+bb);
-                          }
-                  }
-                return er;
-        } 
-        /*}}}*/
 /*FUNCTION ForceEdge{{{*/
 int ForceEdge(BamgVertex &a, BamgVertex & b,AdjacentTriangle & taret)  { 

issm/trunk-jpl/src/c/classes/bamg/Mesh.h

@@ -154 +154 @@
         /*Intermediary*/
         AdjacentTriangle CloseBoundaryEdge(I2 ,Triangle *, double &,double &) ;
-        AdjacentTriangle CloseBoundaryEdgeV2(I2 A,Triangle *t, double &a,double &b);
         void  swap(Triangle *t1,short a1,
                                 Triangle *t2,short a2,

issm/trunk-jpl/src/c/classes/bamg/macros.h

@@ -20 +20 @@
         static const short PreviousVertex[3] = {2,0,1};
         const  Icoor1 MaxICoor   = 1073741823; // 2^30-1 =111...111 (29 times one)
-        const  Icoor2 MaxICoor22 = (Icoor2(2)*Icoor2(MaxICoor)*Icoor2(MaxICoor));
 }