diff --git a/bin/installexternal.sh b/bin/installexternal.sh index 16b29a28432a5f0f2f5c8fe8870d9b704990345c..c4aabda510fe0adf776d3bd76f6e2e0360b0b8b5 100755 --- a/bin/installexternal.sh +++ b/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 } diff --git a/patches/README b/patches/README index ddf06ffa5bb1a0a4bf4a8eaa3611e42b32c1b010..f105b7c520f08504090b3181291e6d3620b10878 100644 --- a/patches/README +++ b/patches/README @@ -1,8 +1,3 @@ -- 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 diff --git a/patches/multidomaingrid-2.3.patch b/patches/multidomaingrid-2.3.patch deleted file mode 100644 index 9a589ed3640d2a848f07b867a022b6b0520b882d..0000000000000000000000000000000000000000 --- a/patches/multidomaingrid-2.3.patch +++ /dev/null @@ -1,40 +0,0 @@ -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; diff --git a/test/multidomain/README b/test/multidomain/README index c799bf3d7245f33caaf8be4412b643b359651550..2587065c57ff88f432fa536a266bf31f9d80b50e 100755 --- a/test/multidomain/README +++ b/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: