Index: /issm/trunk/src/c/Bamgx/objects/GeometricalEdge.cpp =================================================================== --- /issm/trunk/src/c/Bamgx/objects/GeometricalEdge.cpp (revision 3245) +++ /issm/trunk/src/c/Bamgx/objects/GeometricalEdge.cpp (revision 3246) @@ -17,6 +17,9 @@ /*Methods*/ /*FUNCTION GeometricalEdge::R1tg{{{1*/ - double GeometricalEdge::R1tg(double theta,R2 & t) const // 1/R of radius of cuvature - { R2 A=v[0]->r,B=v[1]->r; + double GeometricalEdge::R1tg(double theta,R2 & t) const{ + /*Original code from Frederic Hecht (BAMG v1.01, MeshGeom.cpp/R1tg)*/ + // 1/R of radius of cuvature + + R2 A=v[0]->r,B=v[1]->r; double dca,dcb,dcta,dctb; double ddca,ddcb,ddcta,ddctb; @@ -90,6 +93,9 @@ /*}}}1*/ /*FUNCTION GeometricalEdge::F{{{1*/ - R2 GeometricalEdge::F(double theta) const // parametrization of the curve edge - { R2 A=v[0]->r,B=v[1]->r; + R2 GeometricalEdge::F(double theta) const{ + /*Original code from Frederic Hecht (BAMG v1.01, MeshGeom.cpp/F)*/ + // parametrization of the curve edge + + R2 A=v[0]->r,B=v[1]->r; double ca,cb,cta,ctb; if ( theta<-1e-12){ Index: /issm/trunk/src/c/Bamgx/objects/Geometry.cpp =================================================================== --- /issm/trunk/src/c/Bamgx/objects/Geometry.cpp (revision 3245) +++ /issm/trunk/src/c/Bamgx/objects/Geometry.cpp (revision 3246) @@ -16,4 +16,6 @@ /*FUNCTION Geometry::Geometry(const Geometry & Gh){{{1*/ Geometry::Geometry(const Geometry & Gh) { + /*Original code from Frederic Hecht (BAMG v1.01, MeshGeom.cpp/Geometry)*/ + long i; *this = Gh; @@ -40,4 +42,6 @@ /*FUNCTION Geometry::~Geometry(){{{1*/ Geometry::~Geometry() { + /*Original code from Frederic Hecht (BAMG v1.01, MeshGeom.cpp/~Geometry)*/ + long int verbosity=0; @@ -491,4 +495,6 @@ /*FUNCTION Geometry::AfterRead(){{{1*/ void Geometry::AfterRead(){ + /*Original code from Frederic Hecht (BAMG v1.01, MeshGeom.cpp/AfterRead)*/ + long int verbosity=0; @@ -846,6 +852,8 @@ } /*}}}1*/ - /*FUNCTION Geometry::Contening{{{1*/ - GeometricalEdge* Geometry::Contening(const R2 P, GeometricalEdge * start) const { + /*FUNCTION Geometry::Containing{{{1*/ + GeometricalEdge* Geometry::Containing(const R2 P, GeometricalEdge * start) const { + /*Original code from Frederic Hecht (BAMG v1.01, MeshGeom.cpp/Contening)*/ + GeometricalEdge* on =start,* pon=0; // walk with the cos on geometry @@ -901,4 +909,6 @@ /*FUNCTION Geometry::EmptyGeometry(){{{1*/ void Geometry::EmptyGeometry() { + /*Original code from Frederic Hecht (BAMG v1.01, MeshGeom.cpp/EmptyGeometry)*/ + NbRef=0; quadtree=0; @@ -921,4 +931,6 @@ /*FUNCTION Geometry::ProjectOnCurve {{{1*/ GeometricalEdge* Geometry::ProjectOnCurve(const Edge & e,double s,Vertex &V,VertexOnGeom &GV ) const { + /*Original code from Frederic Hecht (BAMG v1.01, MeshGeom.cpp/ProjectOnCurve)*/ + double save_s=s; int NbTry=0; Index: /issm/trunk/src/c/Bamgx/objects/Geometry.h =================================================================== --- /issm/trunk/src/c/Bamgx/objects/Geometry.h (revision 3245) +++ /issm/trunk/src/c/Bamgx/objects/Geometry.h (revision 3246) @@ -71,5 +71,5 @@ void UnMarkEdges() {for (int i=0;i (BAMG v1.01, Mesh2.cpp/ListofIntersectionTriangles)*/ + Triangle *tbegin, *t; @@ -218,4 +220,6 @@ /*FUNCTION ListofIntersectionTriangles::NewItem(Triangle * tt,double d0,double d1,double d2) {{{1*/ int ListofIntersectionTriangles::NewItem(Triangle * tt,double d0,double d1,double d2) { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/NewItem)*/ + register int n; R2 x(0,0); @@ -244,4 +248,6 @@ /*FUNCTION ListofIntersectionTriangles::NewItem(R2 A,const Metric & mm){{{1*/ int ListofIntersectionTriangles::NewItem(R2 A,const Metric & mm) { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/NewItem)*/ + register int n; if(!Size || Norme2_2(lIntTria[Size-1].x-A)) { @@ -258,4 +264,6 @@ /*FUNCTION ListofIntersectionTriangles::Length{{{1*/ double ListofIntersectionTriangles::Length(){ + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/Length)*/ + // computation of the length @@ -304,4 +312,5 @@ /*FUNCTION ListofIntersectionTriangles::NewPoints{{{1*/ long ListofIntersectionTriangles::NewPoints(Vertex* vertices,long &nbv,long nbvx){ + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/NewPoints)*/ //If length<1.5, do nothing Index: /issm/trunk/src/c/Bamgx/objects/MatVVP2x2.cpp =================================================================== --- /issm/trunk/src/c/Bamgx/objects/MatVVP2x2.cpp (revision 3245) +++ /issm/trunk/src/c/Bamgx/objects/MatVVP2x2.cpp (revision 3246) @@ -14,4 +14,6 @@ /*FUNCTION MatVVP2x2::MatVVP2x2(const Metric M){{{1*/ MatVVP2x2::MatVVP2x2(const Metric M){ + /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/MatVVP2x2)*/ + double a11=M.a11,a21=M.a21,a22=M.a22; const double eps = 1.e-5; @@ -45,5 +47,4 @@ /*Methods*/ /*FUNCTION MatVVP2x2::Echo {{{1*/ - void MatVVP2x2::Echo(void){ Index: /issm/trunk/src/c/Bamgx/objects/Metric.cpp =================================================================== --- /issm/trunk/src/c/Bamgx/objects/Metric.cpp (revision 3245) +++ /issm/trunk/src/c/Bamgx/objects/Metric.cpp (revision 3246) @@ -18,4 +18,6 @@ /*FUNCTION Metric::Metric(const double a[3],const Metric m0, const Metric m1,const Metric m2 ){{{1*/ Metric::Metric(const double a[3],const Metric m0, const Metric m1,const Metric m2 ){ + /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/Metric)*/ + Metric mab(a[0]*m0.a11 + a[1]*m1.a11 + a[2]*m2.a11, a[0]*m0.a21 + a[1]*m1.a21 + a[2]*m2.a21, @@ -37,4 +39,6 @@ /*FUNCTION Metric::Metric( double a,const Metric ma, double b,const Metric mb){{{1*/ Metric::Metric( double a,const Metric ma, double b,const Metric mb) { + /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/MatVVP2x2)*/ + Metric mab(a*ma.a11+b*mb.a11,a*ma.a21+b*mb.a21,a*ma.a22+b*mb.a22); MatVVP2x2 vab(mab); @@ -54,5 +58,4 @@ /*Methods*/ /*FUNCTION Metric::Echo {{{1*/ - void Metric::Echo(void){ @@ -65,4 +68,6 @@ /*FUNCTION Metric::IntersectWith{{{1*/ int Metric::IntersectWith(const Metric M2) { + /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/IntersectWith)*/ + /*Get a new metric from an existing metric (M1=this) * and a new metric given in input M2 using a @@ -118,4 +123,6 @@ /*FUNCTION LengthInterpole{{{1*/ double LengthInterpole(const Metric Ma,const Metric Mb, R2 AB) { + /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/LengthInterpole)*/ + double k=1./2.; int level=0; @@ -184,4 +191,6 @@ /*FUNCTION SimultaneousMatrixReduction{{{1*/ void SimultaneousMatrixReduction( Metric M1, Metric M2, D2xD2 &V) { + /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/ReductionSimultanee)*/ + /*In this routine we must return a matrix V that is composed of the * eigen vectors of N=inv(M1) M2. @@ -287,4 +296,6 @@ /*FUNCTION abscisseInterpole{{{1*/ double abscisseInterpole(const Metric Ma,const Metric Mb, R2 AB,double s,int optim) { + /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/abscisseInterpole)*/ + if(!optim) LengthInterpole(Ma,Mb,AB); double l = s* LastMetricInterpole.lab,r; Index: /issm/trunk/src/c/Bamgx/objects/QuadTree.cpp =================================================================== --- /issm/trunk/src/c/Bamgx/objects/QuadTree.cpp (revision 3245) +++ /issm/trunk/src/c/Bamgx/objects/QuadTree.cpp (revision 3246) @@ -81,4 +81,6 @@ /*FUNCTION QuadTree::QuadTree(Triangles * t,long nbv){{{1*/ QuadTree::QuadTree(Triangles * t,long nbv) : + /*Original code from Frederic Hecht (BAMG v1.01, QuadTree.cpp/QuadTree)*/ + lenStorageQuadTreeBox(t->nbvx/8+10), th(t), @@ -100,4 +102,6 @@ /*FUNCTION QuadTree::QuadTree(){{{1*/ QuadTree::QuadTree() : + /*Original code from Frederic Hecht (BAMG v1.01, QuadTree.cpp/QuadTree)*/ + lenStorageQuadTreeBox(100), // by default 100 vertices by box th(0), // initial mesh = NULL @@ -114,4 +118,6 @@ /*FUNCTION QuadTree::~QuadTree(){{{1*/ QuadTree::~QuadTree() { + /*Original code from Frederic Hecht (BAMG v1.01, QuadTree.cpp/~QuadTree)*/ + delete sb; root=0; @@ -122,4 +128,6 @@ /*FUNCTION QuadTree::Add{{{1*/ void QuadTree::Add(Vertex &w){ + /*Original code from Frederic Hecht (BAMG v1.01, QuadTree.cpp/Add)*/ + QuadTreeBox** pb; QuadTreeBox* b; @@ -205,4 +213,5 @@ /*FUNCTION QuadTree::NearestVertex{{{1*/ Vertex* QuadTree::NearestVertex(Icoor1 i,Icoor1 j) { + /*Original code from Frederic Hecht (BAMG v1.01, QuadTree.cpp/NearestVertex)*/ /*Build QuadTree*/ @@ -343,4 +352,6 @@ /*FUNCTION QuadTree::NearestVertexWithNormal{{{1*/ Vertex* QuadTree::NearestVertexWithNormal(Icoor1 i,Icoor1 j) { + /*Original code from Frederic Hecht (BAMG v1.01, QuadTree.cpp/NearestVertexWithNormal)*/ + QuadTreeBox * pb[ MaxDeep ]; int pi[ MaxDeep ]; @@ -453,4 +464,6 @@ /*FUNCTION QuadTree::StorageQuadTreeBox::StorageQuadTreeBox{{{1*/ QuadTree::StorageQuadTreeBox::StorageQuadTreeBox(long ll,StorageQuadTreeBox *nn) { + /*Original code from Frederic Hecht (BAMG v1.01, QuadTree.cpp/StorageQuadTreeBox)*/ + len = ll; n = nn; @@ -467,4 +480,6 @@ /*FUNCTION QuadTree::ToClose {{{1*/ Vertex * QuadTree::ToClose(Vertex & v,double seuil,Icoor1 hx,Icoor1 hy){ + /*Original code from Frederic Hecht (BAMG v1.01, QuadTree.cpp/ToClose)*/ + const Icoor1 i=v.i.x; const Icoor1 j=v.i.y; Index: /issm/trunk/src/c/Bamgx/objects/QuadTree.h =================================================================== --- /issm/trunk/src/c/Bamgx/objects/QuadTree.h (revision 3245) +++ /issm/trunk/src/c/Bamgx/objects/QuadTree.h (revision 3246) @@ -1,2 +1,3 @@ +/*Original code from Frederic Hecht (BAMG v1.01, QuadTree.h)*/ #ifndef _QUADTREE_H #define _QUADTREE_H Index: /issm/trunk/src/c/Bamgx/objects/R2.h =================================================================== --- /issm/trunk/src/c/Bamgx/objects/R2.h (revision 3245) +++ /issm/trunk/src/c/Bamgx/objects/R2.h (revision 3246) @@ -1,2 +1,3 @@ +/*Original code from Frederic Hecht (BAMG v1.01, R2.h)*/ #ifndef _R2_H #define _R2_H Index: /issm/trunk/src/c/Bamgx/objects/SetOfE4.cpp =================================================================== --- /issm/trunk/src/c/Bamgx/objects/SetOfE4.cpp (revision 3245) +++ /issm/trunk/src/c/Bamgx/objects/SetOfE4.cpp (revision 3246) @@ -11,4 +11,5 @@ /*FUNCTION SetOfEdges4::SetOfEdges4(long mmx,long nnx){{{1*/ SetOfEdges4::SetOfEdges4(long mmx,long nnx){ + /*Original code from Frederic Hecht (BAMG v1.01, SetOfEdges4.cpp/SetOfEdges4)*/ /*Intermediary*/ @@ -31,4 +32,5 @@ /*FUNCTION SetOfEdges4::find {{{1*/ long SetOfEdges4::find(long ii,long jj) { + /*Original code from Frederic Hecht (BAMG v1.01, SetOfEdges4.cpp/find)*/ /*Intermediary*/ @@ -59,4 +61,5 @@ /*FUNCTION SetOfEdges4::add{{{1*/ long SetOfEdges4::add(long ii,long jj) { + /*Original code from Frederic Hecht (BAMG v1.01, SetOfEdges4.cpp/add)*/ /*Intermediary*/ Index: /issm/trunk/src/c/Bamgx/objects/Triangle.cpp =================================================================== --- /issm/trunk/src/c/Bamgx/objects/Triangle.cpp (revision 3245) +++ /issm/trunk/src/c/Bamgx/objects/Triangle.cpp (revision 3246) @@ -15,4 +15,5 @@ /*FUNCTION Triangle::FindBoundaryEdge{{{1*/ TriangleAdjacent Triangle::FindBoundaryEdge(int i) const{ + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/FindBoundaryEdge)*/ /*Intermediary*/ @@ -60,5 +61,4 @@ /*}}}1*/ /*FUNCTION Triangle::Echo {{{1*/ - void Triangle::Echo(void){ @@ -93,4 +93,6 @@ /*FUNCTION Triangle::Optim{{{1*/ long Triangle::Optim(short i,int koption) { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/Optim)*/ + // turn around (positive direction) Triangle *t=this; @@ -124,4 +126,6 @@ /*FUNCTION Triangle::swap{{{1*/ int Triangle::swap(short a,int koption){ + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/swap)*/ + if(a/4 !=0) return 0;// arete lock or MarkUnSwap Index: /issm/trunk/src/c/Bamgx/objects/Triangles.cpp =================================================================== --- /issm/trunk/src/c/Bamgx/objects/Triangles.cpp (revision 3245) +++ /issm/trunk/src/c/Bamgx/objects/Triangles.cpp (revision 3246) @@ -20,5 +20,4 @@ /*FUNCTION Triangles::Triangles(BamgMesh* bamgmesh, BamgOpts* bamgopts){{{1*/ Triangles::Triangles(BamgMesh* bamgmesh, BamgOpts* bamgopts):Gh(*(new Geometry())),BTh(*this){ - PreInit(0); ReadMesh(bamgmesh,bamgopts); @@ -38,4 +37,5 @@ /*FUNCTION Triangles::Triangles(const Triangles & Tho,const int *flag ,const int *bb){{{1*/ Triangles::Triangles(const Triangles & Tho,const int *flag ,const int *bb,BamgOpts* bamgopts) : Gh(*(new Geometry())), BTh(*this) { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/Triangles)*/ int i,k,itadj; @@ -141,4 +141,5 @@ Triangles::Triangles(Triangles & Th,Geometry * pGh,Triangles * pBth,long nbvxx) : Gh(*(pGh?pGh:&Th.Gh)), BTh(*(pBth?pBth:this)) { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/Triangles)*/ Gh.NbRef++; nbvxx = Max(nbvxx,Th.nbv); @@ -206,4 +207,6 @@ /*FUNCTION Triangles::~Triangles(){{{1*/ Triangles::~Triangles() { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/Triangles)*/ + long int verbosity=2; //if(vertices) delete [] vertices; //TEST crash if not commented @@ -861,4 +864,5 @@ /*FUNCTION Triangles::AddGeometryMetric{{{1*/ void Triangles::AddGeometryMetric(BamgOpts* bamgopts){ + /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/IntersectGeomMetric)*/ /*Get options*/ @@ -933,4 +937,5 @@ /*FUNCTION Triangles::AddVertex{{{1*/ void Triangles::AddVertex( Vertex &s,Triangle* t, Icoor2* det3) { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/Add)*/ // ------------------------------------------- // s2 @@ -1073,4 +1078,5 @@ /*FUNCTION Triangles::BoundAnisotropy{{{1*/ void Triangles::BoundAnisotropy(double anisomax,double hminaniso) { + /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/BoundAnisotropy)*/ long int verbosity=0; @@ -1112,4 +1118,6 @@ /*FUNCTION Triangles::BuildGeometryFromMesh{{{1*/ void Triangles::BuildGeometryFromMesh(BamgOpts* bamgopts){ + /*Original code from Frederic Hecht (BAMG v1.01, MeshGeom.cpp/ConsGeometry)*/ + /*Reconstruct Geometry from Mesh*/ @@ -1761,4 +1769,5 @@ /*FUNCTION Triangles::BuildMetric1 (Green formula){{{1*/ void Triangles::BuildMetric1(BamgOpts* bamgopts){ + /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/IntersectConsMetric)*/ /*Options*/ @@ -2049,4 +2058,5 @@ /*FUNCTION Triangles::Crack{{{1*/ int Triangles::Crack() { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/Crack)*/ if (NbCrackedEdges!=0 && NbCrackedVertices<=0);{ throw ErrorException(__FUNCT__,exprintf("NbCrackedEdges!=0 && NbCrackedVertices<=0")); @@ -2058,4 +2068,5 @@ /*FUNCTION Triangles::CrackMesh{{{1*/ int Triangles::CrackMesh() { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/CrackMesh)*/ int verbosity=0; @@ -2200,4 +2211,6 @@ /*FUNCTION Triangles::ForceBoundary{{{1*/ void Triangles::ForceBoundary() { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/ForceBoundary)*/ + long int verbosity=2; int k=0; @@ -2246,4 +2259,6 @@ /*FUNCTION Triangles::FindSubDomain{{{1*/ void Triangles::FindSubDomain(int OutSide) { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/FindSubDomain)*/ + long int verbosity=0; @@ -2496,4 +2511,6 @@ /*FUNCTION Triangles::FindTriangleContaining{{{1*/ Triangle * Triangles::FindTriangleContaining(const I2 & B,Icoor2 dete[3], Triangle *tstart) const { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/FindTriangleContening)*/ + Triangle * t=0; int j,jp,jn,jj; @@ -2507,5 +2524,5 @@ if (!a || !a->t ) { if (a) { - printf("TriangleConteningTheVertex vertex number %i, another call to ReMakeTriangleContainingTheVertex was required\n", Number(a)); + printf("TriangleContaining vertex number %i, another call to ReMakeTriangleContainingTheVertex was required\n", Number(a)); } throw ErrorException(__FUNCT__,exprintf("problem in Triangles::FindTriangleContaining")); @@ -2589,4 +2606,5 @@ /*FUNCTION Triangles::GenerateMeshProperties{{{1*/ void Triangles::GenerateMeshProperties() { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/FillHoleInMesh)*/ int verbosity=0; @@ -2874,4 +2892,6 @@ /*FUNCTION Triangles::GeomToTriangles0{{{1*/ void Triangles::GeomToTriangles0(long inbvx,BamgOpts* bamgopts) { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/GeomToTriangles0)*/ + /*Generate mesh from geometry*/ @@ -3192,4 +3212,5 @@ /*FUNCTION Triangles::GeomToTriangles1{{{1*/ void Triangles::GeomToTriangles1(long inbvx,BamgOpts* bamgopts,int KeepVertices){ + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/GeomToTriangles1)*/ /*Get options*/ @@ -3531,4 +3552,6 @@ /*FUNCTION Triangles::Insert{{{1*/ void Triangles::Insert() { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/Insert)*/ + /*Insert points in the existing Geometry*/ @@ -3681,4 +3704,5 @@ /*FUNCTION Triangles::InsertNewPoints{{{1*/ long Triangles::InsertNewPoints(long nbvold,long & NbTSwap) { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/InsertNewPoints)*/ long int verbosity=0; @@ -3755,47 +3779,51 @@ } /*}}}1*/ -/*FUNCTION Triangles::MakeGeometricalEdgeToEdge{{{1*/ -Edge** Triangles::MakeGeometricalEdgeToEdge() { - if (!Gh.nbe){ - throw ErrorException(__FUNCT__,exprintf("!Gh.nbe")); + /*FUNCTION Triangles::MakeGeometricalEdgeToEdge{{{1*/ + Edge** Triangles::MakeGeometricalEdgeToEdge() { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/MakeGeometricalEdgeToEdge)*/ + + if (!Gh.nbe){ + throw ErrorException(__FUNCT__,exprintf("!Gh.nbe")); + } + Edge **e= new (Edge* [Gh.nbe]); + + long i; + for ( i=0;ionGeometry; + e[Gh.Number(onGeometry)] = ei; + } + for ( i=0;ionGeometry; + int j= ii; + while (!(*onGeometry)[j].Required()) { + Adj(onGeometry,j); // next geom edge + j=1-j; + if (e[Gh.Number(onGeometry)]) break; // optimisation + e[Gh.Number(onGeometry)] = ei; + } + } + + int kk=0; + for ( i=0;ionGeometry; - e[Gh.Number(onGeometry)] = ei; - } - for ( i=0;ionGeometry; - int j= ii; - while (!(*onGeometry)[j].Required()) { - Adj(onGeometry,j); // next geom edge - j=1-j; - if (e[Gh.Number(onGeometry)]) break; // optimisation - e[Gh.Number(onGeometry)] = ei; - } - } - - int kk=0; - for ( i=0;i (BAMG v1.01, Mesh2.cpp/MakeQuadrangles)*/ + long int verbosity=0; @@ -3837,70 +3865,76 @@ } /*}}}1*/ -/*FUNCTION Triangles::MakeQuadTree{{{1*/ -void Triangles::MakeQuadTree() { - long int verbosity=0; - if ( !quadtree ) quadtree = new QuadTree(this); - -} -/*}}}1*/ -/*FUNCTION Triangles::MaxSubDivision{{{1*/ -void Triangles::MaxSubDivision(double maxsubdiv) { - long int verbosity=0; - - const double maxsubdiv2 = maxsubdiv*maxsubdiv; - if(verbosity>1) printf(" Limit the subdivision of a edges in the new mesh by %g\n",maxsubdiv); - // for all the edges - // if the len of the edge is to long - long it,nbchange=0; - double lmax=0; - for (it=0;it (BAMG v1.01, Mesh2.cpp/MakeQuadTree)*/ + + long int verbosity=0; + if ( !quadtree ) quadtree = new QuadTree(this); + + } + /*}}}1*/ + /*FUNCTION Triangles::MaxSubDivision{{{1*/ + void Triangles::MaxSubDivision(double maxsubdiv) { + /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/MaxSubDivision)*/ + + long int verbosity=0; + + const double maxsubdiv2 = maxsubdiv*maxsubdiv; + if(verbosity>1) printf(" Limit the subdivision of a edges in the new mesh by %g\n",maxsubdiv); + // for all the edges + // if the len of the edge is to long + long it,nbchange=0; + double lmax=0; + for (it=0;it maxsubdiv2) - { R2 AC = M.Orthogonal(AB);// the ortogonal vector of AB in M - double lc = M(AC,AC); - D2xD2 Rt(AB,AC);// Rt.x = AB , Rt.y = AC; - D2xD2 Rt1(Rt.inv()); - D2xD2 D(maxsubdiv2,0,0,lc); - D2xD2 MM = Rt1*D*Rt1.t(); - v0.m = M = Metric(MM.x.x,MM.y.x,MM.y.y); - nbchange++; + Triangle &tt = *t.TriangleAdj(j); + if ( ! &tt || it < Number(tt) && ( tt.link || t.link)) + { + Vertex &v0 = t[VerticesOfTriangularEdge[j][0]]; + Vertex &v1 = t[VerticesOfTriangularEdge[j][1]]; + R2 AB= (R2) v1-(R2) v0; + Metric M = v0; + double l = M(AB,AB); + lmax = Max(lmax,l); + if(l> maxsubdiv2) + { R2 AC = M.Orthogonal(AB);// the ortogonal vector of AB in M + double lc = M(AC,AC); + D2xD2 Rt(AB,AC);// Rt.x = AB , Rt.y = AC; + D2xD2 Rt1(Rt.inv()); + D2xD2 D(maxsubdiv2,0,0,lc); + D2xD2 MM = Rt1*D*Rt1.t(); + v0.m = M = Metric(MM.x.x,MM.y.x,MM.y.y); + nbchange++; + } + M = v1; + l = M(AB,AB); + lmax = Max(lmax,l); + if(l> maxsubdiv2) + { R2 AC = M.Orthogonal(AB);// the ortogonal vector of AB in M + double lc = M(AC,AC); + D2xD2 Rt(AB,AC);// Rt.x = AB , Rt.y = AC; + D2xD2 Rt1(Rt.inv()); + D2xD2 D(maxsubdiv2,0,0,lc); + D2xD2 MM = Rt1*D*Rt1.t(); + v1.m = M = Metric(MM.x.x,MM.y.x,MM.y.y); + nbchange++; + } + + } - M = v1; - l = M(AB,AB); - lmax = Max(lmax,l); - if(l> maxsubdiv2) - { R2 AC = M.Orthogonal(AB);// the ortogonal vector of AB in M - double lc = M(AC,AC); - D2xD2 Rt(AB,AC);// Rt.x = AB , Rt.y = AC; - D2xD2 Rt1(Rt.inv()); - D2xD2 D(maxsubdiv2,0,0,lc); - D2xD2 MM = Rt1*D*Rt1.t(); - v1.m = M = Metric(MM.x.x,MM.y.x,MM.y.y); - nbchange++; - } - - } } - } - if(verbosity>3){ - printf(" number of metric changes = %i, maximum number of subdivision of a edges before change = %g\n",nbchange,pow(lmax,0.5)); + if(verbosity>3){ + printf(" number of metric changes = %i, maximum number of subdivision of a edges before change = %g\n",nbchange,pow(lmax,0.5)); + } } -} -/*}}}1*/ + /*}}}1*/ /*FUNCTION Triangles::MetricAt{{{1*/ Metric Triangles::MetricAt(const R2 & A) const { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/MetricAt)*/ + I2 a = toI2(A); Icoor2 deta[3]; @@ -3922,4 +3956,5 @@ /*FUNCTION Triangles::NearestVertex{{{1*/ Vertex * Triangles::NearestVertex(Icoor1 i,Icoor1 j) { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/NearestVertex)*/ return quadtree->NearestVertex(i,j); } @@ -3927,4 +3962,5 @@ /*FUNCTION Triangles::NewPoints{{{1*/ void Triangles::NewPoints(Triangles & Bh,BamgOpts* bamgopts,int KeepVertices){ + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/NewPoints)*/ int i,j,k; @@ -4046,4 +4082,6 @@ /*FUNCTION Triangles::PreInit{{{1*/ void Triangles::PreInit(long inbvx) { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/PreInit)*/ + long int verbosity=0; @@ -4104,4 +4142,6 @@ GeometricalEdge* Triangles::ProjectOnCurve( Edge & BhAB, Vertex & vA, Vertex & vB, double theta,Vertex & R,VertexOnEdge & BR,VertexOnGeom & GR) { + /*Original code from Frederic Hecht (BAMG v1.01, MeshQuad.cpp/ProjectOnCurve)*/ + void *pA=0,*pB=0; double tA=0,tB=0; @@ -4320,4 +4360,6 @@ /*FUNCTION Triangles::ReNumberingTheTriangleBySubDomain{{{1*/ void Triangles::ReNumberingTheTriangleBySubDomain(bool justcompress) { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/ReNumberingTheTriangleBySubDomain)*/ + long int verbosity=0; long *renu= new long[nbt]; @@ -4388,4 +4430,6 @@ /*FUNCTION Triangles::ReNumberingVertex{{{1*/ void Triangles::ReNumberingVertex(long * renu) { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/ReNumberingVertex)*/ + // warning be carfull because pointeur // from on mesh to over mesh @@ -4456,4 +4500,6 @@ /*FUNCTION Triangles::SetIntCoor{{{1*/ void Triangles::SetIntCoor(const char * strfrom) { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/SetIntCoor)*/ + /*Set integer coordinate for existing vertices*/ @@ -4511,4 +4557,6 @@ /*FUNCTION Triangles::ShowRegulaty{{{1*/ void Triangles::ShowRegulaty() const { + /*Original code from Frederic Hecht */ + const double sqrt32=sqrt(3.)*0.5; const double aireKh=sqrt32*0.5; @@ -4575,4 +4623,5 @@ /*FUNCTION Triangles::ShowHistogram{{{1*/ void Triangles::ShowHistogram() const { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/ShowHistogram)*/ const long kmax=10; @@ -4619,4 +4668,6 @@ /*FUNCTION Triangles::SmoothingVertex{{{1*/ void Triangles::SmoothingVertex(int nbiter,double omega ) { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/SmoothingVertex)*/ + long int verbosity=0; // if quatree exist remove it end reconstruct @@ -4659,4 +4710,6 @@ /*FUNCTION Triangles::SmoothMetric{{{1*/ void Triangles::SmoothMetric(double raisonmax) { + /*Original code from Frederic Hecht (BAMG v1.01, Metric.cpp/SmoothMetric)*/ + long int verbosity=0; @@ -4735,4 +4788,6 @@ /*FUNCTION Triangles::SplitElement{{{1*/ int Triangles::SplitElement(int choice){ + /*Original code from Frederic Hecht (BAMG v1.01, MeshQuad.cpp/SplitElement)*/ + long int verbosity=0; @@ -4858,5 +4913,5 @@ vertices[k].DirOfSearch = NoDirOfSearch; - newedges[ie].onGeometry = Gh.Contening(AA,ong); + newedges[ie].onGeometry = Gh.Containing(AA,ong); newedges[ie++].v[1]=vertices+k; @@ -4864,5 +4919,5 @@ newedges[ie].adj[0]=newedges + ie -1; newedges[ie].adj[1]=newedges+(edges[i].adj[1]-edges) ; - newedges[ie].onGeometry = Gh.Contening(BB,ong); + newedges[ie].onGeometry = Gh.Containing(BB,ong); newedges[ie++].v[0]=vertices+k; k++; @@ -5243,4 +5298,6 @@ /*FUNCTION Triangles::SplitInternalEdgeWithBorderVertices{{{1*/ long Triangles::SplitInternalEdgeWithBorderVertices(){ + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/SplitInternalEdgeWithBorderVertices)*/ + long NbSplitEdge=0; SetVertexFieldOn(); @@ -5312,4 +5369,6 @@ /*FUNCTION Triangles::TriangleReferenceList{{{1*/ long Triangles::TriangleReferenceList(long* reft) const { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/ConsRefTriangle)*/ + long int verbosity=0; register Triangle *t0,*t; @@ -5350,4 +5409,6 @@ /*FUNCTION Triangles::UnCrack{{{1*/ int Triangles::UnCrack() { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/UnCrack)*/ + if (NbCrackedEdges!=0 && NbCrackedVertices<=0);{ throw ErrorException(__FUNCT__,exprintf("NbCrackedEdges ==0 || NbCrackedVertices >0")); @@ -5362,4 +5423,5 @@ /*FUNCTION swap{{{1*/ void swap(Triangle *t1,short a1, Triangle *t2,short a2, Vertex *s1,Vertex *s2,Icoor2 det1,Icoor2 det2){ + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/swap)*/ // -------------------------------------------------------------- // short a2=aa[a];// les 2 numero de l arete dans les 2 triangles @@ -5406,4 +5468,6 @@ /*FUNCTION CloseBoundaryEdge{{{1*/ TriangleAdjacent CloseBoundaryEdge(I2 A,Triangle *t, double &a,double &b) { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/CloseBoundaryEdge)*/ + int k=(*t)(0) ? (( (*t)(1) ? ( (*t)(2) ? -1 : 2) : 1 )) : 0; int dir=0; @@ -5444,4 +5508,5 @@ /*FUNCTION CloseBoundaryEdgeV2{{{1*/ TriangleAdjacent CloseBoundaryEdgeV2(I2 C,Triangle *t, double &a,double &b) { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/CloseBoundaryEdgeV2)*/ // walk around the vertex // version 2 for remove the probleme if we fill the hole @@ -5592,4 +5657,5 @@ /*FUNCTION AGoodNumberPrimeWith{{{1*/ long AGoodNumberPrimeWith(long n){ + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/AGoodNumberPrimeWith)*/ //list of big prime numbers @@ -5621,4 +5687,5 @@ /*FUNCTION SwapForForcingEdge{{{1*/ int SwapForForcingEdge(Vertex * & pva ,Vertex * & pvb ,TriangleAdjacent & tt1,Icoor2 & dets1, Icoor2 & detsa,Icoor2 & detsb, int & NbSwap) { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/SwapForForcingEdge)*/ // l'arete ta coupe l'arete pva pvb // de cas apres le swap sa coupe toujours @@ -5707,6 +5774,7 @@ /*}}}1*/ /*FUNCTION ForceEdge{{{1*/ - int ForceEdge(Vertex &a, Vertex & b,TriangleAdjacent & taret) { + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/ForceEdge)*/ + int NbSwap =0; if (!a.t || !b.t){ // the 2 vertex is in a mesh Index: /issm/trunk/src/c/Bamgx/objects/Vertex.cpp =================================================================== --- /issm/trunk/src/c/Bamgx/objects/Vertex.cpp (revision 3245) +++ /issm/trunk/src/c/Bamgx/objects/Vertex.cpp (revision 3246) @@ -15,4 +15,5 @@ /*FUNCTION Vertex::Smoothing{{{1*/ double Vertex::Smoothing(Triangles &Th,const Triangles &BTh,Triangle* &tstart ,double omega){ + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp/Smoothing)*/ register Vertex* s=this; @@ -212,4 +213,6 @@ /*FUNCTION QuadQuality{{{1*/ double QuadQuality(const Vertex & a,const Vertex &b,const Vertex &c,const Vertex &d) { + /*Original code from Frederic Hecht (BAMG v1.01, MeshQuad.cpp/QuadQuality)*/ + // calcul de 4 angles -- R2 A((R2)a),B((R2)b),C((R2)c),D((R2)d); Index: /issm/trunk/src/c/Bamgx/shared/FindTriangleAdjacent.h =================================================================== --- /issm/trunk/src/c/Bamgx/shared/FindTriangleAdjacent.h (revision 3245) +++ /issm/trunk/src/c/Bamgx/shared/FindTriangleAdjacent.h (revision 3246) @@ -8,4 +8,6 @@ inline TriangleAdjacent FindTriangleAdjacent(Edge &E){ + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp)*/ + Vertex * a = E.v[0]; Vertex * b = E.v[1]; Index: /issm/trunk/src/c/Bamgx/shared/TheVertex.h =================================================================== --- /issm/trunk/src/c/Bamgx/shared/TheVertex.h (revision 3245) +++ /issm/trunk/src/c/Bamgx/shared/TheVertex.h (revision 3246) @@ -8,4 +8,6 @@ inline Vertex* TheVertex(Vertex * a){// for remove crak in mesh + /*Original code from Frederic Hecht (BAMG v1.01, Mesh2.cpp)*/ + // give a unique vertex with smallest number // in case on crack in mesh