Commit 3f27bf1e authored by pitiot's avatar pitiot

ajout particules memo

parent 8dbec0a9
......@@ -215,8 +215,7 @@ Dart subdivideVolumeClassic(typename PFP::MAP& map, Dart d, VertexAttribute<type
if(OneLevelDifference)
{
Traversor3WF<typename PFP::MAP> traF(map, old);
for(Dart dit = traF.begin(); dit != traF.end(); dit = traF.next())
for ( Face dit : facesIncidentToVolume3(map,old))
{
Dart nv = map.phi3(dit);
if(!map.isBoundaryMarked(3, nv))
......
......@@ -277,7 +277,7 @@ template <typename MAP, unsigned int CELL>
class CellMarkerStore: public CellMarkerBase<MAP, CELL>
{
protected:
std::vector<unsigned int>* m_markedCells ;
std::vector<unsigned int>* m_markedCells ;
public:
CellMarkerStore(MAP& map) :
......
......@@ -266,7 +266,7 @@ template <typename MAP>
class DartMarkerStore : public DartMarkerTmpl<MAP>
{
protected:
std::vector<Dart>* m_markedDarts ;
std::vector<Dart>* m_markedDarts ;
public:
DartMarkerStore(MAP& map) :
DartMarkerTmpl<MAP>(map)
......@@ -316,7 +316,7 @@ public:
}
inline const std::vector<Dart>& getDartVector() const
{
{
return *m_markedDarts;
}
} ;
......
......@@ -67,8 +67,8 @@ class Traversor3XY
{
private:
const MAP& m_map ;
DartMarkerStore<MAP>* m_dmark ;
CellMarkerStore<MAP, ORBY>* m_cmark ;
DartMarkerStore<MAP>* m_dmark ;
CellMarkerStore<MAP, ORBY>* m_cmark ;
Cell<ORBY> m_current ;
TraversorDartsOfOrbit<MAP, ORBX> m_tradoo;
......
......@@ -105,6 +105,7 @@ Traversor3XY<MAP, ORBX, ORBY>::Traversor3XY(const MAP& map, Cell<ORBX> c, bool f
m_allocated(true),
m_first(true)
{
// std::cout<<"forceDartMarker : "<<forceDartMarker<<std::endl;
const AttributeMultiVector<NoTypeNameAttribute<std::vector<Dart> > >* quickTraversal = map.template getQuickIncidentTraversal<ORBX,ORBY>() ;
if (quickTraversal != NULL)
{
......
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