Skip to content
Snippets Groups Projects
Commit 4a775f34 authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

* Small Marker update

parent 99d00627
No related branches found
No related tags found
No related merge requests found
...@@ -49,7 +49,9 @@ namespace AMDiS { ...@@ -49,7 +49,9 @@ namespace AMDiS {
double lError = el->getEstimation(row); double lError = el->getEstimation(row);
if (adaptInfo->isRefinementAllowed(row == -1 ? 0 : row) && lError > markRLimit) { if (adaptInfo->isRefinementAllowed(row == -1 ? 0 : row) && lError > markRLimit) {
setMark(el, adaptInfo->getRefineBisections(row == -1 ? 0 : row)); if ((maxRefineLevel == -1) || (static_cast<int>(elInfo->getLevel()) < maxRefineLevel)) {
setMark(el, adaptInfo->getRefineBisections(row == -1 ? 0 : row));
}
} else { } else {
if (adaptInfo->isCoarseningAllowed(row == -1 ? 0 : row) && lError <= markCLimit) { if (adaptInfo->isCoarseningAllowed(row == -1 ? 0 : row) && lError <= markCLimit) {
if (!el->getElementData()->getElementData(COARSENABLE) || if (!el->getElementData()->getElementData(COARSENABLE) ||
...@@ -72,10 +74,7 @@ namespace AMDiS { ...@@ -72,10 +74,7 @@ namespace AMDiS {
ElInfo *elInfo = NULL; ElInfo *elInfo = NULL;
elInfo = stack.traverseFirst(mesh, -1, Mesh::CALL_LEAF_EL); elInfo = stack.traverseFirst(mesh, -1, Mesh::CALL_LEAF_EL);
while (elInfo) { while (elInfo) {
if ((maxRefineLevel > -1) && markElement(adaptInfo, elInfo);
(static_cast<int>(elInfo->getLevel()) < maxRefineLevel)) {
markElement(adaptInfo, elInfo);
}
elInfo = stack.traverseNext(elInfo); elInfo = stack.traverseNext(elInfo);
} }
......
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