Commit 68c88362 authored by pitiot's avatar pitiot

merge untereiner

parent a9a12bbf
......@@ -697,7 +697,7 @@ void sqrt3Vol(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typena
DartMarkerStore<MAP> m(map);
CellMarkerStore<MAP,VERTEX> newBoundaryV(map);
DartMarkerStore<MAP> newBoundaryV(map);
//
// 1-4 flip of all tetrahedra
......@@ -709,7 +709,7 @@ void sqrt3Vol(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typena
for(Dart ditWF = tWF.begin() ; ditWF != tWF.end() ; ditWF = tWF.next())
{
if(!map.isBoundaryFace(ditWF) && !m.isMarked(ditWF))
m.markOrbit<FACE>(ditWF);
m.markOrbit<FACE>(ditWF);
}
VEC3 volCenter(0.0);
......@@ -742,7 +742,7 @@ void sqrt3Vol(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typena
TraversorW<MAP> tWb(map);
for(Dart dit = tWb.begin() ; dit != tWb.end() ; dit = tWb.next())
{
if(map.isVolumeIncidentToBoundary(dit))
if(map.isBoundaryAdjacentVolume(dit))
{
Traversor3WE<MAP> tWE(map, dit);
for(Dart ditWE = tWE.begin() ; ditWE != tWE.end() ; ditWE = tWE.next())
......@@ -760,7 +760,7 @@ void sqrt3Vol(typename PFP::MAP& map, VertexAttribute<typename PFP::VEC3, typena
Dart dres = Volume::Modelisation::Tetrahedralization::flip1To3<PFP>(map, dit);
position[dres] = faceCenter;
newBoundaryV.mark(dres);
newBoundaryV.markOrbit<VERTEX>(dres);
}
}
......
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