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

Small changes.

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