Skip to content
Snippets Groups Projects
Commit 3bc7d54e authored by Timo Koch's avatar Timo Koch
Browse files

[multidomain] Add yet another multidomaingrid patch

Apply it also in the external script. The patch
makes entities copy assignable.
parent 0cad24bf
No related branches found
No related tags found
2 merge requests!31Feature/colebrookwhiteboundarylayer,!5Feature/externalscript
...@@ -130,14 +130,14 @@ installMultidomainGrid() ...@@ -130,14 +130,14 @@ installMultidomainGrid()
return return
fi fi
# # apply patch for dune versions newer than 2.3 # apply patch for dune versions newer than 2.3
# cd dune-common cd dune-common
# DUNE_VERSION=`git status | head -n 1 | awk '{ print $3 }'` DUNE_VERSION=`git status | head -n 1 | awk '{ print $3 }'`
# if [ "$DUNE_VERSION" == "releases/2.4" ] || [ "$DUNE_VERSION" == "master" ]; then if [ "$DUNE_VERSION" == "releases/2.4" ] || [ "$DUNE_VERSION" == "master" ]; then
# echo "Applying patch" echo "Applying patch"
# cd $TOPDIR/dune-multidomaingrid cd $TOPDIR/dune-multidomaingrid
# patch -p1 < $TOPDIR/dumux/patches/multidomaingrid-2.3.patch patch -p1 < $TOPDIR/dumux/patches/multidomaingrid-2.3.patch
# fi fi
cd $TOPDIR cd $TOPDIR
} }
......
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;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment