2013 |
real_t norm1=Norm(*A-*P[1]); |
real_t norm1=Norm(*A-*P[1]); |
2014 |
if(norm1<norm0) { |
if(norm1<norm0) { |
2015 |
ffout(4)<<"--------------- cas inverse\n"; |
ffout(4)<<"--------------- cas inverse\n"; |
2016 |
//P[0]=P[1]; |
P[0]=P[1]; |
2017 |
} |
} |
2018 |
} |
} |
2019 |
} |
} |
2556 |
} |
} |
2557 |
} else if(K.isInTriangle[0]+K.isInTriangle[1]+K.isInTriangle[2]==3) { |
} else if(K.isInTriangle[0]+K.isInTriangle[1]+K.isInTriangle[2]==3) { |
2558 |
ffout(4)<<"----------------- cas 3 in\n"; |
ffout(4)<<"----------------- cas 3 in\n"; |
2559 |
|
ffout(4)<<"place "<<place<<"\n"; |
2560 |
|
ffout(4)<<K(0)<<"\n"; |
2561 |
|
ffout(4)<<K(1)<<"\n"; |
2562 |
|
ffout(4)<<K(2)<<"\n"; |
2563 |
|
|
2564 |
size_t number=K.edgecut[0][0]+K.edgecut[1][0]+K.edgecut[2][0]; |
size_t number=K.edgecut[0][0]+K.edgecut[1][0]+K.edgecut[2][0]; |
2565 |
if(number==1) { |
if(number==1) { |
2566 |
TinyVector<2,const Vertex*> P; |
TinyVector<2,const Vertex*> P; |
2608 |
} |
} |
2609 |
} |
} |
2610 |
} |
} |
2611 |
|
|
2612 |
//on rajoute le 3e sommets |
//on rajoute le 3e sommets |
2613 |
size_t in2=0; |
size_t in2=0; |
2614 |
if(in+in1==1) { |
if(in+in1==1) { |
2626 |
} else { |
} else { |
2627 |
pointslist2.push_back(P[1]); |
pointslist2.push_back(P[1]); |
2628 |
} |
} |
2629 |
|
|
2630 |
|
//verif des listes |
2631 |
|
ffout(4)<<"taille de list1 = "<<pointslist1.size()<<"\n"; |
2632 |
|
for(unsigned ie=0;ie<pointslist1.size();++ie) { |
2633 |
|
ffout(4)<<*pointslist1[ie]<<"\n"; |
2634 |
|
} |
2635 |
|
ffout(4)<<"taille de list2 = "<<pointslist2.size()<<"\n"; |
2636 |
|
for(unsigned ie=0;ie<pointslist2.size();++ie) { |
2637 |
|
ffout(4)<<*pointslist2[ie]<<"\n"; |
2638 |
|
} |
2639 |
|
|
2640 |
//on cree les 2 maillages |
//on cree les 2 maillages |
2641 |
if(pointslist1.size()>=3) { |
if(pointslist1.size()>=3) { |
2642 |
std::vector<Vertex> pointslist1plan(pointslist1.size()); |
std::vector<Vertex> pointslist1plan(pointslist1.size()); |