Merge branch 'feature/follow-new-multidomaingrid-version' into 'master'

[multidomain] MultidomainGrid need no more patching

Patch has been applied upstream

See merge request !205

bin/installexternal.sh

@@ -215,9 +215,6 @@ installMultidomainGrid()
         return
     fi
 
-    echo "Applying patch for dune-multidomaingrid"
-    cd $TOPDIR/dune-multidomaingrid
-    patch -p1 < $TOPDIR/dumux/patches/multidomaingrid-2.3.patch
     cd $TOPDIR
 }
 

patches/README

-- If you want to run a Dumux multidomain model, the module dune-multidomaingrid
-  has to be patched: apply multidomaingrid-2.3.patch in the directory containing
-  the releases/2.3-branch of dune-multidomaingrid, e.g.:
-  patch -p1 <../dumux/patches/multidomaingrid-2.3.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.4.1.patch in your directory containing

patches/multidomaingrid-2.3.patch

-diff --git a/dune/grid/multidomaingrid.hh b/dune/grid/multidomaingrid.hh
-index a8b2a81..318817c 100644
---- a/dune/grid/multidomaingrid.hh
-+++ b/dune/grid/multidomaingrid.hh
-@@ -1,6 +1,8 @@
- #ifndef DUNE_MULTIDOMAINGRID_HH
- #define DUNE_MULTIDOMAINGRID_HH
- 
-+#include <numeric>
-+
- #include <dune/common/parallel/collectivecommunication.hh>
- #include <dune/grid/multidomaingrid/multidomaingrid.hh>
- #include <dune/grid/multidomaingrid/multidomainmcmgmapper.hh>
-diff --git a/dune/grid/multidomaingrid/subdomaingrid/entity.hh b/dune/grid/multidomaingrid/subdomaingrid/entity.hh
-index f65c6a8..e669710 100644
---- a/dune/grid/multidomaingrid/subdomaingrid/entity.hh
-+++ b/dune/grid/multidomaingrid/subdomaingrid/entity.hh
-@@ -413,17 +413,17 @@ public:
-     return false;
-   }
- 
--private:
--
--  const GridImp& _grid;
--  MultiDomainEntityPointer _multiDomainEntityPointer;
--
-   const EntityWrapper& operator=(const EntityWrapper& rhs) {
-     assert(_grid == rhs._grid);
-     reset(rhs._multiDomainEntityPointer);
-     return *this;
-   }
- 
-+private:
-+
-+  const GridImp& _grid;
-+  MultiDomainEntityPointer _multiDomainEntityPointer;
-+
-   template<typename MultiDomainIteratorOrEntityPointer>
-   void reset(const MultiDomainIteratorOrEntityPointer& multiDomainEntityPointer) {
-     _multiDomainEntityPointer = multiDomainEntityPointer;

test/multidomain/README

@@ -4,7 +4,6 @@ You need the following versions of the required Dune modules:
 Dune core modules: 2.4
 dune-typetree, dune-multidomaingrid: release (branch) 2.3
 Dune-PDELab, dune-multidomain: release (branch) 2.0
-dune-multidomaingrid has to be patched, see patches/README for details.
 
 The necessary modules and the correct versions can be obtained by using
 the script located in: