From fa90fb0d28206f163fdaa36897aaaaa80b5ad1e6 Mon Sep 17 00:00:00 2001
From: Thomas Witkowski <thomas.witkowski@gmx.de>
Date: Thu, 24 May 2012 11:53:57 +0000
Subject: [PATCH] Fixed for compiling AMDiS in seq mode.
---
AMDiS/src/est/ResidualEstimator.cc | 24 ++++--------------------
1 file changed, 4 insertions(+), 20 deletions(-)
diff --git a/AMDiS/src/est/ResidualEstimator.cc b/AMDiS/src/est/ResidualEstimator.cc
index 56deb13a..0c192170 100644
--- a/AMDiS/src/est/ResidualEstimator.cc
+++ b/AMDiS/src/est/ResidualEstimator.cc
@@ -239,27 +239,9 @@ namespace AMDiS {
stdMpiDet.updateSendDataSize();
stdMpiGrdUh.updateSendDataSize();
-#if 0
- RankToBoundMap& ownBound = intBoundary.getOwn();
-
- for (RankToBoundMap::iterator it = ownBound.begin();
- it != ownBound.end(); ++it) {
-
- for (unsigned int i = 0; i < it->second.size(); i++) {
- BoundaryObject &bObj = it->second[i].rankObj;
- if (bObj.subObj != VERTEX) {
- stdMpiDet.recv(it->first);
- stdMpiGrdUh.recv(it->first);
- break;
- }
- }
- }
-#endif
-
stdMpiDet.startCommunication();
stdMpiGrdUh.startCommunication();
-
for (RankToBoundMap::iterator it = allBounds.begin();
it != allBounds.end(); ++it) {
vector<BoundaryObject> subBound;
@@ -286,8 +268,6 @@ namespace AMDiS {
elBoundGrdUhNeigh[subBound[i]] = stdMpiGrdUh.getRecvData(it->first)[i];
}
}
-
- MSG("INIT PARALLEL FINISCHED!\n");
}
#endif
@@ -580,7 +560,9 @@ namespace AMDiS {
} else {
TEST_EXIT_DBG(!parametric)("No yet implemented!\n");
+#ifdef HAVE_PARALLEL_DOMAIN_AMDIS
detNeigh = elBoundDet[blub];
+#endif
}
@@ -609,7 +591,9 @@ namespace AMDiS {
basFcts[system]->evalGrdUh(*lambda, *lambdaNeigh, uhNeigh[system], grdUhNeigh[iq]);
} else {
+#ifdef HAVE_PARALLEL_DOMAIN_AMDIS
grdUhNeigh[iq] = elBoundGrdUhNeigh[blub][iq];
+#endif
}
--
GitLab