From 24feddaaf781609b5ebb3d7fc63a3dc73744de3c Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt <burchardt@igpm.rwth-aachen.de> Date: Fri, 31 Jan 2014 10:02:23 +0000 Subject: [PATCH] Follow namespace change in dune-grid-glue The GridGlue template class was moved into the Dune::GridGlue namespace in dune-grid-glue with commit 758e254d506256a6ad4c2fbb778431a66d8076f7. [[Imported from SVN: r12803]] --- dune/contact/assemblers/dualmortarcoupling.cc | 2 +- dune/contact/assemblers/dualmortarcouplinghierarchy.cc | 6 +++--- dune/contact/assemblers/dualmortarcouplinghierarchy.hh | 2 +- dune/contact/assemblers/leafp2mortarcoupling.cc | 2 +- dune/contact/common/mortarcontactnonlinearity.hh | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dune/contact/assemblers/dualmortarcoupling.cc b/dune/contact/assemblers/dualmortarcoupling.cc index fef53143..032dec48 100755 --- a/dune/contact/assemblers/dualmortarcoupling.cc +++ b/dune/contact/assemblers/dualmortarcoupling.cc @@ -101,7 +101,7 @@ void DualMortarCoupling<field_type, GridType0,GridType1>::setup() typedef Dune::GridGlue::Codim1Extractor<GridView0> Extractor0; typedef Dune::GridGlue::Codim1Extractor<GridView1> Extractor1; - typedef ::GridGlue<Extractor0,Extractor1> GlueType; + typedef Dune::GridGlue::GridGlue<Extractor0,Extractor1> GlueType; typedef Dune::PQkLocalFiniteElementCache<typename GridType1::ctype, field_type, GridType1::dimension-1, 1> FiniteElementCache1; diff --git a/dune/contact/assemblers/dualmortarcouplinghierarchy.cc b/dune/contact/assemblers/dualmortarcouplinghierarchy.cc index 25040345..3525cc1c 100755 --- a/dune/contact/assemblers/dualmortarcouplinghierarchy.cc +++ b/dune/contact/assemblers/dualmortarcouplinghierarchy.cc @@ -260,7 +260,7 @@ condenseDGMatrix(const Dune::BCRSMatrix<Dune::FieldMatrix<field_type,1,1> >& dgM template <class field_type, class GridType0, class GridType1> void DualMortarCouplingHierarchy<field_type, GridType0, GridType1>:: -markRelevantOverlaps(const GridGlue<Dune::GridGlue::Codim1Extractor<typename GridType0::LevelGridView>, +markRelevantOverlaps(const Dune::GridGlue::GridGlue<Dune::GridGlue::Codim1Extractor<typename GridType0::LevelGridView>, Dune::GridGlue::Codim1Extractor<typename GridType1::LevelGridView> >& gridGlue, Dune::BitSetVector<1>& relevantOverlaps) { @@ -282,7 +282,7 @@ markRelevantOverlaps(const GridGlue<Dune::GridGlue::Codim1Extractor<typename Gri typedef Dune::GridGlue::Codim1Extractor<GridView0> Extractor0; typedef Dune::GridGlue::Codim1Extractor<GridView1> Extractor1; - typedef ::GridGlue<Extractor0,Extractor1> GlueType; + typedef Dune::GridGlue::GridGlue<Extractor0,Extractor1> GlueType; typename GlueType::Grid0IntersectionIterator rIIt = gridGlue.template ibegin<0>(); typename GlueType::Grid0IntersectionIterator rEndIIt = gridGlue.template iend<0>(); @@ -462,7 +462,7 @@ void DualMortarCouplingHierarchy<field_type, GridType0,GridType1>::setup() typedef Dune::GridGlue::Codim1Extractor<GridView0> Extractor0; typedef Dune::GridGlue::Codim1Extractor<GridView1> Extractor1; - typedef ::GridGlue<Extractor0,Extractor1> GlueType; + typedef Dune::GridGlue::GridGlue<Extractor0,Extractor1> GlueType; // I'm sure later in the code it is hardwired that the ctype and dimension of the grid types match, // so we might also only use one cache here... diff --git a/dune/contact/assemblers/dualmortarcouplinghierarchy.hh b/dune/contact/assemblers/dualmortarcouplinghierarchy.hh index 439d20c8..751bb5ba 100755 --- a/dune/contact/assemblers/dualmortarcouplinghierarchy.hh +++ b/dune/contact/assemblers/dualmortarcouplinghierarchy.hh @@ -72,7 +72,7 @@ public: * \param gridGlue A grid-glue object that contains all computed overlaps. * \param relevantOverlaps Reference to a vector of bits used to save which overlaps are relevant. */ - void markRelevantOverlaps(const GridGlue< Dune::GridGlue::Codim1Extractor<typename GridType0::LevelGridView>, + void markRelevantOverlaps(const Dune::GridGlue::GridGlue< Dune::GridGlue::Codim1Extractor<typename GridType0::LevelGridView>, Dune::GridGlue::Codim1Extractor<typename GridType1::LevelGridView> >& gridGlue, Dune::BitSetVector<1>& relevantOverlaps); diff --git a/dune/contact/assemblers/leafp2mortarcoupling.cc b/dune/contact/assemblers/leafp2mortarcoupling.cc index ea6270e5..68ad3377 100755 --- a/dune/contact/assemblers/leafp2mortarcoupling.cc +++ b/dune/contact/assemblers/leafp2mortarcoupling.cc @@ -89,7 +89,7 @@ void LeafP2MortarCoupling<field_type, GridType0,GridType1>::setup(const BasisGri typedef Dune::GridGlue::Codim1Extractor<GridView0> Extractor0; typedef Dune::GridGlue::Codim1Extractor<GridView1> Extractor1; - typedef ::GridGlue<Extractor0,Extractor1> GlueType; + typedef Dune::GridGlue::GridGlue<Extractor0,Extractor1> GlueType; BoundaryPatchFaceDescriptor<GridView0> desc0(&nmBoundary_); BoundaryPatchFaceDescriptor<GridView1> desc1(&mBoundary_); diff --git a/dune/contact/common/mortarcontactnonlinearity.hh b/dune/contact/common/mortarcontactnonlinearity.hh index 90cc8db6..9811015e 100644 --- a/dune/contact/common/mortarcontactnonlinearity.hh +++ b/dune/contact/common/mortarcontactnonlinearity.hh @@ -74,7 +74,7 @@ class MortarContactNonlinearity // grid glue stuff typedef BoundaryPatchFaceDescriptor<LevelGridView> BoundaryDescriptor; typedef Dune::GridGlue::Codim1Extractor<LevelGridView> Extractor; - typedef ::GridGlue<Extractor,Extractor> GlueType; + typedef Dune::GridGlue::GridGlue<Extractor,Extractor> GlueType; typedef typename GlueType::Grid0IntersectionIterator RemoteIntersectionIterator; typedef typename RemoteIntersectionIterator::Intersection RemoteIntersection; typedef typename RemoteIntersection::Geometry RemoteGeometry; -- GitLab