diff --git a/Geo/discreteEdge.cpp b/Geo/discreteEdge.cpp index 64a3689326d958d2d6ebb34fe800ae91caeae695..c80ed0254d2f6a4b7d171dc5698ea44935499a17 100644 --- a/Geo/discreteEdge.cpp +++ b/Geo/discreteEdge.cpp @@ -214,6 +214,7 @@ void discreteEdge::parametrize() printf("dans discrete edge %d line.size =%d \n", this->tag(), lines.size()); +// create new MEdge Vertices // std::vector<MVertex*> new_mshv; // for(int i = 0; i < mesh_vertices.size(); i++){ // MVertex *v = mesh_vertices[i]; @@ -225,37 +226,10 @@ void discreteEdge::parametrize() // } // mesh_vertices = new_mshv; -// std::vector<MVertex*> new_mshv; -// for(int i = 0; i < mesh_vertices.size(); i++){ -// MVertex *vi = mesh_vertices[i]; -// MVertex *mev = new MEdgeVertex(vi->x(),vi->y(),vi->z(), this, i+1); -// new_mshv.push_back(mev); -// mev->setNum(vi->getNum()); - -// newLines.push_back(new MLine(v1, newv)); -// newLines.push_back(new MLine(newv, v2)); -// delete ge->lines[i]; -// for(std::list<GFace*>::iterator it = l_faces.begin(); it != l_faces.end(); ++it){ -// for (unsigned int i = 0; i < (*it)->triangles.size(); ++i){ -// MTriangle *t = (*it)->triangles[i]; -// for (int j = 0; j < 3; j++){ -// MVertex *v = t->getVertex(j); -// if (v == vi) v = mev; -// } -// } -// } -// delete vi ; -// } -// mesh_vertices = new_mshv; +// we should loop over Mlines and MTrinagles to take those new MEdgeVertices into account -// std::vector<MLine*> newLines; -// newLines.push_back(new MLine(v1, newv)); -// delete lines[i]; -// newLines.push_back(new MLine(newv, v2)); -// lines = newLines; - // for (int i = 0; i < mesh_vertices.size(); i++){ // double t1; // mesh_vertices[i]->getParameter(0,t1); @@ -266,7 +240,30 @@ void discreteEdge::parametrize() // printf("** AFTER LINES v1=%d v2=%d\n", lines[i]->getVertex(0)->getIndex(), lines[i]->getVertex(1)->getIndex() ); // } - //exit(1); + //exit(1) + + +// du brol ci-dessous ... +// std::vector<MLine*> newLines; +// newLines.push_back(new MLine(v1, newv)); +// delete lines[i]; +// lines = newLines; + +// for(int i = 0; i < mesh_vertices.size(); i++){ +// for(std::list<GFace*>::iterator it = l_faces.begin(); it != l_faces.end(); ++it){ +// for (unsigned int i = 0; i < (*it)->triangles.size(); ++i){ +// MTriangle *t = (*it)->triangles[i]; +// for (int j = 0; j < 3; j++){ +// MVertex *v = t->getVertex(j); +// if (v == vi) v = mev; +// } +// } +// } +// } + + + +; } diff --git a/Geo/discreteFace.cpp b/Geo/discreteFace.cpp index 0ea510ebc20d2b7b00744ad6e09aec3efc822a2e..d6927f745a554858c9fa8b81e6ad261fc6be1f0b 100644 --- a/Geo/discreteFace.cpp +++ b/Geo/discreteFace.cpp @@ -25,8 +25,7 @@ discreteFace::discreteFace(GModel *model, int num) : GFace(model, num) void discreteFace::setBoundEdges(std::vector<discreteEdge*> discr_edges) { - printf("***** In discrete Face: \n"); - + printf("***** In discrete Face: \n"); printf("bound edges =%d \n", edges().size()); for (std::vector<discreteEdge*>::iterator it = discr_edges.begin(); it != discr_edges.end(); it++) { diff --git a/Mesh/meshGEdge.cpp b/Mesh/meshGEdge.cpp index b0de7f0384c897fb01f530169d5df8aa97fd9daf..c178903607730177677e83c2c8dca768b1e54dde 100644 --- a/Mesh/meshGEdge.cpp +++ b/Mesh/meshGEdge.cpp @@ -207,6 +207,8 @@ static double Integration(GEdge *ge, double t1, double t2, double (*f) (GEdge *e, double X), std::vector<IntPoint> &Points, double Prec) { + + IntPoint from, to; int depth = 0; @@ -249,7 +251,7 @@ void meshGEdge::operator() (GEdge *ge) if(MeshExtrudedCurve(ge)) return; - Msg::Info("Meshing curve %d (%s)", ge->tag(), ge->getTypeString().c_str()); + Msg::Info("** Meshing curve %d (%s)", ge->tag(), ge->getTypeString().c_str()); // compute bounds Range<double> bounds = ge->parBounds(0); diff --git a/benchmarks/2d/square.geo b/benchmarks/2d/square.geo index 7b918bce3e34d653d05aae7ff9b825ad319c4fa6..6fa7083a5cafea225eb732e7eb90f59156a74f1b 100644 --- a/benchmarks/2d/square.geo +++ b/benchmarks/2d/square.geo @@ -11,7 +11,7 @@ Line(4) = {1, 2}; Line Loop(5) = {1, 2, 3, 4}; Plane Surface(10) = {5}; -Compound Line(150)={1,2}; -Compound Line(160)={3,4}; +//Compound Line(150)={1,2}; +//Compound Line(160)={3,4}; -Compound Surface(170)={10} Boundary {{}}; +//Compound Surface(170)={10} Boundary {{}};