Skip to content
Snippets Groups Projects
Commit 24feddaa authored by Ansgar Burchardt's avatar Ansgar Burchardt Committed by ansgar
Browse files

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]]
parent 3d412c5d
Branches
Tags
No related merge requests found
...@@ -101,7 +101,7 @@ void DualMortarCoupling<field_type, GridType0,GridType1>::setup() ...@@ -101,7 +101,7 @@ void DualMortarCoupling<field_type, GridType0,GridType1>::setup()
typedef Dune::GridGlue::Codim1Extractor<GridView0> Extractor0; typedef Dune::GridGlue::Codim1Extractor<GridView0> Extractor0;
typedef Dune::GridGlue::Codim1Extractor<GridView1> Extractor1; 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; typedef Dune::PQkLocalFiniteElementCache<typename GridType1::ctype, field_type, GridType1::dimension-1, 1> FiniteElementCache1;
......
...@@ -260,7 +260,7 @@ condenseDGMatrix(const Dune::BCRSMatrix<Dune::FieldMatrix<field_type,1,1> >& dgM ...@@ -260,7 +260,7 @@ condenseDGMatrix(const Dune::BCRSMatrix<Dune::FieldMatrix<field_type,1,1> >& dgM
template <class field_type, class GridType0, class GridType1> template <class field_type, class GridType0, class GridType1>
void DualMortarCouplingHierarchy<field_type, GridType0, 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::GridGlue::Codim1Extractor<typename GridType1::LevelGridView> >& gridGlue,
Dune::BitSetVector<1>& relevantOverlaps) Dune::BitSetVector<1>& relevantOverlaps)
{ {
...@@ -282,7 +282,7 @@ markRelevantOverlaps(const GridGlue<Dune::GridGlue::Codim1Extractor<typename Gri ...@@ -282,7 +282,7 @@ markRelevantOverlaps(const GridGlue<Dune::GridGlue::Codim1Extractor<typename Gri
typedef Dune::GridGlue::Codim1Extractor<GridView0> Extractor0; typedef Dune::GridGlue::Codim1Extractor<GridView0> Extractor0;
typedef Dune::GridGlue::Codim1Extractor<GridView1> Extractor1; 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 rIIt = gridGlue.template ibegin<0>();
typename GlueType::Grid0IntersectionIterator rEndIIt = gridGlue.template iend<0>(); typename GlueType::Grid0IntersectionIterator rEndIIt = gridGlue.template iend<0>();
...@@ -462,7 +462,7 @@ void DualMortarCouplingHierarchy<field_type, GridType0,GridType1>::setup() ...@@ -462,7 +462,7 @@ void DualMortarCouplingHierarchy<field_type, GridType0,GridType1>::setup()
typedef Dune::GridGlue::Codim1Extractor<GridView0> Extractor0; typedef Dune::GridGlue::Codim1Extractor<GridView0> Extractor0;
typedef Dune::GridGlue::Codim1Extractor<GridView1> Extractor1; 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, // 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... // so we might also only use one cache here...
......
...@@ -72,7 +72,7 @@ public: ...@@ -72,7 +72,7 @@ public:
* \param gridGlue A grid-glue object that contains all computed overlaps. * \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. * \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::GridGlue::Codim1Extractor<typename GridType1::LevelGridView> >& gridGlue,
Dune::BitSetVector<1>& relevantOverlaps); Dune::BitSetVector<1>& relevantOverlaps);
......
...@@ -89,7 +89,7 @@ void LeafP2MortarCoupling<field_type, GridType0,GridType1>::setup(const BasisGri ...@@ -89,7 +89,7 @@ void LeafP2MortarCoupling<field_type, GridType0,GridType1>::setup(const BasisGri
typedef Dune::GridGlue::Codim1Extractor<GridView0> Extractor0; typedef Dune::GridGlue::Codim1Extractor<GridView0> Extractor0;
typedef Dune::GridGlue::Codim1Extractor<GridView1> Extractor1; typedef Dune::GridGlue::Codim1Extractor<GridView1> Extractor1;
typedef ::GridGlue<Extractor0,Extractor1> GlueType; typedef Dune::GridGlue::GridGlue<Extractor0,Extractor1> GlueType;
BoundaryPatchFaceDescriptor<GridView0> desc0(&nmBoundary_); BoundaryPatchFaceDescriptor<GridView0> desc0(&nmBoundary_);
BoundaryPatchFaceDescriptor<GridView1> desc1(&mBoundary_); BoundaryPatchFaceDescriptor<GridView1> desc1(&mBoundary_);
......
...@@ -74,7 +74,7 @@ class MortarContactNonlinearity ...@@ -74,7 +74,7 @@ class MortarContactNonlinearity
// grid glue stuff // grid glue stuff
typedef BoundaryPatchFaceDescriptor<LevelGridView> BoundaryDescriptor; typedef BoundaryPatchFaceDescriptor<LevelGridView> BoundaryDescriptor;
typedef Dune::GridGlue::Codim1Extractor<LevelGridView> Extractor; 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 GlueType::Grid0IntersectionIterator RemoteIntersectionIterator;
typedef typename RemoteIntersectionIterator::Intersection RemoteIntersection; typedef typename RemoteIntersectionIterator::Intersection RemoteIntersection;
typedef typename RemoteIntersection::Geometry RemoteGeometry; typedef typename RemoteIntersection::Geometry RemoteGeometry;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment