diff --git a/dune/contact/assemblers/dualmortarcoupling.cc b/dune/contact/assemblers/dualmortarcoupling.cc index fef531439e9b35ed1408870f3dd7b79e51dec38f..032dec48cd5e5137e30ff53fab06737152605d2a 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 250403453a238d452e71ef5555a7dc5f0def8851..3525cc1c283c0568467b1389d36bb6e942f7b10d 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 439d20c84d37d5c38fe0410d37011decc9c09d8e..751bb5ba0ca70a3b0e8d275cafe04ac826df7138 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 ea6270e5b26d36b5c122db22f4767ca49f966b79..68ad3377397046e1c7ccd79c5b7d6623f402aa3e 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 90cc8db6566be7be655957f870ba92ae1df486a5..9811015eefebc23c60491b5f17ef41d381c51e22 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;