From e8cf640ed0ef20d8f7498bc0d52fa68d87b06869 Mon Sep 17 00:00:00 2001
From: Thomas Witkowski <thomas.witkowski@gmx.de>
Date: Mon, 8 Sep 2008 14:35:54 +0000
Subject: [PATCH] * Bugfix when compiling in dbg mode
---
AMDiS/src/RCNeighbourList.cc | 6 +++---
AMDiS/src/RCNeighbourList.h | 10 ----------
AMDiS/src/RefinementManager2d.cc | 9 ++++-----
3 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/AMDiS/src/RCNeighbourList.cc b/AMDiS/src/RCNeighbourList.cc
index 07ed1cfc..24f1c17f 100644
--- a/AMDiS/src/RCNeighbourList.cc
+++ b/AMDiS/src/RCNeighbourList.cc
@@ -387,9 +387,9 @@ namespace AMDiS {
insertIt = periodicList->rclist.end();
periodicList->coarseningManager = coarseningManager;
} else {
- if(edge[0]) {
- TEST_EXIT((dof0 == edge[0] && dof1 == edge[1]) ||
- (dof1 == edge[0] && dof0 == edge[1]))
+ if (edge[0]) {
+ TEST_EXIT_DBG((dof0 == edge[0] && dof1 == edge[1]) ||
+ (dof1 == edge[0] && dof0 == edge[1]))
("invalid macro file?\n");
}
}
diff --git a/AMDiS/src/RCNeighbourList.h b/AMDiS/src/RCNeighbourList.h
index 03ea728e..dd84cd6a 100644
--- a/AMDiS/src/RCNeighbourList.h
+++ b/AMDiS/src/RCNeighbourList.h
@@ -185,16 +185,6 @@ namespace AMDiS {
*/
void removeDOFParents(int n_neigh);
- // /** \brief
- // * Sets \ref newCoords.
- // */
- // inline void setNewCoords(int i, bool n) { rclist[i].newCoords = n; };
-
- // /** \brief
- // * Returns \ref newCoords.
- // */
- // inline bool getNewCoords(int i) const { return rclist[i].newCoords; };
-
RCNeighbourList *periodicSplit(DegreeOfFreedom *edge[2],
DegreeOfFreedom *nextEdge[2],
int *n_neigh,
diff --git a/AMDiS/src/RefinementManager2d.cc b/AMDiS/src/RefinementManager2d.cc
index 49b06226..41549987 100644
--- a/AMDiS/src/RefinementManager2d.cc
+++ b/AMDiS/src/RefinementManager2d.cc
@@ -85,8 +85,7 @@ namespace AMDiS {
TEST_EXIT_DBG(periodicList)("periodicList = NULL\n");
- newDOF =
- refinePatch(edge, periodicList, n_neigh_periodic, bound);
+ newDOF = refinePatch(edge, periodicList, n_neigh_periodic, bound);
if (firstNewDOF == -1) {
firstNewDOF = newDOF;
@@ -354,7 +353,8 @@ namespace AMDiS {
int *n_neigh)
{
FUNCNAME("RefinementManager2d::getRefinePatch()");
-
+
+ Triangle *el = dynamic_cast<Triangle*>(const_cast<Element*>( (*el_info)->getElement()));
int opp_vertex = 0;
if ((*el_info)->getNeighbour(2) && (*el_info)->getOppVertex(2) != 2) {
@@ -365,8 +365,7 @@ namespace AMDiS {
opp_vertex = (*el_info)->getOppVertex(2);
ElInfo *neigh_info = stack->traverseNeighbour2d(*el_info, 2);
- neigh_info->getElement()->setMark(max(neigh_info->getElement()->getMark(),
- 1));
+ neigh_info->getElement()->setMark(max(neigh_info->getElement()->getMark(), 1));
neigh_info = refineFunction(neigh_info);
/****************************************************************************/
--
GitLab