From 5804e7785b2d183fdc9eeb6f5d719051aa4659dc Mon Sep 17 00:00:00 2001
From: Thomas Witkowski <thomas.witkowski@gmx.de>
Date: Wed, 9 Jul 2008 12:10:45 +0000
Subject: [PATCH] * Small changes
---
AMDiS/src/Mesh.cc | 4 +++-
AMDiS/src/ProblemVec.cc | 5 ++---
AMDiS/src/Traverse.cc | 10 +++++-----
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/AMDiS/src/Mesh.cc b/AMDiS/src/Mesh.cc
index 0e31ba41..92b5496a 100644
--- a/AMDiS/src/Mesh.cc
+++ b/AMDiS/src/Mesh.cc
@@ -374,11 +374,13 @@ namespace AMDiS {
if ((size = compressAdmin->getSize()) < 1)
continue;
+
if (compressAdmin->getUsedDOFs() < 1)
continue;
+
if (compressAdmin->getHoleCount() < 1)
continue;
-
+
newDOF.resize(size);
compressAdmin->compress(newDOF);
diff --git a/AMDiS/src/ProblemVec.cc b/AMDiS/src/ProblemVec.cc
index 094e7053..74618453 100644
--- a/AMDiS/src/ProblemVec.cc
+++ b/AMDiS/src/ProblemVec.cc
@@ -659,8 +659,7 @@ namespace AMDiS {
double wtime = omp_get_wtime();
#endif
- int numMeshes = static_cast<int>(meshes_.size());
- for (int i = 0; i < numMeshes; i++) {
+ for (int i = 0; i < static_cast<int>(meshes_.size()); i++) {
meshes_[i]->dofCompress();
}
@@ -678,6 +677,7 @@ namespace AMDiS {
assembleFlag |= Mesh::FILL_BOUND;
}
+
for (int i = 0; i < numComponents_; i++) {
MSG("%d DOFs for %s\n",
componentSpaces_[i]->getAdmin()->getUsedSize(),
@@ -695,7 +695,6 @@ namespace AMDiS {
}
}
-
int i;
#ifdef _OPENMP
#pragma omp parallel for
diff --git a/AMDiS/src/Traverse.cc b/AMDiS/src/Traverse.cc
index 83766cfc..aaf77abe 100644
--- a/AMDiS/src/Traverse.cc
+++ b/AMDiS/src/Traverse.cc
@@ -117,7 +117,7 @@ namespace AMDiS {
FUNCNAME("Traverse::recursive()");
Element *el = elinfo->getElement();
- int mg_level, sum=0;
+ int mg_level, sum = 0;
Parametric *parametric = mesh->getParametric();
ElInfo::traverseId = id;
@@ -125,9 +125,9 @@ namespace AMDiS {
if (el->getFirstChild()) {
ElInfo* elinfo_new = mesh->createNewElInfo();
elinfo_new->fillElInfo(0, elinfo);
- sum+=recursive(elinfo_new);
+ sum += recursive(elinfo_new);
elinfo_new->fillElInfo(1, elinfo);
- sum+=recursive(elinfo_new);
+ sum += recursive(elinfo_new);
DELETE elinfo_new;
} else {
if (el_fct != NULL) {
@@ -149,9 +149,9 @@ namespace AMDiS {
}
ElInfo* elinfo_new = mesh->createNewElInfo();
elinfo_new->fillElInfo(0, elinfo);
- sum+=recursive(elinfo_new);
+ sum += recursive(elinfo_new);
elinfo->fillElInfo(1, elinfo);
- sum+=recursive(elinfo_new);
+ sum += recursive(elinfo_new);
DELETE elinfo_new;
}
else {
--
GitLab