Update patches to Dune 2.3 and git.

Apply patches now with -p1 instead of -p0.
(reviewed and improved by bernd)


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12750 2fb0f335-1f38-0410-981e-8018bf24f1b0

patches/README

 - In order to use the AMGBackend, you have to apply the patch 
-  pdelab-1.0.1.patch / pdelab-1.1.0.patch in your directory containing
-  DUNE-PDELab 1.0.1 / 1.1.0, e.g.:
-  patch -p0 <../dumux/patches/pdelab-1.0.1.patch
+  pdelab-1.1.0.patch in your directory containing
+  DUNE-PDELab 1.1.0, e.g.:
+  patch -p1 <../dumux/patches/pdelab-1.1.0.patch
 
 - If the AMGBackend should be used without SuperLU as coarse grid solver, it can
   be benefitial to decrease the corresponding tolerance. To do so, apply the
-  patch istl-2.2.0.patch / istl-2.2.1.patch in your directory containing
-  DUNE-ISTL 2.2.0 / 2.2.1, e.g.:
-  patch -p0 <../dumux/patches/istl-2.2.0.patch
-
-- To use DuMuX with Dune-trunk in versions after 2013-03-20 (dune-common r7429)
-  m4/dumux.m4 must be patched. This will be done in DuMuX-trunk after the
-  Dune 2.3 release. Otherwise dumux-devel and dumux-lecture will not be able
-  to find the module DuMuX.
-  To patch your local copy inside the dumux folder:
-  patch -p0 < ../patches/dumux-m4.patch
\ No newline at end of file
+  patch istl-2.3.0.patch in your directory containing
+  DUNE-ISTL 2.3.0, e.g.:
+  patch -p1 <../dumux/patches/istl-2.3.0.patch

patches/istl-2.2.0.patch

-Index: dune/istl/paamg/amg.hh
-===================================================================
---- dune/istl/paamg/amg.hh	(revision 1705)
-+++ dune/istl/paamg/amg.hh	(working copy)
-@@ -475,13 +475,13 @@
- 		  // We are still participating on this level
- 		  solver_ = new BiCGSTABSolver<X>(const_cast<M&>(matrices_->matrices().coarsest().getRedistributed()), 
- 						  *scalarProduct_, 
--						  *coarseSmoother_, 1E-2, 10000, 0);
-+						  *coarseSmoother_, 1E-12, 10000, 0);
- 		else
- 		  solver_ = 0;
- 	      }else
- 	      solver_ = new BiCGSTABSolver<X>(const_cast<M&>(*matrices_->matrices().coarsest()), 
- 					      *scalarProduct_, 
--					      *coarseSmoother_, 1E-2, 1000, 0);
-+					      *coarseSmoother_, 1E-12, 1000, 0);
- 	  }
-       }
-     }

patches/istl-2.2.1.patch

-Index: dune/istl/paamg/amg.hh
-===================================================================
---- dune/istl/paamg/amg.hh	(revision 1705)
-+++ dune/istl/paamg/amg.hh	(working copy)
-@@ -504,13 +504,13 @@
- 		  // We are still participating on this level
- 		  solver_ = new BiCGSTABSolver<X>(const_cast<M&>(matrices_->matrices().coarsest().getRedistributed()), 
- 						  *scalarProduct_, 
--						  *coarseSmoother_, 1E-2, 10000, 0);
-+						  *coarseSmoother_, 1E-12, 10000, 0);
- 		else
- 		  solver_ = 0;
- 	      }else
- 	      solver_ = new BiCGSTABSolver<X>(const_cast<M&>(*matrices_->matrices().coarsest()), 
- 					      *scalarProduct_, 
--					      *coarseSmoother_, 1E-2, 1000, 0);
-+					      *coarseSmoother_, 1E-12, 1000, 0);
- 	  }
-       }
-     }

patches/istl-2.3.0.patch

+diff --git a/dune/istl/paamg/amg.hh b/dune/istl/paamg/amg.hh
+index a224b2b..ee48857 100644
+--- a/dune/istl/paamg/amg.hh
++++ b/dune/istl/paamg/amg.hh
+@@ -527,13 +527,13 @@ namespace Dune
+               // We are still participating on this level
+               solver_.reset(new BiCGSTABSolver<X>(const_cast<M&>(matrices_->matrices().coarsest().getRedistributed()),
+                                                   *scalarProduct_,
+-                                                  *coarseSmoother_, 1E-2, 1000, 0));
++                                                  *coarseSmoother_, 1E-12, 1000, 0));
+             else
+               solver_.reset();
+           }else
+             solver_.reset(new BiCGSTABSolver<X>(const_cast<M&>(*matrices_->matrices().coarsest()),
+                                                 *scalarProduct_,
+-                                                *coarseSmoother_, 1E-2, 1000, 0));
++                                                *coarseSmoother_, 1E-12, 1000, 0));
+         }
+       }
+ 

patches/pdelab-1.1.0.patch

