Skip to content
Snippets Groups Projects
Commit e539f6d7 authored by Boris Sedji's avatar Boris Sedji
Browse files

No commit message

No commit message
parent 737ded0f
No related branches found
No related tags found
No related merge requests found
...@@ -41,7 +41,7 @@ class FilterNodeEnriched ...@@ -41,7 +41,7 @@ class FilterNodeEnriched
Dof::getTwoIntsFromType(key.getType(), i1,i2); Dof::getTwoIntsFromType(key.getType(), i1,i2);
it2 = _EnrichComp->find(i1); it2 = _EnrichComp->find(i1);
it1 = _TagEnrichedVertex->find(key.getEntity()); it1 = _TagEnrichedVertex->find(key.getEntity());
if (it1!=_TagEnrichedVertex->end() & it2 != _EnrichComp->end()) if ((it1!=_TagEnrichedVertex->end()) && (it2 != _EnrichComp->end()))
{ {
return true; return true;
} }
...@@ -111,7 +111,7 @@ class FilterElementsCutByLevelSet ...@@ -111,7 +111,7 @@ class FilterElementsCutByLevelSet
Dof::getTwoIntsFromType(key.getType(), i1,i2); Dof::getTwoIntsFromType(key.getType(), i1,i2);
it2 = _EnrichComp->find(i1); it2 = _EnrichComp->find(i1);
it1 = _TagEnrichedVertex.find(key.getEntity()); it1 = _TagEnrichedVertex.find(key.getEntity());
if (it1!=_TagEnrichedVertex.end() & it2 != _EnrichComp->end()) if ((it1!=_TagEnrichedVertex.end()) && (it2 != _EnrichComp->end()))
{ {
return true; return true;
} }
......
...@@ -103,7 +103,6 @@ class groupOfLagMultElements : public groupOfElements ...@@ -103,7 +103,6 @@ class groupOfLagMultElements : public groupOfElements
groupOfElements::elementContainer::iterator itp = pElem.begin(); groupOfElements::elementContainer::iterator itp = pElem.begin();
for (;itp!=pElem.end(); itp++) for (;itp!=pElem.end(); itp++)
{ {
MElement *ep;
if ((*itp)->getParent()) if ((*itp)->getParent())
{ {
if (sElem.find(*itp)) insert((*itp)) ; // warning : find method used to check if parent is in sElem if (sElem.find(*itp)) insert((*itp)) ; // warning : find method used to check if parent is in sElem
...@@ -123,7 +122,7 @@ class groupOfLagMultElements : public groupOfElements ...@@ -123,7 +122,7 @@ class groupOfLagMultElements : public groupOfElements
groupOfLagMultElements(int dim, int physical, std::vector < groupOfElements *> sElem) : groupOfElements() groupOfLagMultElements(int dim, int physical, std::vector < groupOfElements *> sElem) : groupOfElements()
{ {
groupOfElements pElem(dim , physical); groupOfElements pElem(dim , physical);
for (int i;i < sElem.size() ; i ++) for (unsigned int i;i < sElem.size() ; i ++)
{ {
fillElementContainer(pElem,(*sElem[i])); fillElementContainer(pElem,(*sElem[i]));
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment