From 07315db35fc6c9cebfd6d6b78039cccc6058eafd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich@dune-project.org>
Date: Tue, 1 May 2012 08:51:05 +0000
Subject: [PATCH] Fixed support for sequential case of matrixmarkettest.cc.
Some #ifndef MM_SEQUENTIAL were not correctly replaced by #if HAVE_MPI.
[[Imported from SVN: r1566]]
---
dune/istl/test/matrixmarkettest.cc | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/dune/istl/test/matrixmarkettest.cc b/dune/istl/test/matrixmarkettest.cc
index 65005cc8..0f29d46b 100644
--- a/dune/istl/test/matrixmarkettest.cc
+++ b/dune/istl/test/matrixmarkettest.cc
@@ -25,7 +25,6 @@ int main(int argc, char** argv)
MPI_Init(&argc, &argv);
int size;
MPI_Comm_size(MPI_COMM_WORLD, &size);
-#else
#endif
const int BS=1;
int N=100;
@@ -64,7 +63,7 @@ int main(int argc, char** argv)
*sentry=i;
}
-#ifndef HAVE_MPI
+#if HAVE_MPI
comm.remoteIndices().rebuild<false>();
comm.copyOwnerToAll(bv,bv);
@@ -85,7 +84,7 @@ int main(int argc, char** argv)
BCRSMat mat1;
BVector bv1,cv1;
-#ifndef HAVE_MPI
+#if HAVE_MPI
Communication comm1(MPI_COMM_WORLD);
loadMatrixMarket(mat1, std::string("testmat"), comm1);
@@ -126,7 +125,7 @@ int main(int argc, char** argv)
cv1.resize(mat1.M());
-#ifndef HAVE_MPI
+#if HAVE_MPI
Dune::OverlappingSchwarzOperator<BCRSMat,BVector,BVector,Communication> op1(mat1, comm1);
op1.apply(bv1, cv1);
@@ -148,7 +147,7 @@ int main(int argc, char** argv)
++ret;
}
-#ifndef HAVE_MPI
+#if HAVE_MPI
if(ret!=0)
MPI_Abort(MPI_COMM_WORLD, ret);
MPI_Finalize();
--
GitLab