From 18b97ade72d0645c7c9cd4ac4487ddf62bb33cac Mon Sep 17 00:00:00 2001
From: Thomas Witkowski <thomas.witkowski@gmx.de>
Date: Fri, 7 Dec 2012 15:48:46 +0000
Subject: [PATCH] Fixed compilation issues.
---
AMDiS/src/parallel/BddcMlSolver.cc | 6 +++---
AMDiS/src/parallel/DofComm.cc | 10 ++++------
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/AMDiS/src/parallel/BddcMlSolver.cc b/AMDiS/src/parallel/BddcMlSolver.cc
index 5152b116..2894c79f 100644
--- a/AMDiS/src/parallel/BddcMlSolver.cc
+++ b/AMDiS/src/parallel/BddcMlSolver.cc
@@ -68,11 +68,11 @@ namespace AMDiS {
int nLevel = 2;
int nSubdomains[nLevel];
- nSubdomains[0] = meshDistributor->getMpiSize();
+ nSubdomains[0] = meshDistributor->getMpiComm(0).Get_size();
nSubdomains[1] = 1;
int nSubPerProc = 1;
- MPI_Fint c2f = MPI_Comm_c2f(meshDistributor->getMpiComm());
+ MPI_Fint c2f = MPI_Comm_c2f(meshDistributor->getMpiComm(0));
int verboseLevel = 2;
int numbase = 0;
@@ -164,7 +164,7 @@ namespace AMDiS {
// array of indices of subdomain elements in global numbering
int isegn[nelems];
int rStartEl, nOverallEl;
- mpi::getDofNumbering(meshDistributor->getMpiComm(),
+ mpi::getDofNumbering(meshDistributor->getMpiComm(0),
nelems, rStartEl, nOverallEl);
MSG("rStartEl = %d\n", rStartEl);
for (int i = 0; i < nelems; i++)
diff --git a/AMDiS/src/parallel/DofComm.cc b/AMDiS/src/parallel/DofComm.cc
index 4ed21232..a7304241 100644
--- a/AMDiS/src/parallel/DofComm.cc
+++ b/AMDiS/src/parallel/DofComm.cc
@@ -116,19 +116,17 @@ namespace AMDiS {
{
FUNCNAME("DofComm::getDegree()");
- TEST_EXIT_DBG(meshLevel == 0)("Not yet implemented!\n");
-
int degree = 0;
- for (map<int, FeMapType>::iterator it = sendDofs[0].begin();
- it != sendDofs[0].end(); ++it) {
+ for (map<int, FeMapType>::iterator it = sendDofs.begin();
+ it != sendDofs.end(); ++it) {
DofContainer &dc = it->second[feSpace];
if (find(dc.begin(), dc.end(), dof) != dc.end())
degree++;
}
- for (map<int, FeMapType>::iterator it = recvDofs[0].begin();
- it != recvDofs[0].end(); ++it) {
+ for (map<int, FeMapType>::iterator it = recvDofs.begin();
+ it != recvDofs.end(); ++it) {
DofContainer &dc = it->second[feSpace];
if (find(dc.begin(), dc.end(), dof) != dc.end())
degree++;
--
GitLab