[multidomain] Re-add patch for Dune-multidomaingrid.

We still need to patch Dune-multidomaingrid. Since we anyway need
to patch, the issue with GCC 6 can also be solved by the patch.

Thanks to Thomas for noticing.

bin/installexternal.sh

@@ -174,6 +174,10 @@ installMultidomainGrid()
         rm -rf dune-multidomaingrid
         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/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh

@@ -32,9 +32,6 @@
 #ifndef DUMUX_2CNISTOKES2P2CNIPROBLEM_HH
 #define DUMUX_2CNISTOKES2P2CNIPROBLEM_HH
 
-//! \todo required for multidomaingrid.hh and GCC 6, delete if fixed there
-#include <numeric>
-
 #include <dune/common/float_cmp.hh>
 #include <dune/grid/common/gridinfo.hh>
 #include <dune/grid/multidomaingrid.hh>

test/multidomain/2cnizeroeq2p2cni/2cnizeroeq2p2cniproblem.hh

@@ -24,9 +24,6 @@
 #ifndef DUMUX_TWOCNIZEROEQTWOPTWOCNIPROBLEM_HH
 #define DUMUX_TWOCNIZEROEQTWOPTWOCNIPROBLEM_HH
 
-//! \todo required for multidomaingrid.hh and GCC 6, delete if fixed there
-#include <numeric>
-
 #include <dune/grid/multidomaingrid.hh>
 #include <dune/grid/common/gridinfo.hh>
 

test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh

@@ -32,9 +32,6 @@
 #ifndef DUMUX_2CSTOKES2P2CPROBLEM_HH
 #define DUMUX_2CSTOKES2P2CPROBLEM_HH
 
-//! \todo required for multidomaingrid.hh and GCC 6, delete if fixed there
-#include <numeric>
-
 #include <dune/common/float_cmp.hh>
 #include <dune/grid/common/gridinfo.hh>
 #include <dune/grid/multidomaingrid.hh>

test/multidomain/2czeroeq2p2c/2czeroeq2p2cproblem.hh

@@ -24,9 +24,6 @@
 #ifndef DUMUX_TWOCZEROEQTWOPTWOCPROBLEM_HH
 #define DUMUX_TWOCZEROEQTWOPTWOCPROBLEM_HH
 
-//! \todo required for multidomaingrid.hh and GCC 6, delete if fixed there
-#include <numeric>
-
 #include <dune/grid/multidomaingrid.hh>
 #include <dune/grid/common/gridinfo.hh>
 

test/multidomain/README

@@ -4,6 +4,7 @@ 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: