Skip to content
Snippets Groups Projects
Commit 2afbbda5 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

new MEdgeVertex constructor

parent 5ef5987d
No related branches found
No related tags found
No related merge requests found
...@@ -514,7 +514,7 @@ int GeomMeshMatcher::forceTomatch(GModel *geom, GModel *mesh, const double TOL) ...@@ -514,7 +514,7 @@ int GeomMeshMatcher::forceTomatch(GModel *geom, GModel *mesh, const double TOL)
found=1; found=1;
// printf("vertex %d matches GEdge %d on position %g\n",v->getNum(),gg->tag(),gp.u()); // printf("vertex %d matches GEdge %d on position %g\n",v->getNum(),gg->tag(),gp.u());
gg->mesh_vertices.push_back(new MEdgeVertex (gp.x(), gp.y(), gp.z(), gg->mesh_vertices.push_back(new MEdgeVertex (gp.x(), gp.y(), gp.z(),
gg,gp.u(),-1.,v->getNum())); gg, gp.u(), v->getNum()));
} }
} }
if (!found && v->onWhat()->dim() <= 2){ if (!found && v->onWhat()->dim() <= 2){
...@@ -679,7 +679,6 @@ static void copy_vertices (GEdge* to, GEdge* from, std::map<MVertex*,MVertex*> & ...@@ -679,7 +679,6 @@ static void copy_vertices (GEdge* to, GEdge* from, std::map<MVertex*,MVertex*> &
double t; double t;
GPoint gp = to->closestPoint(SPoint3(v_from->x(),v_from->y(),v_from->z()), t); GPoint gp = to->closestPoint(SPoint3(v_from->x(),v_from->y(),v_from->z()), t);
MEdgeVertex *v_to = new MEdgeVertex(gp.x(),gp.y(),gp.z(), to, gp.u()); MEdgeVertex *v_to = new MEdgeVertex(gp.x(),gp.y(),gp.z(), to, gp.u());
to->mesh_vertices.push_back(v_to); to->mesh_vertices.push_back(v_to);
_mesh_to_geom[v_from] = v_to; _mesh_to_geom[v_from] = v_to;
} }
......
...@@ -295,7 +295,7 @@ void discreteEdge::parametrize(std::map<GFace*, std::map<MVertex*, MVertex*, ...@@ -295,7 +295,7 @@ void discreteEdge::parametrize(std::map<GFace*, std::map<MVertex*, MVertex*,
MVertex *vR = lines[i]->getVertex(_orientation[i]); MVertex *vR = lines[i]->getVertex(_orientation[i]);
int param = i+1; int param = i+1;
MVertex *vNEW = new MEdgeVertex(vR->x(),vR->y(),vR->z(), this, MVertex *vNEW = new MEdgeVertex(vR->x(),vR->y(),vR->z(), this,
param, -1., vR->getNum()); param, vR->getNum());
old2new.insert(std::make_pair(vR,vNEW)); old2new.insert(std::make_pair(vR,vNEW));
newVertices.push_back(vNEW); newVertices.push_back(vNEW);
newLines.push_back(new MLine(vL, vNEW)); newLines.push_back(new MLine(vL, vNEW));
...@@ -378,7 +378,7 @@ void discreteEdge::parametrize(std::map<MVertex*, MVertex*>& old2new) ...@@ -378,7 +378,7 @@ void discreteEdge::parametrize(std::map<MVertex*, MVertex*>& old2new)
else vR = lines[i]->getVertex(0); else vR = lines[i]->getVertex(0);
int param = i+1; int param = i+1;
MVertex *vNEW = new MEdgeVertex(vR->x(),vR->y(),vR->z(), this, MVertex *vNEW = new MEdgeVertex(vR->x(),vR->y(),vR->z(), this,
param, -1., vR->getNum()); param, vR->getNum());
old2new.insert(std::make_pair(vR,vNEW)); old2new.insert(std::make_pair(vR,vNEW));
newVertices.push_back(vNEW); newVertices.push_back(vNEW);
newLines.push_back(new MLine(vL, vNEW)); newLines.push_back(new MLine(vL, vNEW));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment