From cc9a77f958fb935ded475af61eee0047bf3ed138 Mon Sep 17 00:00:00 2001
From: Markus Blatt <mblatt@dune-project.org>
Date: Mon, 30 Apr 2012 22:04:34 +0000
Subject: [PATCH] Removed deprecation warnings.
[[Imported from SVN: r1565]]
---
doc/comm/buildindexset.hh | 10 +++++-----
doc/comm/indexset.cc | 7 ++-----
doc/comm/poosc08.cc | 4 ++--
doc/comm/poosc08_test.cc | 12 ++++++------
4 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/doc/comm/buildindexset.hh b/doc/comm/buildindexset.hh
index 7ed11241d..941d93ca2 100644
--- a/doc/comm/buildindexset.hh
+++ b/doc/comm/buildindexset.hh
@@ -5,8 +5,8 @@
#define BUILDINDEXSET_HH
-#include <dune/istl/indexset.hh>
-#include <dune/istl/plocalindex.hh>
+#include <dune/common/parallel/indexset.hh>
+#include <dune/common/parallel/plocalindex.hh>
/**
* @brief Flag for marking the indices.
@@ -23,9 +23,9 @@ typedef Dune::ParallelLocalIndex<Flag> LocalIndex;
template<class C, class TG, int N>
void build(C& comm, Dune::ParallelIndexSet<TG,LocalIndex,N>& indexSet)
{
- //
- // The number of processes
- int size=comm.size();
+
+
+
// The rank of our process
int rank=comm.rank();
diff --git a/doc/comm/indexset.cc b/doc/comm/indexset.cc
index d93008d72..eed22ad7f 100644
--- a/doc/comm/indexset.cc
+++ b/doc/comm/indexset.cc
@@ -4,8 +4,8 @@
#include "config.h"
-#include <dune/istl/indexset.hh>
-#include <dune/istl/plocalindex.hh>
+#include <dune/common/parallel/indexset.hh>
+#include <dune/common/parallel/plocalindex.hh>
#include <iostream>
#include "dune/common/mpihelper.hh"
#include "buildindexset.hh"
@@ -17,9 +17,6 @@ int main(int argc, char **argv)
// initialize mpi first.
Dune::MPIHelper& helper = Dune::MPIHelper::instance(argc, argv);
- // The number of processes
- int size = helper.size();
-
// The rank of our process
int rank = helper.rank();
diff --git a/doc/comm/poosc08.cc b/doc/comm/poosc08.cc
index 580cd787f..b869d2348 100644
--- a/doc/comm/poosc08.cc
+++ b/doc/comm/poosc08.cc
@@ -6,8 +6,8 @@
#include <iostream>
#include <dune/common/mpihelper.hh> // An initializer of MPI
#include <dune/common/exceptions.hh> // We use exceptions
-#include <dune/istl/indexset.hh>
-#include <dune/istl/plocalindex.hh>
+#include <dune/common/parallel/indexset.hh>
+#include <dune/common/parallel/plocalindex.hh>
enum Flags { owner, ghost };
diff --git a/doc/comm/poosc08_test.cc b/doc/comm/poosc08_test.cc
index 177eacf92..953c1c1e6 100644
--- a/doc/comm/poosc08_test.cc
+++ b/doc/comm/poosc08_test.cc
@@ -6,11 +6,11 @@
#include <iostream>
#include <dune/common/mpihelper.hh> // An initializer of MPI
#include <dune/common/exceptions.hh> // We use exceptions
-#include <dune/istl/indexset.hh>
-#include <dune/istl/remoteindices.hh>
-#include <dune/istl/communicator.hh>
-#include <dune/istl/plocalindex.hh>
-#include <dune/istl/interface.hh>
+#include <dune/common/parallel/indexset.hh>
+#include <dune/common/parallel/remoteindices.hh>
+#include <dune/common/parallel/communicator.hh>
+#include <dune/common/parallel/plocalindex.hh>
+#include <dune/common/parallel/interface.hh>
#include <dune/common/enumset.hh>
enum Flags { owner, ghost };
@@ -136,7 +136,7 @@ int main(int argc, char** argv)
//Maybe initialize Mpi
MPIHelper& helper = MPIHelper::instance(argc, argv);
- std::cout << "Hello World! This is poosc08." << std::endl;
+ std::cout << "Hello World! This is poosc08. rank=" <<helper.rank()<< std::endl;
if(Dune::MPIHelper::isFake)
std::cout<< "This is a sequential program." << std::endl;
else{
--
GitLab