Skip to content

GitLab

A
amdis
Commit 3e8be011 authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files
Options

Removed unnecessary output messages in parallel code.

parent 729ab8dc
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 45 deletions
AMDiS/src/ElInfo2d.cc
View file @ 3e8be011
......@@ -411,11 +411,6 @@ namespace AMDiS {
Element *nb = elInfoOld->neighbour[2];
if (nb) {
// MSG("OLDINFO HAS EL %d mit PTR %p\n", elInfoOld->getElement()->getIndex(),
// elInfoOld->getElement());
// MSG("1 ALS NACHBAR HABEN WIR %d mit PTR %p\n", nb->getIndex(), nb);
TEST_EXIT_DBG(elInfoOld->oppVertex[2] == 2)
("Fill child %d of element %d (mel %d): Invalid neighbour %d!\n",
ichild,
......@@ -429,8 +424,6 @@ namespace AMDiS {
("Missing second child in element %d!\n", nb->getIndex());
nb = nb->getSecondChild();
// MSG("2 ALS NACHBAR HABEN WIR %d mit PTR %p (is LEAF: %d)\n",
// nb->getIndex(), nb, nb->isLeaf());
if (nb->getFirstChild()) {
oppVertex[0] = 2;
......@@ -450,7 +443,6 @@ namespace AMDiS {
}
nb = nb->getFirstChild();
// MSG("3 ALS NACHBAR HABEN WIR %d\n", nb->getIndex());
} else {
oppVertex[0] = 1;
......
AMDiS/src/FiniteElemSpace.cc
View file @ 3e8be011
......@@ -26,8 +26,10 @@ namespace AMDiS {
if (!admin) {
const DOFAdmin *admin_local = NULL;
const DimVec<int> *ndof = NULL;
ndof = basFcts->getNumberOfDofs();
TEST_EXIT(ndof)("no n_dof or basFcts->n_dof\n");
for (int i = 0; i < mesh->getNumberOfDOFAdmin(); i++) {
admin_local = &(mesh->getDofAdmin(i));
int j = 0;
......@@ -38,6 +40,7 @@ namespace AMDiS {
break;
admin_local = NULL;
}
if (!admin_local)
admin_local = mesh->createDOFAdmin(name, *ndof);
......@@ -46,6 +49,7 @@ namespace AMDiS {
feSpaces.push_back(this);
}
FiniteElemSpace::FiniteElemSpace()
......@@ -98,7 +102,7 @@ namespace AMDiS {
void FiniteElemSpace::clear()
{
for (int i = 0; i < static_cast<int>(feSpaces.size()); i++) {
for (unsigned int i = 0; i < feSpaces.size(); i++) {
if (feSpaces[i]) {
delete feSpaces[i];
feSpaces[i] = NULL;
......
AMDiS/src/Parameters.cc
View file @ 3e8be011
......@@ -191,8 +191,8 @@ namespace AMDiS {
}
if (sstr.length() > 0)
vecVal->push_back(atof(sstr.c_str()));
if(vecVal->size()==0)
WARNING("no values in parameter vector!\n");
if (vecVal->size() == 0)
WARNING("no values in parameter vector!\n");
}
break;
case 'D': // list of int values, example parameter: {a,b,c,d,e}
......@@ -221,7 +221,7 @@ namespace AMDiS {
}
if (sstr.length() > 0)
vecVal->push_back(atoi(sstr.c_str()));
if(vecVal->size()==0)
if (vecVal->size() == 0)
WARNING("no values in parameter vector!\n");
}
break;
......@@ -691,11 +691,11 @@ namespace AMDiS {
if (key.size() == 0 || par.size() == 0)
return;
std::string file_str;
if(file != NULL)
std::string file_str = "";
if (file != NULL)
file_str = std::string(file);
std::string fname_str;
if(fname != NULL)
std::string fname_str = "";
if (fname != NULL)
fname_str = std::string(fname);
singlett->addParam(key, par, file_str, line, fname_str);
......
AMDiS/src/parallel/MeshDistributor.cc
View file @ 3e8be011
......@@ -41,11 +41,6 @@ namespace AMDiS {
return (*dof1 < *dof2);
}
bool cmpElement(MacroElement* lhs, MacroElement* rhs)
{
return lhs->getIndex() < rhs->getIndex();
}
MeshDistributor::MeshDistributor(std::string str)
: probStat(0),
......@@ -63,6 +58,7 @@ namespace AMDiS {
repartitioningAllowed(false),
nTimestepsAfterLastRepartitioning(0),
repartCounter(0),
debugOutputDir(""),
lastMeshChangeIndex(0)
{
FUNCNAME("MeshDistributor::ParalleDomainBase()");
......@@ -74,6 +70,8 @@ namespace AMDiS {
int tmp = 0;
GET_PARAMETER(0, name + "->repartitioning", "%d", &tmp);
repartitioningAllowed = (tmp > 0);
GET_PARAMETER(0, name + "->debug output dir", &debugOutputDir);
}
......@@ -145,8 +143,8 @@ namespace AMDiS {
GET_PARAMETER(0, "dbg->write part mesh", "%d", &writePartMesh);
if (writePartMesh > 0) {
debug::writeElementIndexMesh(mesh, "elementIndex.vtu");
writePartitioningMesh("part.vtu");
debug::writeElementIndexMesh(mesh, debugOutputDir + "elementIndex.vtu");
writePartitioningMesh(debugOutputDir + "part.vtu");
} else {
MSG("Skip write part mesh!\n");
}
......@@ -192,7 +190,7 @@ namespace AMDiS {
ParallelDebug::testCommonDofs(*this, true);
ParallelDebug::testGlobalIndexByCoords(*this);
debug::writeMesh(feSpace, -1, "macro_mesh");
debug::writeMesh(feSpace, -1, debugOutputDir + "macro_mesh");
MSG("Debug mode tests finished!\n");
#endif
......@@ -210,15 +208,11 @@ namespace AMDiS {
if (globalRefinement > 0) {
refineManager->globalRefine(mesh, globalRefinement);
#if (DEBUG != 0)
debug::writeMesh(feSpace, -1, "gr_mesh");
#endif
updateLocalGlobalNumbering();
// === Update periodic mapping, if there are periodic boundaries. ===
// === Update periodic mapping, if there are periodic boundaries. ===
createPeriodicMap();
}
......@@ -497,7 +491,7 @@ namespace AMDiS {
FUNCNAME("MeshDistributor::checkMeshChange()");
#if (DEBUG != 0)
debug::writeMesh(feSpace, -1, "before_check_mesh");
debug::writeMesh(feSpace, -1, debugOutputDir + "before_check_mesh");
#endif
// === If mesh has not been changed on all ranks, return. ===
......@@ -554,7 +548,7 @@ namespace AMDiS {
} while (recvAllValues != 0);
#if (DEBUG != 0)
debug::writeMesh(feSpace, -1, "mesh");
debug::writeMesh(feSpace, -1, debugOutputDir + "mesh");
#endif
INFO(info, 8)("Parallel mesh adaption needed %.5f seconds\n",
......@@ -575,10 +569,10 @@ namespace AMDiS {
nTimestepsAfterLastRepartitioning++;
if (repartitioningAllowed) {
// if (nTimestepsAfterLastRepartitioning >= 20) {
if (nTimestepsAfterLastRepartitioning >= 20) {
repartitionMesh();
nTimestepsAfterLastRepartitioning = 0;
// }
}
}
}
......@@ -995,16 +989,15 @@ namespace AMDiS {
return;
#if (DEBUG != 0)
// if (repartCounter == 0) {
{
if (repartCounter == 0) {
std::stringstream oss;
oss << "partitioning-" << repartCounter << ".vtu";
oss << debugOutputDir << "partitioning-" << repartCounter << ".vtu";
DOFVector<double> tmpa(feSpace, "tmp");
tmpa.set(mpiRank);
VtkWriter::writeFile(&tmpa, oss.str());
repartCounter++;
}
}
MSG("USED-SIZE A: %d\n", mesh->getDofAdmin(0).getUsedDofs());
#endif
......@@ -1049,9 +1042,7 @@ namespace AMDiS {
}
}
bool (*fn_pt)(MacroElement*, MacroElement*) = cmpElement;
std::set<MacroElement* , bool(*)(MacroElement*, MacroElement*)> allMacroEl(fn_pt);
std::set<MacroElement*> allMacroEl;
for (std::set<MacroElement*>::iterator it = newMacroEl.begin();
it != newMacroEl.end(); ++it)
allMacroEl.insert(*it);
......@@ -1195,7 +1186,7 @@ namespace AMDiS {
#if (DEBUG != 0)
std::stringstream oss;
oss << "partitioning-" << repartCounter << ".vtu";
oss << debugOutputDir << "partitioning-" << repartCounter << ".vtu";
DOFVector<double> tmpa(feSpace, "tmp");
tmpa.set(mpiRank);
VtkWriter::writeFile(&tmpa, oss.str());
......@@ -1220,7 +1211,7 @@ namespace AMDiS {
ParallelDebug::testCommonDofs(*this, true);
ParallelDebug::testGlobalIndexByCoords(*this);
debug::writeMesh(feSpace, -1, "macro_mesh");
debug::writeMesh(feSpace, -1, debugOutputDir + "macro_mesh");
MSG("Debug mode tests finished!\n");
#endif
......@@ -1801,13 +1792,13 @@ namespace AMDiS {
#if (DEBUG != 0)
std::stringstream oss;
oss << "elementIndex-" << mpiRank << ".vtu";
oss << debugOutputDir << "elementIndex-" << mpiRank << ".vtu";
debug::writeElementIndexMesh(mesh, oss.str());
debug::testSortedDofs(mesh, elMap);
ParallelDebug::testCommonDofs(*this, true);
ParallelDebug::testGlobalIndexByCoords(*this);
ParallelDebug::writeDebugFile(*this, "mpi-dbg", "dat");
ParallelDebug::writeDebugFile(*this, debugOutputDir + "mpi-dbg", "dat");
#if 0
MSG("------------- Debug information -------------\n");
......
AMDiS/src/parallel/MeshDistributor.h
View file @ 3e8be011
......@@ -571,6 +571,9 @@ namespace AMDiS {
int repartCounter;
/// Directory name where all debug output files should be written to.
std::string debugOutputDir;
/** \brief
* Stores the mesh change index. This is used to recognize changes in the mesh
* structure (e.g. through refinement or coarsening managers).
......
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