Skip to content
Snippets Groups Projects
Commit 586fabe9 authored by Amaury Johnen's avatar Amaury Johnen
Browse files

rmv useless Rec2DEdge::_boundary

parent 11372372
No related branches found
No related tags found
No related merge requests found
...@@ -2308,7 +2308,7 @@ bool Rec2DCollapse::whatWouldYouDo ...@@ -2308,7 +2308,7 @@ bool Rec2DCollapse::whatWouldYouDo
/*****************/ /*****************/
Rec2DEdge::Rec2DEdge(Rec2DVertex *rv0, Rec2DVertex *rv1) Rec2DEdge::Rec2DEdge(Rec2DVertex *rv0, Rec2DVertex *rv1)
: _rv0(rv0), _rv1(rv1), _lastUpdate(-1), : _rv0(rv0), _rv1(rv1), _lastUpdate(-1),
_weight(REC2D_EDGE_BASE+2*REC2D_EDGE_QUAD), _boundary(-1) _weight(REC2D_EDGE_BASE+2*REC2D_EDGE_QUAD)
{ {
_computeQual(); _computeQual();
reveal(); reveal();
...@@ -2399,6 +2399,13 @@ void Rec2DEdge::updateQual() ...@@ -2399,6 +2399,13 @@ void Rec2DEdge::updateQual()
_lastUpdate = Recombine2D::getNumChange(); _lastUpdate = Recombine2D::getNumChange();
} }
bool Rec2DEdge::isOnBoundary() const
{
Rec2DElement *elem[2];
Rec2DEdge::getElements(this, elem);
return !elem[1];
}
Rec2DElement* Rec2DEdge::getUniqueElement(const Rec2DEdge *re) Rec2DElement* Rec2DEdge::getUniqueElement(const Rec2DEdge *re)
{ {
std::vector<Rec2DElement*> elem; std::vector<Rec2DElement*> elem;
...@@ -3035,8 +3042,6 @@ void Rec2DElement::hide() ...@@ -3035,8 +3042,6 @@ void Rec2DElement::hide()
for (int i = 0; i < _numEdge; ++i) { for (int i = 0; i < _numEdge; ++i) {
if (_numEdge == 3) if (_numEdge == 3)
_edges[i]->remHasTri(); _edges[i]->remHasTri();
else
_edges[i]->remHasQuad();
if (_elements[i]) if (_elements[i])
_elements[i]->rmvNeighbour(_edges[i], this); _elements[i]->rmvNeighbour(_edges[i], this);
} }
...@@ -3053,8 +3058,6 @@ void Rec2DElement::reveal(Rec2DVertex **rv) ...@@ -3053,8 +3058,6 @@ void Rec2DElement::reveal(Rec2DVertex **rv)
for (int i = 0; i < _numEdge; ++i) { for (int i = 0; i < _numEdge; ++i) {
if (_numEdge == 3) if (_numEdge == 3)
_edges[i]->addHasTri(); _edges[i]->addHasTri();
else
_edges[i]->addHasQuad();
if (_elements[i]) if (_elements[i])
_elements[i]->addNeighbour(_edges[i], this); _elements[i]->addNeighbour(_edges[i], this);
} }
...@@ -3177,8 +3180,6 @@ void Rec2DElement::add(Rec2DEdge *re) ...@@ -3177,8 +3180,6 @@ void Rec2DElement::add(Rec2DEdge *re)
if (_numEdge == 3) if (_numEdge == 3)
re->addHasTri(); re->addHasTri();
else
re->addHasQuad();
} }
bool Rec2DElement::has(const Rec2DEdge *re) const bool Rec2DElement::has(const Rec2DEdge *re) const
...@@ -3281,8 +3282,6 @@ void Rec2DElement::swap(Rec2DEdge *re1, Rec2DEdge *re2) ...@@ -3281,8 +3282,6 @@ void Rec2DElement::swap(Rec2DEdge *re1, Rec2DEdge *re2)
if (_edges[i] == re1) { if (_edges[i] == re1) {
if (_numEdge == 3) if (_numEdge == 3)
re1->remHasTri(); re1->remHasTri();
else
re1->remHasQuad();
if (_elements[i]) if (_elements[i])
_elements[i]->rmvNeighbour(_edges[i], this); _elements[i]->rmvNeighbour(_edges[i], this);
Rec2DElement *elem[2]; Rec2DElement *elem[2];
...@@ -3290,8 +3289,6 @@ void Rec2DElement::swap(Rec2DEdge *re1, Rec2DEdge *re2) ...@@ -3290,8 +3289,6 @@ void Rec2DElement::swap(Rec2DEdge *re1, Rec2DEdge *re2)
_edges[i] = (Rec2DEdge*)re2; _edges[i] = (Rec2DEdge*)re2;
if (_numEdge == 3) if (_numEdge == 3)
re2->addHasTri(); re2->addHasTri();
else
re2->addHasQuad();
if (elem[1]) if (elem[1])
Msg::Error("[Rec2DElement] Invalid swapping (there are %d and %d)", elem[0]->getNum(), elem[1]->getNum()); Msg::Error("[Rec2DElement] Invalid swapping (there are %d and %d)", elem[0]->getNum(), elem[1]->getNum());
else if (elem[0]) { else if (elem[0]) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment