Changeset 2857

Timestamp:

01/15/10 13:02:04 (15 years ago)

Author:

Mathieu Morlighem

Message:

removed some couts

Location:

issm/trunk/src/c/Bamgx/objects

Files:

• ListofIntersectionTriangles.cpp (modified) (9 diffs)
• Triangles.cpp (modified) (5 diffs)

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

@@ -56 +56 @@
                                 // test if the point b is in the same side
                                 if (det(v0.i,v1.i,b)>=0) {
-                                        //cout << " All the edge " << A << B << endl;
                                         TriangleAdjacent edge=CloseBoundaryEdge(a,t,ba,bb);
                                         Vertex & v0 = *edge.EdgeVertex(0), & v1 = *edge.EdgeVertex(1);
@@ -87 +86 @@
                                         double ba,bb;
                                         long int verbosity=2;
-                                        if (verbosity>7) 
-                                         cout << "       SplitEdge: All the edge " << A << B << nbegin <<  det(vi,vj,b) 
-                                                << " deti= " << deti <<  " detj=" <<detj << endl;
                                         TriangleAdjacent edge=CloseBoundaryEdge(a,t,ba,bb);
                                         Vertex & v0 = *edge.EdgeVertex(0), & v1 = *edge.EdgeVertex(1);
@@ -102 +98 @@
                         // we revert vi,vj because vi,vj is def in Adj triangle
                         if ( det(vi,vj,b)>=0) {
-                                if (verbosity>7)
-                                 cout << "       SplitEdge: all AB outside " << A << B << endl;
                                 t=tbegin;
                                 Real8 ba,bb;
@@ -221 +215 @@
                                                                 TriangleAdjacent edge=CloseBoundaryEdge(b,t,ba,bb);
                                                                 NewItem(B,Metric(ba,*edge.EdgeVertex(0),bb,*edge.EdgeVertex(1)));
-                                                                //      cout << " return " << ba << " " << bb << endl;
-                                                                // ajoute le 03 frev 1997 par F. hecht
                                                                 return;
                                                         }
@@ -271 +263 @@
         /*FUNCTION ListofIntersectionTriangles::Length{{{1*/
         Real8  ListofIntersectionTriangles::Length(){
-                //  cout << " n= " << Size << ":" ;
                 if (Size<=0){
                         throw ErrorException(__FUNCT__,exprintf("Size<=0"));
@@ -292 +283 @@
                 SegI->lBegin=s;
 
-                for (jj=0,ii=1;ii<Size;jj=ii++) 
-                  {  
+                for (jj=0,ii=1;ii<Size;jj=ii++) {  
                         // seg jj,ii
                         x=y;
@@ -300 +290 @@
                         Mx = lIntTria[ii].m;
                         My = lIntTria[jj].m;
-                        //      Real8 &sx=  lIntTria[ii].sp; // previous seg
-                        //  Real8 &sy=  lIntTria[jj].sn; // next seg
-                        //      sx = Mx(xy);
-                        //      sy = My(xy);
-                        //   sxy = (Mx(xy)+ My(xy))/2.0;
                         sxy =  LengthInterpole(Mx,My,xy);
                         s += sxy;
@@ -314 +299 @@
                                 SegI->lBegin=s;
 
-                        //    cout << ii << " " << jj << x<< y <<xy << s <<  lIntTria[ii].m  ;
                   }
                 len = s;
                 SegI->lEnd=s;
 
-                //  cout << " len= " << s << endl;
                 return s;
         }
@@ -369 +352 @@
                                 vertices[nbv].r = C;
                                 vertices[nbv++].m = Metric(cx,lIntTria[ii-1].m,cy,lIntTria[ii].m);
-                                if((verbosity/100%10)==2)
-                                 cout << "   -- Add point " << nbv-1 << " " << vertices[nbv-1] << " " << vertices[nbv-1].m << endl;
-
                         }
                         else return nbv-nbvold;

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

@@ -2219 +2219 @@
                 long int verbosity=2;
                 Int4 nbtold(nbt),nbvold(nbv);
-                if (verbosity>2) 
-                 cout << "  -- Triangles::NewPoints ";
-                if (verbosity>3)cout <<  " nbv (in)  on Boundary  = " << nbv  <<endl;
+                if (verbosity>2)  printf("   Triangles::NewPoints\n");
                 Int4 i,k;
                 int j;
@@ -2229 +2227 @@
                 nbtold = nbt;
 
-                if (KeepBackVertex && (&Bh != this) && (nbv+Bh.nbv< nbvx)) 
-                  {
+                if (KeepBackVertex && (&Bh != this) && (nbv+Bh.nbv< nbvx)){
                         //   Bh.SetVertexFieldOn();
                         for (i=0;i<Bh.nbv;i++)
@@ -2242 +2239 @@
                         Bh.ReMakeTriangleContainingTheVertex();     
                         InsertNewPoints(nbvold,NbTSwap)   ;            
-                        if (verbosity>2)
-                         cout <<  "      (Nb of Points from background mesh  = " 
-                                << nbv-nbvold  << " / " << nbv1-nbvold << ")" << endl;
                   }  
                 else 
@@ -2272 +2266 @@
                           { // for each triangle  t
                                 // we can change first_np_or_next_t[i]
-                                //      cout << " Do the triangle " << i << " Next_t=" << next_t << endl;
                                 if (i<0 || i>=nbt ){
                                         throw ErrorException(__FUNCT__,exprintf("i<0 || i>=nbt"));
@@ -2354 +2347 @@
                         */
                 NbTSwap +=  NbSwapf ;
-                if (verbosity>3) cout << "   " ;
-                if (verbosity>2) 
-                 cout << " Nb Of Vertices =" << nbv << " Nb of triangles = " << nbt-NbOutT 
-                        << " NbSwap final = " << NbSwapf << " Nb Total Of Swap = " << NbTSwap << endl;
-
-
         }
         /*}}}1*/