------------------------------------------------------------ revno: 4012 committer: bchareyre <bruno.chare...@grenoble-inp.fr> timestamp: Wed 2017-03-08 11:33:22 +0100 message: re-apply the fix of rev 26efbec to getConstrictionFull() modified: lib/triangulation/FlowBoundingSphere.ipp
-- lp:yade https://code.launchpad.net/~yade-pkg/yade/git-trunk Your team Yade developers is subscribed to branch lp:yade. To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription
=== modified file 'lib/triangulation/FlowBoundingSphere.ipp' --- lib/triangulation/FlowBoundingSphere.ipp 2017-02-23 14:14:02 +0000 +++ lib/triangulation/FlowBoundingSphere.ipp 2017-03-08 10:33:22 +0000 @@ -677,10 +677,9 @@ RTriangulation& Tri = T[currentTes].Triangulation(); vector<Constriction> constrictions; for (FiniteFacetsIterator f_it=Tri.finite_facets_begin(); f_it != Tri.finite_facets_end();f_it++){ - //in the periodic case, we skip facets with lowest id out of the base period - if ( ((f_it->first->info().index <= f_it->first->neighbor(f_it->second)->info().index) && f_it->first->info().isGhost) - || ((f_it->first->info().index >= f_it->first->neighbor(f_it->second)->info().index) && f_it->first->neighbor(f_it->second)->info().isGhost) - || f_it->first->info().index == 0 || f_it->first->neighbor(f_it->second)->info().index == 0) continue; + //in the periodic case, we retain only the facets incident to at least one non-ghost cell + if ( (f_it->first->neighbor(f_it->second)->info().isGhost && f_it->first->info().isGhost) + || f_it->first->info().index == 0 || f_it->first->neighbor(f_it->second)->info().index == 0) continue; vector<double> rn; const CVector& normal = f_it->first->info().facetSurfaces[f_it->second]; if (!normal[0] && !normal[1] && !normal[2]) continue;
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : yade-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp