Création d'un compte pour un collaborateur extérieur au laboratoire depuis l'intranet ICube : https://intranet.icube.unistra.fr/fr/labs/member/profile

Commit 539f92e2 authored by Thomas's avatar Thomas
Browse files

particleCell3D

parent 98309936
...@@ -272,6 +272,7 @@ Dart ParticleCell3D<PFP>::nextFaceNotMarked(Dart d,CellMarker& mark) ...@@ -272,6 +272,7 @@ Dart ParticleCell3D<PFP>::nextFaceNotMarked(Dart d,CellMarker& mark)
} }
beg++; beg++;
} }
// clear markers // clear markers
for (std::list<Dart>::iterator it=darts_list.begin(); it!=darts_list.end(); ++it) for (std::list<Dart>::iterator it=darts_list.begin(); it!=darts_list.end(); ++it)
{ {
...@@ -652,6 +653,7 @@ void ParticleCell3D<PFP>::volumeState(const VEC3& current) ...@@ -652,6 +653,7 @@ void ParticleCell3D<PFP>::volumeState(const VEC3& current)
Geom::Orientation3D testLeft = isLeftL1DVol(current,d,m_positionFace,m_position); Geom::Orientation3D testLeft = isLeftL1DVol(current,d,m_positionFace,m_position);
if(testLeft!=Geom::UNDER) { if(testLeft!=Geom::UNDER) {
d = m.phi_1(d); d = m.phi_1(d);
while(dd!=d && isLeftL1DVol(current,d,m_positionFace,m_position)!=Geom::UNDER) while(dd!=d && isLeftL1DVol(current,d,m_positionFace,m_position)!=Geom::UNDER)
...@@ -693,9 +695,6 @@ void ParticleCell3D<PFP>::volumeState(const VEC3& current) ...@@ -693,9 +695,6 @@ void ParticleCell3D<PFP>::volumeState(const VEC3& current)
if(testAbove!=Geom::UNDER || (testRight==Geom::ON && isAbove(current,m.phi_1(d),m_position)!=Geom::UNDER)) { if(testAbove!=Geom::UNDER || (testRight==Geom::ON && isAbove(current,m.phi_1(d),m_position)!=Geom::UNDER)) {
if(testAbove==Geom::UNDER)
d= m.phi1(d);
if(testAbove==Geom::OVER || whichSideOfFace(current,d)==Geom::UNDER) { if(testAbove==Geom::OVER || whichSideOfFace(current,d)==Geom::UNDER) {
mark.mark(d); mark.mark(d);
...@@ -706,6 +705,7 @@ void ParticleCell3D<PFP>::volumeState(const VEC3& current) ...@@ -706,6 +705,7 @@ void ParticleCell3D<PFP>::volumeState(const VEC3& current)
if(mark.isMarked(d)) { if(mark.isMarked(d)) {
dd = d; dd = d;
d = nextFaceNotMarked(d,mark); d = nextFaceNotMarked(d,mark);
mark.mark(d);
if(d==dd) { if(d==dd) {
volumeSpecialCase(current); volumeSpecialCase(current);
...@@ -756,7 +756,7 @@ void ParticleCell3D<PFP>::volumeSpecialCase(const VEC3& current) ...@@ -756,7 +756,7 @@ void ParticleCell3D<PFP>::volumeSpecialCase(const VEC3& current)
#endif #endif
Dart dd; Dart dd;
CellMarker mark(m,FACE_CELL); CellMarkerStore mark(m,FACE_CELL);
Dart d_min; Dart d_min;
......
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