Commit 38233cd7 authored by Lionel Untereiner's avatar Lionel Untereiner

Fix thread parameter in ihm3.h/.hpp

parent 997d253d
......@@ -119,45 +119,45 @@ public:
inline void next(Dart& d) const ;
template <unsigned int ORBIT, typename FUNC>
void foreach_dart_of_orbit(Cell<ORBIT> c, FUNC f, unsigned int thread = 0) const ;
void foreach_dart_of_orbit(Cell<ORBIT> c, FUNC f) const ;
template <unsigned int ORBIT, typename FUNC>
void foreach_dart_of_orbit(Cell<ORBIT> c, FUNC& f, unsigned int thread = 0) const ;
void foreach_dart_of_orbit(Cell<ORBIT> c, FUNC& f) const ;
template <typename FUNC>
void foreach_dart_of_vertex(Dart d, FUNC& f, unsigned int thread = 0) const ;
void foreach_dart_of_vertex(Dart d, FUNC& f) const ;
template <typename FUNC>
void foreach_dart_of_edge(Dart d, FUNC& f, unsigned int thread = 0) const ;
void foreach_dart_of_edge(Dart d, FUNC& f) const ;
template <typename FUNC>
void foreach_dart_of_oriented_face(Dart d, FUNC& f, unsigned int thread = 0) const;
void foreach_dart_of_oriented_face(Dart d, FUNC& f) const;
template <typename FUNC>
void foreach_dart_of_face(Dart d, FUNC& f, unsigned int thread = 0) const ;
void foreach_dart_of_face(Dart d, FUNC& f) const ;
template <typename FUNC>
void foreach_dart_of_oriented_volume(Dart d, FUNC& f, unsigned int thread = 0) const;
void foreach_dart_of_oriented_volume(Dart d, FUNC& f) const;
template <typename FUNC>
void foreach_dart_of_volume(Dart d, FUNC& f, unsigned int thread = 0) const ;
void foreach_dart_of_volume(Dart d, FUNC& f) const ;
template <typename FUNC>
void foreach_dart_of_vertex1(Dart d, FUNC& f, unsigned int thread = 0) const;
void foreach_dart_of_vertex1(Dart d, FUNC& f) const;
template <typename FUNC>
void foreach_dart_of_edge1(Dart d, FUNC& f, unsigned int thread = 0) const;
void foreach_dart_of_edge1(Dart d, FUNC& f) const;
template <typename FUNC>
void foreach_dart_of_vertex2(Dart d, FUNC& f, unsigned int thread = 0) const;
void foreach_dart_of_vertex2(Dart d, FUNC& f) const;
template <typename FUNC>
void foreach_dart_of_edge2(Dart d, FUNC& f, unsigned int thread = 0) const;
void foreach_dart_of_edge2(Dart d, FUNC& f) const;
template <typename FUNC>
void foreach_dart_of_face2(Dart d, FUNC& f, unsigned int thread = 0) const;
void foreach_dart_of_face2(Dart d, FUNC& f) const;
template <typename FUNC>
void foreach_dart_of_cc(Dart d, FUNC& f, unsigned int thread = 0) const ;
void foreach_dart_of_cc(Dart d, FUNC& f) const ;
/***************************************************
* MAP MANIPULATION *
......
......@@ -213,47 +213,47 @@ inline void ImplicitHierarchicalMap3::next(Dart& d) const
}
template <unsigned int ORBIT, typename FUNC>
void ImplicitHierarchicalMap3::foreach_dart_of_orbit(Cell<ORBIT> c, FUNC f, unsigned int thread) const
void ImplicitHierarchicalMap3::foreach_dart_of_orbit(Cell<ORBIT> c, FUNC f) const
{
switch(ORBIT)
{
case DART: f(c); break;
case VERTEX: foreach_dart_of_vertex(c, f, thread); break;
case EDGE: foreach_dart_of_edge(c, f, thread); break;
case FACE: foreach_dart_of_face(c, f, thread); break;
case VOLUME: foreach_dart_of_volume(c, f, thread); break;
case VERTEX1: foreach_dart_of_vertex1(c, f, thread); break;
case EDGE1: foreach_dart_of_edge1(c, f, thread); break;
case VERTEX2: foreach_dart_of_vertex2(c, f, thread); break;
case EDGE2: foreach_dart_of_edge2(c, f, thread); break;
case FACE2: foreach_dart_of_face2(c, f, thread); break;
case VERTEX: foreach_dart_of_vertex(c, f); break;
case EDGE: foreach_dart_of_edge(c, f); break;
case FACE: foreach_dart_of_face(c, f); break;
case VOLUME: foreach_dart_of_volume(c, f); break;
case VERTEX1: foreach_dart_of_vertex1(c, f); break;
case EDGE1: foreach_dart_of_edge1(c, f); break;
case VERTEX2: foreach_dart_of_vertex2(c, f); break;
case EDGE2: foreach_dart_of_edge2(c, f); break;
case FACE2: foreach_dart_of_face2(c, f); break;
default: assert(!"Cells of this dimension are not handled"); break;
}
}
template <unsigned int ORBIT, typename FUNC>
void ImplicitHierarchicalMap3::foreach_dart_of_orbit(Cell<ORBIT> c, FUNC& f, unsigned int thread) const
void ImplicitHierarchicalMap3::foreach_dart_of_orbit(Cell<ORBIT> c, FUNC& f) const
{
switch(ORBIT)
{
case DART: f(c); break;
case VERTEX: foreach_dart_of_vertex(c, f, thread); break;
case EDGE: foreach_dart_of_edge(c, f, thread); break;
case FACE: foreach_dart_of_face(c, f, thread); break;
case VOLUME: foreach_dart_of_volume(c, f, thread); break;
case VERTEX1: foreach_dart_of_vertex1(c, f, thread); break;
case EDGE1: foreach_dart_of_edge1(c, f, thread); break;
case VERTEX2: foreach_dart_of_vertex2(c, f, thread); break;
case EDGE2: foreach_dart_of_edge2(c, f, thread); break;
case FACE2: foreach_dart_of_face2(c, f, thread); break;
case VERTEX: foreach_dart_of_vertex(c, f); break;
case EDGE: foreach_dart_of_edge(c, f); break;
case FACE: foreach_dart_of_face(c, f); break;
case VOLUME: foreach_dart_of_volume(c, f); break;
case VERTEX1: foreach_dart_of_vertex1(c, f); break;
case EDGE1: foreach_dart_of_edge1(c, f); break;
case VERTEX2: foreach_dart_of_vertex2(c, f); break;
case EDGE2: foreach_dart_of_edge2(c, f); break;
case FACE2: foreach_dart_of_face2(c, f); break;
default: assert(!"Cells of this dimension are not handled"); break;
}
}
template <typename FUNC>
inline void ImplicitHierarchicalMap3::foreach_dart_of_vertex(Dart d, FUNC& f, unsigned int thread) const
inline void ImplicitHierarchicalMap3::foreach_dart_of_vertex(Dart d, FUNC& f) const
{
DartMarkerStore<Map3> mv(*this, thread); // Lock a marker
DartMarkerStore<Map3> mv(*this); // Lock a marker
std::vector<Dart> darts; // Darts that are traversed
darts.reserve(256);
......@@ -283,17 +283,17 @@ inline void ImplicitHierarchicalMap3::foreach_dart_of_vertex(Dart d, FUNC& f, un
}
template <typename FUNC>
inline void ImplicitHierarchicalMap3::foreach_dart_of_edge(Dart d, FUNC& f, unsigned int thread) const
inline void ImplicitHierarchicalMap3::foreach_dart_of_edge(Dart d, FUNC& f) const
{
Dart dNext = d;
do {
foreach_dart_of_edge2(dNext, f, thread);
foreach_dart_of_edge2(dNext, f);
dNext = alpha2(dNext);
} while (dNext != d);
}
template <typename FUNC>
inline void ImplicitHierarchicalMap3::foreach_dart_of_oriented_face(Dart d, FUNC& f, unsigned int /*thread*/) const
inline void ImplicitHierarchicalMap3::foreach_dart_of_oriented_face(Dart d, FUNC& f) const
{
Dart dNext = d ;
do
......@@ -304,16 +304,16 @@ inline void ImplicitHierarchicalMap3::foreach_dart_of_oriented_face(Dart d, FUNC
}
template <typename FUNC>
inline void ImplicitHierarchicalMap3::foreach_dart_of_face(Dart d, FUNC& f, unsigned int thread) const
inline void ImplicitHierarchicalMap3::foreach_dart_of_face(Dart d, FUNC& f) const
{
foreach_dart_of_oriented_face(d, f, thread);
foreach_dart_of_oriented_face(phi3(d), f, thread);
foreach_dart_of_oriented_face(d, f);
foreach_dart_of_oriented_face(phi3(d), f);
}
template <typename FUNC>
inline void ImplicitHierarchicalMap3::foreach_dart_of_oriented_volume(Dart d, FUNC& f, unsigned int thread) const
inline void ImplicitHierarchicalMap3::foreach_dart_of_oriented_volume(Dart d, FUNC& f) const
{
DartMarkerStore<Map3> mark(*this, thread); // Lock a marker
DartMarkerStore<Map3> mark(*this); // Lock a marker
std::vector<Dart> visitedFaces; // Faces that are traversed
visitedFaces.reserve(1024) ;
......@@ -343,25 +343,25 @@ inline void ImplicitHierarchicalMap3::foreach_dart_of_oriented_volume(Dart d, FU
}
template <typename FUNC>
inline void ImplicitHierarchicalMap3::foreach_dart_of_volume(Dart d, FUNC& f, unsigned int thread) const
inline void ImplicitHierarchicalMap3::foreach_dart_of_volume(Dart d, FUNC& f) const
{
foreach_dart_of_oriented_volume(d, f, thread) ;
foreach_dart_of_oriented_volume(d, f) ;
}
template <typename FUNC>
inline void ImplicitHierarchicalMap3::foreach_dart_of_vertex1(Dart d, FUNC& f, unsigned int /*thread*/) const
inline void ImplicitHierarchicalMap3::foreach_dart_of_vertex1(Dart d, FUNC& f) const
{
f(d);
}
template <typename FUNC>
inline void ImplicitHierarchicalMap3::foreach_dart_of_edge1(Dart d, FUNC& f, unsigned int /*thread*/) const
inline void ImplicitHierarchicalMap3::foreach_dart_of_edge1(Dart d, FUNC& f) const
{
f(d);
}
template <typename FUNC>
inline void ImplicitHierarchicalMap3::foreach_dart_of_vertex2(Dart d, FUNC& f, unsigned int /*thread*/) const
inline void ImplicitHierarchicalMap3::foreach_dart_of_vertex2(Dart d, FUNC& f) const
{
Dart dNext = d;
do
......@@ -372,22 +372,22 @@ inline void ImplicitHierarchicalMap3::foreach_dart_of_vertex2(Dart d, FUNC& f, u
}
template <typename FUNC>
inline void ImplicitHierarchicalMap3::foreach_dart_of_edge2(Dart d, FUNC& f, unsigned int /*thread*/) const
inline void ImplicitHierarchicalMap3::foreach_dart_of_edge2(Dart d, FUNC& f) const
{
f(d);
f(phi2(d));
}
template <typename FUNC>
inline void ImplicitHierarchicalMap3::foreach_dart_of_face2(Dart d, FUNC& f, unsigned int thread) const
inline void ImplicitHierarchicalMap3::foreach_dart_of_face2(Dart d, FUNC& f) const
{
foreach_dart_of_oriented_face(d, f, thread);
foreach_dart_of_oriented_face(d, f);
}
template <typename FUNC>
inline void ImplicitHierarchicalMap3::foreach_dart_of_cc(Dart d, FUNC& f, unsigned int thread) const
inline void ImplicitHierarchicalMap3::foreach_dart_of_cc(Dart d, FUNC& f) const
{
DartMarkerStore<Map3> mark(*this, thread); // Lock a marker
DartMarkerStore<Map3> mark(*this); // Lock a marker
std::vector<Dart> visitedFaces; // Faces that are traversed
visitedFaces.reserve(1024) ;
......@@ -416,7 +416,7 @@ inline void ImplicitHierarchicalMap3::foreach_dart_of_cc(Dart d, FUNC& f, unsign
}
// // foreach_dart_of_oriented_volume(d, f) ;
// DartMarkerStore mv(*this,thread); // Lock a marker
// DartMarkerStore mv(*this); // Lock a marker
//
// std::vector<Dart> darts; // Darts that are traversed
// darts.reserve(1024);
......
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