diff --git a/AMDiS/libtool b/AMDiS/libtool index ace48e58891430cbcc2eae0fee1709dd2bac898f..95d2fe8903c9787ee9c06e44082aec7d871eaa1b 100755 --- a/AMDiS/libtool +++ b/AMDiS/libtool @@ -44,7 +44,7 @@ available_tags=" CXX F77" # ### BEGIN LIBTOOL CONFIG -# Libtool was configured on host p1q024: +# Libtool was configured on host deimos101: # Shell to use when invoking shell scripts. SHELL="/bin/sh" @@ -6760,7 +6760,7 @@ build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac` # End: # ### BEGIN LIBTOOL TAG CONFIG: CXX -# Libtool was configured on host p1q024: +# Libtool was configured on host deimos101: # Shell to use when invoking shell scripts. SHELL="/bin/sh" @@ -7065,7 +7065,7 @@ include_expsyms="" # ### BEGIN LIBTOOL TAG CONFIG: F77 -# Libtool was configured on host p1q024: +# Libtool was configured on host deimos101: # Shell to use when invoking shell scripts. SHELL="/bin/sh" diff --git a/AMDiS/src/Mesh.cc b/AMDiS/src/Mesh.cc index ce0567885392ec5c9e10378de71ab85aefa9f95d..5befd72ea0403d314cdef8ce9fa43ee0eb62063d 100644 --- a/AMDiS/src/Mesh.cc +++ b/AMDiS/src/Mesh.cc @@ -1283,9 +1283,9 @@ namespace AMDiS { // === Check if number of pre refinements is set ini init file. === - int tmp = 0; + int tmp = -1; GET_PARAMETER(0, "parallel->pre refine", "%d", &tmp); - if (tmp != 0) { + if (tmp > -1) { MSG("Calculated %d pre refines to be useful, but %d are set in init file!\n", nParallelPreRefinements, tmp); nParallelPreRefinements = tmp; diff --git a/AMDiS/src/parallel/MeshDistributor.cc b/AMDiS/src/parallel/MeshDistributor.cc index 2515ccdbf3379e971f505d516c757333b1f01d4d..0b3f4428819fb364badaeac39d60ad45442c45ec 100644 --- a/AMDiS/src/parallel/MeshDistributor.cc +++ b/AMDiS/src/parallel/MeshDistributor.cc @@ -197,6 +197,8 @@ namespace AMDiS { ParallelDebug::printBoundaryInfo(*this); #endif + MSG("HERE 1\n"); + for (deque<MacroElement*>::iterator it = mesh->firstMacroElement(); it != mesh->endOfMacroElements(); ++it) { for (int i = 0; i < mesh->getGeo(NEIGH); i++) { @@ -229,7 +231,6 @@ namespace AMDiS { removeMacroElements(); - // === Create new global and local DOF numbering. === @@ -242,7 +243,6 @@ namespace AMDiS { updateLocalGlobalNumbering(); - // === In 3D we have to make some test, if the resulting mesh is valid. If === // === it is not valid, there is no possiblity yet to fix this problem, just === // === exit with an error message. === @@ -257,8 +257,6 @@ namespace AMDiS { ParallelDebug::testAllElements(*this); debug::testSortedDofs(mesh, elMap); ParallelDebug::testInteriorBoundary(*this); - ParallelDebug::testCommonDofs(*this, true); - ParallelDebug::testGlobalIndexByCoords(*this); debug::writeMesh(feSpace, -1, debugOutputDir + "macro_mesh"); @@ -1719,19 +1717,21 @@ namespace AMDiS { #if (DEBUG != 0) + MSG("------------- Debug information -------------\n"); + MSG("nRankDofs = %d\n", nRankDofs); + MSG("nOverallDofs = %d\n", nOverallDofs); + MSG("rstart %d\n", rstart); + stringstream oss; oss << debugOutputDir << "elementIndex-" << mpiRank << ".vtu"; - debug::writeElementIndexMesh(mesh, oss.str()); + + ParallelDebug::writeDebugFile(*this, debugOutputDir + "mpi-dbg", "dat"); + debug::testSortedDofs(mesh, elMap); ParallelDebug::testCommonDofs(*this, true); ParallelDebug::testGlobalIndexByCoords(*this); - ParallelDebug::writeDebugFile(*this, debugOutputDir + "mpi-dbg", "dat"); - MSG("------------- Debug information -------------\n"); - MSG("nRankDofs = %d\n", nRankDofs); - MSG("nOverallDofs = %d\n", nOverallDofs); - MSG("rstart %d\n", rstart); #else int tmp = 0; GET_PARAMETER(0, name + "->write parallel debug file", "%d", &tmp);