passage de CellMarker a CellMarkerGen dans particle_cell_3d

include/Algo/ImplicitHierarchicalMesh/subdivision3.hpp

@@ -673,7 +673,7 @@ void coarsenVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position
 	visitedFaces.reserve(20);
 	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)
 	{
@@ -685,7 +685,7 @@ void coarsenVolume(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position
 			if(!mf.isMarked(ee)) // not already marked
 			{
 				visitedFaces.push_back(ee) ;
-				mf.markOrbit(FACE_ORBIT, ee) ;
+				mf.markOrbit(FACE, ee) ;
 			}
 
 			e = map.phi1(e) ;

include/Algo/MovingObjects/particle_cell_3D.h

@@ -79,11 +79,11 @@ public :
 
 	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 nextFaceNotMarked(Dart d,CellMarker& mark);
+	Dart nextFaceNotMarked(Dart d,CellMarkerGen& mark);
 
 	Geom::Orientation3D whichSideOfEdge(VEC3 c, Dart d);
 

include/Algo/MovingObjects/particle_cell_3D.hpp

@@ -117,7 +117,7 @@ bool ParticleCell3D<PFP>::isRightDFace(VEC3 c, Dart d, VEC3 base, VEC3 normal)
 
 
 template <typename PFP>
-Dart ParticleCell3D<PFP>::nextDartOfVertexNotMarked(Dart d, CellMarker& mark)
+Dart ParticleCell3D<PFP>::nextDartOfVertexNotMarked(Dart d, CellMarkerGen& mark)
 {
 	// lock a marker
 	Dart d1;
@@ -221,7 +221,7 @@ Dart ParticleCell3D<PFP>::nextNonPlanar(Dart d)
 }
 
 template <typename PFP>
-Dart ParticleCell3D<PFP>::nextFaceNotMarked(Dart d,CellMarker& mark)
+Dart ParticleCell3D<PFP>::nextFaceNotMarked(Dart d, CellMarkerGen& mark)
 {
 	// lock a marker
 	Dart d1;

src/Topology/map/map3.cpp

@@ -672,7 +672,7 @@ unsigned int Map3::vertexDegree(Dart d)
 		if(!me.isMarked(*darts))
 		{
 			++count;
-			me.markOrbit(EDGE_ORBIT, *darts);
+			me.markOrbit(EDGE, *darts);
 		}
 	}