Commit e8cf640e authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

* Bugfix when compiling in dbg mode

parent ab48be0c
...@@ -387,9 +387,9 @@ namespace AMDiS { ...@@ -387,9 +387,9 @@ namespace AMDiS {
insertIt = periodicList->rclist.end(); insertIt = periodicList->rclist.end();
periodicList->coarseningManager = coarseningManager; periodicList->coarseningManager = coarseningManager;
} else { } else {
if(edge[0]) { if (edge[0]) {
TEST_EXIT((dof0 == edge[0] && dof1 == edge[1]) || TEST_EXIT_DBG((dof0 == edge[0] && dof1 == edge[1]) ||
(dof1 == edge[0] && dof0 == edge[1])) (dof1 == edge[0] && dof0 == edge[1]))
("invalid macro file?\n"); ("invalid macro file?\n");
} }
} }
......
...@@ -185,16 +185,6 @@ namespace AMDiS { ...@@ -185,16 +185,6 @@ namespace AMDiS {
*/ */
void removeDOFParents(int n_neigh); 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], RCNeighbourList *periodicSplit(DegreeOfFreedom *edge[2],
DegreeOfFreedom *nextEdge[2], DegreeOfFreedom *nextEdge[2],
int *n_neigh, int *n_neigh,
......
...@@ -85,8 +85,7 @@ namespace AMDiS { ...@@ -85,8 +85,7 @@ namespace AMDiS {
TEST_EXIT_DBG(periodicList)("periodicList = NULL\n"); TEST_EXIT_DBG(periodicList)("periodicList = NULL\n");
newDOF = newDOF = refinePatch(edge, periodicList, n_neigh_periodic, bound);
refinePatch(edge, periodicList, n_neigh_periodic, bound);
if (firstNewDOF == -1) { if (firstNewDOF == -1) {
firstNewDOF = newDOF; firstNewDOF = newDOF;
...@@ -354,7 +353,8 @@ namespace AMDiS { ...@@ -354,7 +353,8 @@ namespace AMDiS {
int *n_neigh) int *n_neigh)
{ {
FUNCNAME("RefinementManager2d::getRefinePatch()"); FUNCNAME("RefinementManager2d::getRefinePatch()");
Triangle *el = dynamic_cast<Triangle*>(const_cast<Element*>( (*el_info)->getElement()));
int opp_vertex = 0; int opp_vertex = 0;
if ((*el_info)->getNeighbour(2) && (*el_info)->getOppVertex(2) != 2) { if ((*el_info)->getNeighbour(2) && (*el_info)->getOppVertex(2) != 2) {
...@@ -365,8 +365,7 @@ namespace AMDiS { ...@@ -365,8 +365,7 @@ namespace AMDiS {
opp_vertex = (*el_info)->getOppVertex(2); opp_vertex = (*el_info)->getOppVertex(2);
ElInfo *neigh_info = stack->traverseNeighbour2d(*el_info, 2); ElInfo *neigh_info = stack->traverseNeighbour2d(*el_info, 2);
neigh_info->getElement()->setMark(max(neigh_info->getElement()->getMark(), neigh_info->getElement()->setMark(max(neigh_info->getElement()->getMark(), 1));
1));
neigh_info = refineFunction(neigh_info); neigh_info = refineFunction(neigh_info);
/****************************************************************************/ /****************************************************************************/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment