Index: /issm/trunk/src/c/Bamgx/MeshQuad.cpp =================================================================== --- /issm/trunk/src/c/Bamgx/MeshQuad.cpp (revision 2799) +++ /issm/trunk/src/c/Bamgx/MeshQuad.cpp (revision 2800) @@ -347,8 +347,4 @@ } delete [] qq; -#ifdef DRAWING2 - Draw(); - inquire(); -#endif } @@ -375,8 +371,4 @@ ReNumberingTheTriangleBySubDomain(); -#ifdef DRAWING2 - Draw(); - inquire(); -#endif //int nswap =0; const Int4 nfortria( choice ? 4 : 6); @@ -431,7 +423,4 @@ triangles[i].check(); #endif -#ifdef DRAWING2 - reffecran(); -#endif Int4 k=nbv; Int4 kk=0; @@ -682,7 +671,4 @@ newNbOfQuad = 4*NbOfQuad; nbv = k; -#ifdef DRAWING2 - inquire(); -#endif // cout << " Nbv = " << nbv << endl; kkk = nbt; @@ -874,8 +860,4 @@ for (i=0;i1) cout << " -- Limit the subdivision of a edges in the new mesh by " << maxsubdiv << endl ; @@ -893,13 +890,5 @@ D2xD2 D(maxsubdiv2,0,0,lc); D2xD2 MM = Rt1*D*Rt1.t(); -#ifdef DRAWING1 - v0.m.Draw(v0); -#endif v0.m = M = MetricAnIso(MM.x.x,MM.y.x,MM.y.y); -#ifdef DRAWING1 - v0.m.Draw(v0); -#endif - // cout << " M(AB,AB) = " << M(AB,AB) << " == " << maxsubdiv - // << " M(AC,AC) = " << M(AC,AC) << " == " << lc << endl; nbchange++; } @@ -914,14 +903,5 @@ D2xD2 D(maxsubdiv2,0,0,lc); D2xD2 MM = Rt1*D*Rt1.t(); -#ifdef DRAWING1 - v1.m.Draw(v1); -#endif v1.m = M = MetricAnIso(MM.x.x,MM.y.x,MM.y.y); -#ifdef DRAWING1 - v1.m.Draw(v1); - inquire(); -#endif - // cout << " M(AB,AB) = " << M(AB,AB) << " == " << maxsubdiv - // << " M(AC,AC) = " << M(AC,AC) << " == " << lc << endl; nbchange++; } @@ -934,7 +914,4 @@ cout << " Nb of metric change = " << nbchange << " Max of the subdivision of a edges before change = " << sqrt(lmax) << endl; -#ifdef DRAWING2 - inquire(); -#endif } @@ -1123,36 +1100,3 @@ } - - -#ifdef DRAWING - -void MetricAnIso::Draw(R2 c) const -{ - float x= c.x,y= c.y; - if (InPtScreen(x,y)) { - R2 X(cos(0.0),sin(0.0)); - X = X / operator()(X); - rmoveto(x+X.x,y+X.y); - - for (int i=1;i<=100;i++) - { double t= 2*Pi*i/100.0; - R2 X(cos(t),sin(t)); - X = X / Max(operator()(X),1.0e-5); - rlineto(x+X.x,y+X.y); } - } -} - -void MetricIso::Draw(R2 c) const -{ - float x= c.x,y= c.y; - if (InPtScreen(x,y)) { - rmoveto(x+h,y); - for (int i=1;i<=40;i++) - { double t= Pi*i/20.0; - rlineto(x+h*cos(t),y+h*sin(t)); } - } -} - - -#endif } // end of namespace bamg Index: /issm/trunk/src/c/Bamgx/Metric.h =================================================================== --- /issm/trunk/src/c/Bamgx/Metric.h (revision 2799) +++ /issm/trunk/src/c/Bamgx/Metric.h (revision 2800) @@ -76,7 +76,4 @@ {f << " h=" << M.h<< ";" ; return f;} -#ifdef DRAWING - void Draw(R2 ) const; -#endif }; @@ -108,7 +105,4 @@ friend std::ostream& operator <<(std::ostream& f, const MetricAnIso & M) {f << " mtr a11=" << M.a11 << " a21=a12=" << M.a21 << " a22=" << M.a22 << ";" ; return f;} -#ifdef DRAWING - void Draw(R2 ) const; -#endif MetricAnIso(const MatVVP2x2); }; Index: /issm/trunk/src/c/Bamgx/QuadTree.cpp =================================================================== --- /issm/trunk/src/c/Bamgx/QuadTree.cpp (revision 2799) +++ /issm/trunk/src/c/Bamgx/QuadTree.cpp (revision 2800) @@ -48,86 +48,4 @@ -#ifdef DRAWING - -void QuadTree::Draw() -{ - QuadTreeBox * pb[ MaxDeep ]; - int pi[ MaxDeep ]; - Icoor1 ii[ MaxDeep ], jj [ MaxDeep]; - register int l=0; // level - register QuadTreeBox * b; - IntQuad hb = MaxISize; - if(!root) return; - // Int4 kkk =0; - pb[0]= root; - pi[0]= root->n>0 ?(int) root->n : 4 ; - ii[0]=jj[0]=0; - do{ - b= pb[l]; - - while (pi[l]--) - { - if (b->n>0) // Vertex QuadTreeBox none empty - { // - for (int k=0;kn;k++) - { - I2 i2 = b->v[k]->i; - IMoveTo(i2.x,i2.y+50); - ILineTo(i2.x,i2.y-50); - IMoveTo(i2.x+50,i2.y); - ILineTo(i2.x-50,i2.y); - - assert(ii[l] <= i2.x); - assert(jj[l] <= i2.y); - assert(ii[l] +hb > i2.x); - assert(jj[l] +hb > i2.y); - - } - break; - } - else // Pointer QuadTreeBox - { - register int lll = pi[l]; - register QuadTreeBox *b0=b; - - if ((b=b->b[lll])) - { - hb >>=1 ; // div by 2 - register Icoor1 iii = ii[l]+I_IJ(lll,hb); - register Icoor1 jjj = jj[l]+J_IJ(lll,hb); - - pb[++l]= b; - pi[l]= 4; - ii[l]= iii; - jj[l]= jjj; - - IMoveTo(ii[l],jj[l]); - ILineTo(ii[l]+hb,jj[l]); - ILineTo(ii[l]+hb,jj[l]+hb); - ILineTo(ii[l] ,jj[l]+hb); - ILineTo(ii[l] ,jj[l]); - - - } - else - { - register Icoor1 iii = ii[l]+I_IJ(lll,hb/2); - register Icoor1 jjj = jj[l]+J_IJ(lll,hb/2); - b=b0; - - IMoveTo(iii, jjj); - ILineTo(iii+hb/2,jjj+hb/2); - IMoveTo(iii+hb/2,jjj); - ILineTo(iii ,jjj+hb/2); - - } - } - } - hb <<= 1; // mul by 2 - } while (l--); - -} - -#endif Vertex * QuadTree::NearestVertex(Icoor1 i,Icoor1 j) @@ -382,7 +300,4 @@ for (Int4 i=0;ivertices[i]); -#ifdef DRAWING1 - Draw(); -#endif } Index: /issm/trunk/src/c/Bamgx/QuadTree.h =================================================================== --- /issm/trunk/src/c/Bamgx/QuadTree.h (revision 2799) +++ /issm/trunk/src/c/Bamgx/QuadTree.h (revision 2800) @@ -83,7 +83,4 @@ long SizeOf() const {return sizeof(QuadTree)+sb->SizeOf();} -#ifdef DRAWING - void Draw(); -#endif void Add( Vertex & w); Index: /issm/trunk/src/c/Makefile.am =================================================================== --- /issm/trunk/src/c/Makefile.am (revision 2799) +++ /issm/trunk/src/c/Makefile.am (revision 2800) @@ -322,5 +322,4 @@ ./Bamgx/Mesh2.cpp \ ./Bamgx/Mesh2.h \ - ./Bamgx/MeshDraw.cpp \ ./Bamgx/MeshGeom.cpp \ ./Bamgx/Meshio.cpp \ @@ -665,5 +664,4 @@ ./Bamgx/Mesh2.cpp \ ./Bamgx/Mesh2.h \ - ./Bamgx/MeshDraw.cpp \ ./Bamgx/MeshGeom.cpp \ ./Bamgx/Meshio.cpp \