From 4a775f341d1e696b2b249b6131226ff553a35066 Mon Sep 17 00:00:00 2001
From: Thomas Witkowski <thomas.witkowski@gmx.de>
Date: Thu, 28 Aug 2008 11:17:33 +0000
Subject: [PATCH] * Small Marker update
---
AMDiS/src/Marker.cc | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/AMDiS/src/Marker.cc b/AMDiS/src/Marker.cc
index 249832d1..c817a90a 100644
--- a/AMDiS/src/Marker.cc
+++ b/AMDiS/src/Marker.cc
@@ -49,7 +49,9 @@ namespace AMDiS {
double lError = el->getEstimation(row);
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 {
if (adaptInfo->isCoarseningAllowed(row == -1 ? 0 : row) && lError <= markCLimit) {
if (!el->getElementData()->getElementData(COARSENABLE) ||
@@ -72,10 +74,7 @@ namespace AMDiS {
ElInfo *elInfo = NULL;
elInfo = stack.traverseFirst(mesh, -1, Mesh::CALL_LEAF_EL);
while (elInfo) {
- if ((maxRefineLevel > -1) &&
- (static_cast<int>(elInfo->getLevel()) < maxRefineLevel)) {
- markElement(adaptInfo, elInfo);
- }
+ markElement(adaptInfo, elInfo);
elInfo = stack.traverseNext(elInfo);
}
--
GitLab