diff --git a/AMDiS/src/RCNeighbourList.cc b/AMDiS/src/RCNeighbourList.cc index 07ed1cfcb08c19201650303a6cdfa233282e1a43..24f1c17f2528ae0af620a336c3075e74f2925cc1 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 03ea728eba602511da59e19280ec9dd6df1be70e..dd84cd6a0732f985ba090228520a9bcabc4e1e5f 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 49b06226556337ee5fde67e78feb38aa32b86bd7..4154998727cdf75a30a05a05f309fc1f098d15d5 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); /****************************************************************************/