-Index: dune/pdelab/backend/istlvectorbackend.hh
-===================================================================
---- dune/pdelab/backend/istlvectorbackend.hh	(revision 2292)
-+++ dune/pdelab/backend/istlvectorbackend.hh	(working copy)
-@@ -30,6 +34,8 @@
+diff --git a/dune/pdelab/backend/istlvectorbackend.hh b/dune/pdelab/backend/istlvectorbackend.hh
+index ad2419e..ef219f3 100644
+--- a/dune/pdelab/backend/istlvectorbackend.hh
++++ b/dune/pdelab/backend/istlvectorbackend.hh
+@@ -30,6 +30,8 @@ namespace Dune {
        typedef typename ContainerType::size_type size_type;
        typedef ISTLVectorBackend<BLOCKSIZE> Backend;
  
@@ -11,7 +11,7 @@ Index: dune/pdelab/backend/istlvectorbackend.hh
        ISTLBlockVectorContainer (const T& t_) : container(t_.globalSize()/BLOCKSIZE)
        {}
        ISTLBlockVectorContainer (const T& t_, const E& e) : container(t_.globalSize()/BLOCKSIZE)
-@@ -89,6 +95,11 @@
+@@ -89,6 +91,11 @@ namespace Dune {
          return container.two_norm();
        }
  
@@ -23,7 +23,7 @@ Index: dune/pdelab/backend/istlvectorbackend.hh
        typename Dune::template FieldTraits<E>::real_type one_norm() const
        {
          return container.one_norm();
-@@ -163,6 +174,16 @@
+@@ -163,6 +170,16 @@ namespace Dune {
          return container.size()*BLOCKSIZE;
        }
  
@@ -32,7 +32,7 @@ Index: dune/pdelab/backend/istlvectorbackend.hh
 +        return container.size();
 +      }
 +
-+      void resize(size_t n) 
++      void resize(size_t n)
 +      {
 +        container.resize(n);
 +      }
@@ -40,11 +40,11 @@ Index: dune/pdelab/backend/istlvectorbackend.hh
        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)
-@@ -1251,7 +1251,7 @@
+diff --git a/dune/pdelab/backend/novlpistlsolverbackend.hh b/dune/pdelab/backend/novlpistlsolverbackend.hh
+index 49a0080..9bf1eae 100644
+--- a/dune/pdelab/backend/novlpistlsolverbackend.hh
++++ b/dune/pdelab/backend/novlpistlsolverbackend.hh
+@@ -1251,7 +1251,7 @@ namespace Dune {
                              int verbose_=1, bool reuse_=false,
                              bool usesuperlu_=true)
          : gfs(gfs_), phelper(gfs,verbose_), maxiter(maxiter_),
@@ -53,7 +53,7 @@ Index: dune/pdelab/backend/novlpistlsolverbackend.hh
            verbose(verbose_), reuse(reuse_), firstapply(true),
            usesuperlu(usesuperlu_)
        {
-@@ -1314,10 +1314,10 @@
+@@ -1314,10 +1314,10 @@ namespace Dune {
          \param[in] r right hand side
          \param[in] reduction to be achieved
        */
@@ -66,11 +66,11 @@ Index: dune/pdelab/backend/novlpistlsolverbackend.hh
          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)
-@@ -803,7 +803,7 @@
+diff --git a/dune/pdelab/backend/ovlpistlsolverbackend.hh b/dune/pdelab/backend/ovlpistlsolverbackend.hh
+index 107a831..40c252f 100644
+--- a/dune/pdelab/backend/ovlpistlsolverbackend.hh
++++ b/dune/pdelab/backend/ovlpistlsolverbackend.hh
+@@ -803,7 +803,7 @@ namespace Dune {
        ISTLBackend_AMG(const GFS& gfs_, unsigned maxiter_=5000, 
                        int verbose_=1, bool reuse_=false,
                        bool usesuperlu_=true)
@@ -79,7 +79,7 @@ Index: dune/pdelab/backend/ovlpistlsolverbackend.hh
            verbose(verbose_), reuse(reuse_), firstapply(true),
            usesuperlu(usesuperlu_)
        {
-@@ -864,11 +864,12 @@
+@@ -864,11 +864,12 @@ namespace Dune {
          \param[in] r right hand side
          \param[in] reduction to be achieved
        */
@@ -94,7 +94,7 @@ Index: dune/pdelab/backend/ovlpistlsolverbackend.hh
          typedef Dune::Amg::CoarsenCriterion<Dune::Amg::SymmetricCriterion<MatrixType,
            Dune::Amg::FirstDiagonal> > Criterion;
  #if HAVE_MPI
-@@ -900,8 +901,7 @@
+@@ -900,8 +901,7 @@ namespace Dune {
          Solver<VectorType> solver(oop,sp,*amg,reduction,maxiter,verb);
          Dune::InverseOperatorResult stat;
          
@@ -104,11 +104,11 @@ Index: dune/pdelab/backend/ovlpistlsolverbackend.hh
          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)
-@@ -543,10 +543,10 @@
+diff --git a/dune/pdelab/backend/seqistlsolverbackend.hh b/dune/pdelab/backend/seqistlsolverbackend.hh
+index 4d69622..a54c27c 100644
+--- a/dune/pdelab/backend/seqistlsolverbackend.hh
++++ b/dune/pdelab/backend/seqistlsolverbackend.hh
+@@ -543,10 +543,10 @@ namespace Dune {
          \param[in] r right hand side
          \param[in] reduction to be achieved
        */