Commit 4e02c829 authored by untereiner's avatar untereiner

passage de CellMarker a CellMarkerGen dans particle_cell_3d

parent bb0b8d09
...@@ -673,7 +673,7 @@ void coarsenVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position ...@@ -673,7 +673,7 @@ void coarsenVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position
visitedFaces.reserve(20); visitedFaces.reserve(20);
visitedFaces.push_back(d); visitedFaces.push_back(d);
mf.markOrbit(FACE_ORBIT, d) ; mf.markOrbit(FACE, d) ;
for(std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face) for(std::vector<Dart>::iterator face = visitedFaces.begin(); face != visitedFaces.end(); ++face)
{ {
...@@ -685,7 +685,7 @@ void coarsenVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position ...@@ -685,7 +685,7 @@ void coarsenVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position
if(!mf.isMarked(ee)) // not already marked if(!mf.isMarked(ee)) // not already marked
{ {
visitedFaces.push_back(ee) ; visitedFaces.push_back(ee) ;
mf.markOrbit(FACE_ORBIT, ee) ; mf.markOrbit(FACE, ee) ;
} }
e = map.phi1(e) ; e = map.phi1(e) ;
......
...@@ -79,11 +79,11 @@ public : ...@@ -79,11 +79,11 @@ public :
bool isRightDFace(VEC3 c, Dart d, VEC3 base, VEC3 normal); bool isRightDFace(VEC3 c, Dart d, VEC3 base, VEC3 normal);
Dart nextDartOfVertexNotMarked(Dart d, CellMarker& mark); Dart nextDartOfVertexNotMarked(Dart d, CellMarkerGen& mark);
Dart nextNonPlanar(Dart d); Dart nextNonPlanar(Dart d);
Dart nextFaceNotMarked(Dart d,CellMarker& mark); Dart nextFaceNotMarked(Dart d,CellMarkerGen& mark);
Geom::Orientation3D whichSideOfEdge(VEC3 c, Dart d); Geom::Orientation3D whichSideOfEdge(VEC3 c, Dart d);
......
...@@ -117,7 +117,7 @@ bool ParticleCell3D<PFP>::isRightDFace(VEC3 c, Dart d, VEC3 base, VEC3 normal) ...@@ -117,7 +117,7 @@ bool ParticleCell3D<PFP>::isRightDFace(VEC3 c, Dart d, VEC3 base, VEC3 normal)
template <typename PFP> template <typename PFP>
Dart ParticleCell3D<PFP>::nextDartOfVertexNotMarked(Dart d, CellMarker& mark) Dart ParticleCell3D<PFP>::nextDartOfVertexNotMarked(Dart d, CellMarkerGen& mark)
{ {
// lock a marker // lock a marker
Dart d1; Dart d1;
...@@ -221,7 +221,7 @@ Dart ParticleCell3D<PFP>::nextNonPlanar(Dart d) ...@@ -221,7 +221,7 @@ Dart ParticleCell3D<PFP>::nextNonPlanar(Dart d)
} }
template <typename PFP> template <typename PFP>
Dart ParticleCell3D<PFP>::nextFaceNotMarked(Dart d,CellMarker& mark) Dart ParticleCell3D<PFP>::nextFaceNotMarked(Dart d, CellMarkerGen& mark)
{ {
// lock a marker // lock a marker
Dart d1; Dart d1;
......
...@@ -672,7 +672,7 @@ unsigned int Map3::vertexDegree(Dart d) ...@@ -672,7 +672,7 @@ unsigned int Map3::vertexDegree(Dart d)
if(!me.isMarked(*darts)) if(!me.isMarked(*darts))
{ {
++count; ++count;
me.markOrbit(EDGE_ORBIT, *darts); me.markOrbit(EDGE, *darts);
} }
} }
......
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