Skip to content
Snippets Groups Projects
Commit d88f3b20 authored by Jean-François Remacle's avatar Jean-François Remacle
Browse files

*** empty log message ***

parent 8abfafbc
No related branches found
No related tags found
No related merge requests found
......@@ -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;
// }
// }
// }
// }
;
}
......
......@@ -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++) {
......
......@@ -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);
......
......@@ -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 {{}};
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment