diff --git a/AMDiS/src/io/ArhReader.cc b/AMDiS/src/io/ArhReader.cc index 7bd05919f4361f1d0e7a6578e5897bbc6c05f57c..be41215ee1ea9b0fbedb49ccac0a9bc52210ca2c 100644 --- a/AMDiS/src/io/ArhReader.cc +++ b/AMDiS/src/io/ArhReader.cc @@ -216,16 +216,8 @@ namespace AMDiS { MeshStructure elementStructure; elementStructure.init(structureCode, codeSize); - if (macroInMesh.count(elIndex)) { - - MSG("READ MACRO EL %d\n", elIndex); - if (MPI::COMM_WORLD.Get_rank() == 52 && elIndex == 19777) { - debug::writeMacroElementIndexMesh(mesh, "test"); - } - + if (macroInMesh.count(elIndex)) elementStructure.fitMeshToStructure(mesh, refManager, false, elIndex); - } - if (nValueVectors > 0) { uint32_t nValuesPerVector = 0; diff --git a/AMDiS/src/parallel/PetscSolverFeti.cc b/AMDiS/src/parallel/PetscSolverFeti.cc index 04bd93dc1b8c2737bf8a038763ea03d55c9009e4..7379e46781a4f8bdc42c2a0ae707aef297510bec 100644 --- a/AMDiS/src/parallel/PetscSolverFeti.cc +++ b/AMDiS/src/parallel/PetscSolverFeti.cc @@ -717,12 +717,16 @@ namespace AMDiS { { FUNCNAME("PetscSolverFeti::testWirebasketEdge()"); + return true; + if (meshDistributor->getMesh()->getDim() == 2) return true; if (meshDistributor->getIntBoundary().getDegreeOwn(edge) != 3) return false; + return true; + Element *el = edge.el; int i0 = el->getVertexOfEdge(edge.ithObj, 0); int i1 = el->getVertexOfEdge(edge.ithObj, 1); @@ -786,7 +790,7 @@ namespace AMDiS { if (it->rankObj.subObj == FACE) allFaces[it.getRank()].insert(it->rankObj); - +#if 0 std::set<BoundaryObject> allMyEdges; TraverseStack stack; ElInfo *elInfo = stack.traverseFirst(meshDistributor->getMesh(), 0, Mesh::CALL_EL_LEVEL | Mesh::FILL_BOUND); @@ -818,6 +822,7 @@ namespace AMDiS { } } } +#endif int nEmptyFaces = 0;