Commit fda2918a authored by untereiner's avatar untereiner

merge

parent 569c7111
......@@ -1239,20 +1239,20 @@ void Map3::reverseOrientation()
void Map3::computeDual()
{
unsigned int count = 0;
CellMarkerNoUnmark<VERTEX> cv(*this);
std::vector<Dart> v;
for(Dart d = begin(); d != end(); next(d))
{
if(!cv.isMarked(d) && isBoundaryMarked3(d))
{
++count;
v.push_back(d);
cv.mark(d);
}
}
std::cout << "boundary vertices : " << count << std::endl;
// unsigned int count = 0;
// CellMarkerNoUnmark<VERTEX> cv(*this);
// std::vector<Dart> v;
// for(Dart d = begin(); d != end(); next(d))
// {
// if(!cv.isMarked(d) && isBoundaryMarked3(d))
// {
// ++count;
// v.push_back(d);
// cv.mark(d);
// }
// }
//
// std::cout << "boundary vertices : " << count << std::endl;
DartAttribute<Dart> old_phi1 = getAttribute<Dart, DART>("phi1") ;
DartAttribute<Dart> old_phi_1 = getAttribute<Dart, DART>("phi_1") ;
......@@ -1283,28 +1283,28 @@ void Map3::computeDual()
swapEmbeddingContainers(VERTEX, VOLUME) ;
for(std::vector<Dart>::iterator it = v.begin() ; it != v.end() ; ++it)
{
boundaryUnmarkOrbit<VOLUME,3>(*it);
}
// for(std::vector<Dart>::iterator it = v.begin() ; it != v.end() ; ++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);
}
closeMap();
// //boundary management
// for(Dart d = begin(); d != end(); next(d))
// {
// if(isBoundaryMarked3(d))
// {
// //boundaryMarkOrbit<VOLUME,3>(d) ;//deleteVertex(d));
if(isBoundaryMarked3(d))
{
boundaryMarkOrbit<VOLUME,3>(deleteVertex(phi1(d)));
// boundaryUnmarkOrbit<VOLUME,3>(d);
// deleteVolume(d);
// }
// }
}
}
// 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