Commit 5804e778 authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

* Small changes

parent 59b4dcf0
...@@ -374,11 +374,13 @@ namespace AMDiS { ...@@ -374,11 +374,13 @@ namespace AMDiS {
if ((size = compressAdmin->getSize()) < 1) if ((size = compressAdmin->getSize()) < 1)
continue; continue;
if (compressAdmin->getUsedDOFs() < 1) if (compressAdmin->getUsedDOFs() < 1)
continue; continue;
if (compressAdmin->getHoleCount() < 1) if (compressAdmin->getHoleCount() < 1)
continue; continue;
newDOF.resize(size); newDOF.resize(size);
compressAdmin->compress(newDOF); compressAdmin->compress(newDOF);
......
...@@ -659,8 +659,7 @@ namespace AMDiS { ...@@ -659,8 +659,7 @@ namespace AMDiS {
double wtime = omp_get_wtime(); double wtime = omp_get_wtime();
#endif #endif
int numMeshes = static_cast<int>(meshes_.size()); for (int i = 0; i < static_cast<int>(meshes_.size()); i++) {
for (int i = 0; i < numMeshes; i++) {
meshes_[i]->dofCompress(); meshes_[i]->dofCompress();
} }
...@@ -678,6 +677,7 @@ namespace AMDiS { ...@@ -678,6 +677,7 @@ namespace AMDiS {
assembleFlag |= Mesh::FILL_BOUND; assembleFlag |= Mesh::FILL_BOUND;
} }
for (int i = 0; i < numComponents_; i++) { for (int i = 0; i < numComponents_; i++) {
MSG("%d DOFs for %s\n", MSG("%d DOFs for %s\n",
componentSpaces_[i]->getAdmin()->getUsedSize(), componentSpaces_[i]->getAdmin()->getUsedSize(),
...@@ -695,7 +695,6 @@ namespace AMDiS { ...@@ -695,7 +695,6 @@ namespace AMDiS {
} }
} }
int i; int i;
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel for #pragma omp parallel for
......
...@@ -117,7 +117,7 @@ namespace AMDiS { ...@@ -117,7 +117,7 @@ namespace AMDiS {
FUNCNAME("Traverse::recursive()"); FUNCNAME("Traverse::recursive()");
Element *el = elinfo->getElement(); Element *el = elinfo->getElement();
int mg_level, sum=0; int mg_level, sum = 0;
Parametric *parametric = mesh->getParametric(); Parametric *parametric = mesh->getParametric();
ElInfo::traverseId = id; ElInfo::traverseId = id;
...@@ -125,9 +125,9 @@ namespace AMDiS { ...@@ -125,9 +125,9 @@ namespace AMDiS {
if (el->getFirstChild()) { if (el->getFirstChild()) {
ElInfo* elinfo_new = mesh->createNewElInfo(); ElInfo* elinfo_new = mesh->createNewElInfo();
elinfo_new->fillElInfo(0, elinfo); elinfo_new->fillElInfo(0, elinfo);
sum+=recursive(elinfo_new); sum += recursive(elinfo_new);
elinfo_new->fillElInfo(1, elinfo); elinfo_new->fillElInfo(1, elinfo);
sum+=recursive(elinfo_new); sum += recursive(elinfo_new);
DELETE elinfo_new; DELETE elinfo_new;
} else { } else {
if (el_fct != NULL) { if (el_fct != NULL) {
...@@ -149,9 +149,9 @@ namespace AMDiS { ...@@ -149,9 +149,9 @@ namespace AMDiS {
} }
ElInfo* elinfo_new = mesh->createNewElInfo(); ElInfo* elinfo_new = mesh->createNewElInfo();
elinfo_new->fillElInfo(0, elinfo); elinfo_new->fillElInfo(0, elinfo);
sum+=recursive(elinfo_new); sum += recursive(elinfo_new);
elinfo->fillElInfo(1, elinfo); elinfo->fillElInfo(1, elinfo);
sum+=recursive(elinfo_new); sum += recursive(elinfo_new);
DELETE elinfo_new; DELETE elinfo_new;
} }
else { else {
......
Supports Markdown
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