Commit fda2918a authored by untereiner's avatar untereiner

merge

parent 569c7111
...@@ -1239,20 +1239,20 @@ void Map3::reverseOrientation() ...@@ -1239,20 +1239,20 @@ void Map3::reverseOrientation()
void Map3::computeDual() void Map3::computeDual()
{ {
unsigned int count = 0; // unsigned int count = 0;
CellMarkerNoUnmark<VERTEX> cv(*this); // CellMarkerNoUnmark<VERTEX> cv(*this);
std::vector<Dart> v; // std::vector<Dart> v;
for(Dart d = begin(); d != end(); next(d)) // for(Dart d = begin(); d != end(); next(d))
{ // {
if(!cv.isMarked(d) && isBoundaryMarked3(d)) // if(!cv.isMarked(d) && isBoundaryMarked3(d))
{ // {
++count; // ++count;
v.push_back(d); // v.push_back(d);
cv.mark(d); // cv.mark(d);
} // }
} // }
//
std::cout << "boundary vertices : " << count << std::endl; // std::cout << "boundary vertices : " << count << std::endl;
DartAttribute<Dart> old_phi1 = getAttribute<Dart, DART>("phi1") ; DartAttribute<Dart> old_phi1 = getAttribute<Dart, DART>("phi1") ;
DartAttribute<Dart> old_phi_1 = getAttribute<Dart, DART>("phi_1") ; DartAttribute<Dart> old_phi_1 = getAttribute<Dart, DART>("phi_1") ;
...@@ -1283,28 +1283,28 @@ void Map3::computeDual() ...@@ -1283,28 +1283,28 @@ void Map3::computeDual()
swapEmbeddingContainers(VERTEX, VOLUME) ; swapEmbeddingContainers(VERTEX, VOLUME) ;
for(std::vector<Dart>::iterator it = v.begin() ; it != v.end() ; ++it) // for(std::vector<Dart>::iterator it = v.begin() ; it != v.end() ; ++it)
{ // {
boundaryUnmarkOrbit<VOLUME,3>(*it); // boundaryUnmarkOrbit<VOLUME,3>(*it);
} // }
//
// for(std::vector<Dart>::iterator it = v.begin() ; it != v.end() ; ++it)
// {
// deleteVolume(*it);
// }
//
// closeMap();
for(std::vector<Dart>::iterator it = v.begin() ; it != v.end() ; ++it) //boundary management
for(Dart d = begin(); d != end(); next(d))
{ {
deleteVolume(*it); if(isBoundaryMarked3(d))
} {
boundaryMarkOrbit<VOLUME,3>(deleteVertex(phi1(d)));
closeMap();
// //boundary management
// for(Dart d = begin(); d != end(); next(d))
// {
// if(isBoundaryMarked3(d))
// {
// //boundaryMarkOrbit<VOLUME,3>(d) ;//deleteVertex(d));
// boundaryUnmarkOrbit<VOLUME,3>(d); // boundaryUnmarkOrbit<VOLUME,3>(d);
// deleteVolume(d); // deleteVolume(d);
// } }
// } }
// closeMap(); // closeMap();
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment