From ed5029d4ea7fb16f0f55b9a29fb65ea8782922db Mon Sep 17 00:00:00 2001
From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de>
Date: Fri, 21 Mar 2014 13:08:30 +0000
Subject: [PATCH] Remove support for PDELab 1.0.1.
Only PDELab 1.1 is supported.
(reviewed by bernd)
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12646 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
CHANGELOG | 3 +-
patches/pdelab-1.0.1.patch | 123 -------------------------------------
2 files changed, 2 insertions(+), 124 deletions(-)
delete mode 100644 patches/pdelab-1.0.1.patch
diff --git a/CHANGELOG b/CHANGELOG
index c396a846c9..43ee5ced32 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,8 +7,9 @@ Differences Between DuMuX 2.4 and DuMuX 2.5
- The three-dimensional implementation of the MPFA L-method is made
available for the decoupled compositional 2p2c models. It also allows
for simulation on an adaptive grid.
-
+
* IMMEDIATE INTERFACE CHANGES not allowing/requiring a deprecation period:
+ - Dropped support for PDELab 1.0.1, PDELab 1.1 is required.
* Deprecated CLASSES/FILES, to be removed after 2.5:
diff --git a/patches/pdelab-1.0.1.patch b/patches/pdelab-1.0.1.patch
deleted file mode 100644
index ebff4909fc..0000000000
--- a/patches/pdelab-1.0.1.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-Index: dune/pdelab/backend/istlvectorbackend.hh
-===================================================================
---- dune/pdelab/backend/istlvectorbackend.hh (revision 2292)
-+++ dune/pdelab/backend/istlvectorbackend.hh (working copy)
-@@ -30,6 +34,8 @@
- typedef typename ContainerType::size_type size_type;
- typedef ISTLVectorBackend<BLOCKSIZE> Backend;
-
-+ ISTLBlockVectorContainer ()
-+ {}
- ISTLBlockVectorContainer (const T& t_) : container(t_.globalSize()/BLOCKSIZE)
- {}
- ISTLBlockVectorContainer (const T& t_, const E& e) : container(t_.globalSize()/BLOCKSIZE)
-@@ -89,6 +95,11 @@
- return container.two_norm();
- }
-
-+ typename Dune::template FieldTraits<E>::real_type two_norm2() const
-+ {
-+ return container.two_norm2();
-+ }
-+
- typename Dune::template FieldTraits<E>::real_type one_norm() const
- {
- return container.one_norm();
-@@ -163,6 +174,16 @@
- return container.size()*BLOCKSIZE;
- }
-
-+ size_t size() const
-+ {
-+ return container.size();
-+ }
-+
-+ void resize(size_t n)
-+ {
-+ container.resize(n);
-+ }
-+
- template<typename X>
- void std_copy_to (std::vector<X>& x) const
- {
-Index: dune/pdelab/backend/novlpistlsolverbackend.hh
-===================================================================
---- dune/pdelab/backend/novlpistlsolverbackend.hh (revision 2292)
-+++ dune/pdelab/backend/novlpistlsolverbackend.hh (working copy)
-@@ -1153,7 +1153,7 @@
- int verbose_=1, bool reuse_=false,
- bool usesuperlu_=true)
- : gfs(gfs_), phelper(gfs,verbose_), maxiter(maxiter_),
-- params(15,2000,1.2,1.6,Dune::Amg::atOnceAccu),
-+ params(15,2000,1.2,1.6,Dune::Amg::noAccu/*Dune::Amg::atOnceAccu*/),
- verbose(verbose_), reuse(reuse_), firstapply(true),
- usesuperlu(usesuperlu_)
- {
-@@ -1209,10 +1209,10 @@
- return psp.norm(x);
- }
-
-- void apply(M& A, V& z, V& r, typename V::ElementType reduction)
-+ void apply(MatrixType& A, V& z, V& r, typename V::ElementType reduction)
- {
- Timer watch;
-- MatrixType& mat=A.base();
-+ MatrixType& mat=A;
- typedef Dune::Amg::CoarsenCriterion<Dune::Amg::SymmetricCriterion<MatrixType,
- Dune::Amg::FirstDiagonal> > Criterion;
- #if HAVE_MPI
-Index: dune/pdelab/backend/ovlpistlsolverbackend.hh
-===================================================================
---- dune/pdelab/backend/ovlpistlsolverbackend.hh (revision 2292)
-+++ dune/pdelab/backend/ovlpistlsolverbackend.hh (working copy)
-@@ -794,7 +794,7 @@
- ISTLBackend_AMG(const GFS& gfs_, unsigned maxiter_=5000,
- int verbose_=1, bool reuse_=false,
- bool usesuperlu_=true)
-- : gfs(gfs_), phelper(gfs,verbose_), maxiter(maxiter_), params(15,2000),
-+ : gfs(gfs_), phelper(gfs,verbose_), maxiter(maxiter_), params(15,2000,1.2,1.6,Dune::Amg::atOnceAccu),
- verbose(verbose_), reuse(reuse_), firstapply(true),
- usesuperlu(usesuperlu_)
- {
-@@ -855,11 +855,12 @@
- \param[in] r right hand side
- \param[in] reduction to be achieved
- */
-- void apply(M& A, V& z, V& r, typename V::ElementType reduction)
-+ template <class Vector>
-+ void apply(MatrixType& A, Vector& z, Vector& r, typename V::ElementType reduction)
- {
- Timer watch;
- Comm oocc(gfs.gridView().comm());
-- MatrixType& mat=A.base();
-+ MatrixType& mat=A;
- typedef Dune::Amg::CoarsenCriterion<Dune::Amg::SymmetricCriterion<MatrixType,
- Dune::Amg::FirstDiagonal> > Criterion;
- #if HAVE_MPI
-@@ -891,7 +892,8 @@
- Solver<VectorType> solver(oop,sp,*amg,reduction,maxiter,verb);
- Dune::InverseOperatorResult stat;
-
-- solver.apply(BlockProcessor<GFS>::getVector(z),BlockProcessor<GFS>::getVector(r),stat);
-+// solver.apply(BlockProcessor<GFS>::getVector(z),BlockProcessor<GFS>::getVector(r),stat);
-+ solver.apply(z,r,stat);
- stats.tsolve= watch.elapsed();
- res.converged = stat.converged;
- res.iterations = stat.iterations;
-Index: dune/pdelab/backend/seqistlsolverbackend.hh
-===================================================================
---- dune/pdelab/backend/seqistlsolverbackend.hh (revision 2292)
-+++ dune/pdelab/backend/seqistlsolverbackend.hh (working copy)
-@@ -542,10 +542,10 @@
- \param[in] r right hand side
- \param[in] reduction to be achieved
- */
-- void apply(M& A, V& z, V& r, typename V::ElementType reduction)
-+ void apply(MatrixType& A, V& z, V& r, typename V::ElementType reduction)
- {
- Timer watch;
-- MatrixType& mat=A.base();
-+ MatrixType& mat=A;
- typedef Dune::Amg::CoarsenCriterion<Dune::Amg::SymmetricCriterion<MatrixType,
- Dune::Amg::FirstDiagonal> > Criterion;
- SmootherArgs smootherArgs;
--
GitLab