Skip to content
Snippets Groups Projects
Commit d43957b9 authored by Simon Praetorius's avatar Simon Praetorius
Browse files

added std:: in front of array

parent e2dd0064
No related branches found
No related tags found
1 merge request!21added std:: in front of array, fixes issue #8
Hide whitespace changes
Inline Side-by-side
dune/foamgrid/foamgrid.hh
+ 2
− 1
View file @ d43957b9
......@@ -7,6 +7,7 @@
* \brief The FoamGrid class
*/
#include <array>
#include <list>
#include <set>
#include <map>
......@@ -702,7 +703,7 @@ class FoamGrid :
FoamGridIdSet<const FoamGrid > idSet_;
/** \brief Counters that always provide the next free id for each dimension */
array<unsigned int, dimgrid+1> freeIdCounter_;
std::array<unsigned int, dimgrid+1> freeIdCounter_;
/** \brief How many times was the leaf level globally refined. */
int globalRefined;
......
dune/foamgrid/foamgrid/foamgrid.cc
+ 17
− 17
View file @ d43957b9
......@@ -173,7 +173,7 @@ bool Dune::FoamGrid<dimgrid, dimworld>::preAdapt()
// need to reset the marker to doNothing
bool otherChildRefined=false;
FoamGridEntityImp<dimgrid, dimgrid, dimworld>& father = *this->getRealImplementation(element).target_->father_;
typedef typename array<FoamGridEntityImp<dimgrid, dimgrid, dimworld>*, 1<<dimgrid >::iterator ChildrenIter;
typedef typename std::array<FoamGridEntityImp<dimgrid, dimgrid, dimworld>*, 1<<dimgrid >::iterator ChildrenIter;
for (ChildrenIter child=father.sons_.begin(); child != father.sons_.end(); ++child)
otherChildRefined = otherChildRefined ||
(*child)->markState_==FoamGridEntityImp<dimgrid, dimgrid, dimworld>::REFINE ||
......@@ -397,7 +397,7 @@ void Dune::FoamGrid<dimgrid, dimworld>::coarsenSimplexElement(FoamGridEntityImp<
std::set<FoamGridEntityImp<0, dimgrid, dimworld>*> childVertices;
// Iterate over all children of the father -> elements to be erased
typedef typename array<FoamGridEntityImp<dimgrid, dimgrid, dimworld>*, 1<<dimgrid >::const_iterator ChildrenIter;
typedef typename std::array<FoamGridEntityImp<dimgrid, dimgrid, dimworld>*, 1<<dimgrid >::const_iterator ChildrenIter;
for (ChildrenIter child=father.sons_.begin(); child != father.sons_.end(); ++child)
{
// Remember element for the actual deletion taking place later
......@@ -405,7 +405,7 @@ void Dune::FoamGrid<dimgrid, dimworld>::coarsenSimplexElement(FoamGridEntityImp<
(*child)->willVanish_=true;
// Iterate over the facets of this vanishing element
typedef typename array<FoamGridEntityImp<dimgrid-1, dimgrid, dimworld>*, dimgrid+1>::iterator FacetIter;
typedef typename std::array<FoamGridEntityImp<dimgrid-1, dimgrid, dimworld>*, dimgrid+1>::iterator FacetIter;
for (FacetIter facet=(*child)->facet_.begin(); facet != (*child)->facet_.end(); ++facet)
{
// Remove references to elements that will be erased
......@@ -431,11 +431,11 @@ void Dune::FoamGrid<dimgrid, dimworld>::coarsenSimplexElement(FoamGridEntityImp<
// Save potential sub entities that might be erased
if(dimgrid > 1)
{
typedef typename array<FoamGridEntityImp<0, dimgrid, dimworld>*, dimgrid+1>::iterator VertexIter;
typedef typename std::array<FoamGridEntityImp<0, dimgrid, dimworld>*, dimgrid+1>::iterator VertexIter;
for (VertexIter vertex=(*child)->vertex_.begin(); vertex != (*child)->vertex_.end(); ++vertex)
childVertices.insert(*vertex);
}
typedef typename array<FoamGridEntityImp<dimgrid-1, dimgrid, dimworld>*, dimgrid+1>::iterator FacetIter;
typedef typename std::array<FoamGridEntityImp<dimgrid-1, dimgrid, dimworld>*, dimgrid+1>::iterator FacetIter;
for (FacetIter facet=(*child)->facet_.begin(); facet!= (*child)->facet_.end();
++facet)
childFacets.insert(*facet);
......@@ -444,7 +444,7 @@ void Dune::FoamGrid<dimgrid, dimworld>::coarsenSimplexElement(FoamGridEntityImp<
// Check whether those guys are really erased.
// We remove all vertices and facets that are part of a child element of one
// of the neighbours of the father element from the "to be erased" lists
typedef typename array<FoamGridEntityImp<dimgrid-1, dimgrid, dimworld>*, dimgrid+1>::const_iterator FacetIter;
typedef typename std::array<FoamGridEntityImp<dimgrid-1, dimgrid, dimworld>*, dimgrid+1>::const_iterator FacetIter;
for(FacetIter facet=father.facet_.begin(); facet != father.facet_.end(); ++facet)
{
typedef typename std::vector<const FoamGridEntityImp<dimgrid, dimgrid, dimworld>*>::iterator NeighborIter;
......@@ -476,10 +476,10 @@ void Dune::FoamGrid<dimgrid, dimworld>::coarsenSimplexElement(FoamGridEntityImp<
for (ChildrenIter child=(*neighbor)->sons_.begin();
child != (*neighbor)->sons_.end(); ++child)
{
typedef typename array<FoamGridEntityImp<dimgrid-1, dimgrid, dimworld>*, dimgrid+1>::iterator FacetIter;
typedef typename std::array<FoamGridEntityImp<dimgrid-1, dimgrid, dimworld>*, dimgrid+1>::iterator FacetIter;
for (FacetIter facet=(*child)->facet_.begin(); facet != (*child)->facet_.end(); ++facet)
childFacets.erase(*facet);
typedef typename array<FoamGridEntityImp<0, dimgrid, dimworld>*, dimgrid+1>::iterator VertexIter;
typedef typename std::array<FoamGridEntityImp<0, dimgrid, dimworld>*, dimgrid+1>::iterator VertexIter;
for (VertexIter vertex=(*child)->vertex_.begin();
vertex != (*child)->vertex_.end();
++vertex)
......@@ -514,7 +514,7 @@ void Dune::FoamGrid<dimgrid, dimworld>::refineSimplexElement(FoamGridEntityImp<2
unsigned int nextLevel=element.level()+1;
array<FoamGridEntityImp<0, dimgrid, dimworld>*, 3*dimgrid> nextLevelVertices;
std::array<FoamGridEntityImp<0, dimgrid, dimworld>*, 3*dimgrid> nextLevelVertices;
std::size_t vertexIndex=0;
// create copies of the vertices of the element
......@@ -536,9 +536,9 @@ void Dune::FoamGrid<dimgrid, dimworld>::refineSimplexElement(FoamGridEntityImp<2
// create new vertices from facet-midpoints together with the new facets that
// have a father
typedef typename array<FoamGridEntityImp<dimgrid-1, dimgrid, dimworld>*, dimgrid+1>::iterator FacetIterator;
typedef typename std::array<FoamGridEntityImp<dimgrid-1, dimgrid, dimworld>*, dimgrid+1>::iterator FacetIterator;
array<FoamGridEntityImp<1, dimgrid, dimworld>*, 9> nextLevelFacets;
std::array<FoamGridEntityImp<1, dimgrid, dimworld>*, 9> nextLevelFacets;
std::size_t facetIndex=0;
#ifndef NDEBUG
const auto& refElement = Dune::ReferenceElements<double, dimgrid>::general(element.type());
......@@ -546,7 +546,7 @@ void Dune::FoamGrid<dimgrid, dimworld>::refineSimplexElement(FoamGridEntityImp<2
// I am just to dumb for a general facet to vertice mapping.
// Therefore we just store it here
array<std::pair<unsigned int,unsigned int>,3 > facetVertexMapping;
std::array<std::pair<unsigned int,unsigned int>,3 > facetVertexMapping;
facetVertexMapping[0]=std::make_pair(0,1);
facetVertexMapping[1]=std::make_pair(2,0);
facetVertexMapping[2]=std::make_pair(1,2);
......@@ -682,7 +682,7 @@ void Dune::FoamGrid<dimgrid, dimworld>::refineSimplexElement(FoamGridEntityImp<2
assert(facetIndex==nextLevelFacets.size());
assert(vertexIndex==nextLevelVertices.size());
array<FoamGridEntityImp<dimgrid, dimgrid, dimworld>*, 4> nextLevelElements;
std::array<FoamGridEntityImp<dimgrid, dimgrid, dimworld>*, 4> nextLevelElements;
// create the new triangles that lie in the corners
// First the one that contains vertex 0 of the father.
std::get<2>(entityImps_[nextLevel])
......@@ -787,7 +787,7 @@ void Dune::FoamGrid<dimgrid, dimworld>::refineSimplexElement(FoamGridEntityImp<2
if((refCount--)>1)
{
typedef typename array<FoamGridEntityImp<dimgrid, dimgrid, dimworld>*, 1<<dimgrid>::iterator ElementIterator;
typedef typename std::array<FoamGridEntityImp<dimgrid, dimgrid, dimworld>*, 1<<dimgrid>::iterator ElementIterator;
for(ElementIterator elem=nextLevelElements.begin();
elem != nextLevelElements.end(); ++elem)
{
......@@ -809,7 +809,7 @@ void Dune::FoamGrid<dimgrid, dimworld>::refineSimplexElement(FoamGridEntityImp<1
unsigned int nextLevel=element.level()+1;
array<FoamGridEntityImp<0, dimgrid, dimworld>*, 3*dimgrid> nextLevelVertices;
std::array<FoamGridEntityImp<0, dimgrid, dimworld>*, 3*dimgrid> nextLevelVertices;
std::size_t vertexIndex=0;
// create copies of the vertices of the element
......@@ -876,7 +876,7 @@ void Dune::FoamGrid<dimgrid, dimworld>::refineSimplexElement(FoamGridEntityImp<1
assert(vertexIndex==nextLevelVertices.size()); //==3
// Create next level elements
array<FoamGridEntityImp<dimgrid, dimgrid, dimworld>*, 1<<dimgrid > nextLevelElements;
std::array<FoamGridEntityImp<dimgrid, dimgrid, dimworld>*, 1<<dimgrid > nextLevelElements;
// create the elements
// First the one that contains vertex 0 of the father.
std::get<dimgrid>(entityImps_[nextLevel])
......@@ -935,7 +935,7 @@ void Dune::FoamGrid<dimgrid, dimworld>::refineSimplexElement(FoamGridEntityImp<1
if((refCount--)>1)
{
typedef typename array<FoamGridEntityImp<dimgrid, dimgrid, dimworld>*, 1<<dimgrid >::iterator ElementIterator;
typedef typename std::array<FoamGridEntityImp<dimgrid, dimgrid, dimworld>*, 1<<dimgrid >::iterator ElementIterator;
for(ElementIterator elem=nextLevelElements.begin();
elem != nextLevelElements.end(); ++elem)
{
......
dune/foamgrid/foamgrid/foamgridedge.hh
+ 1
− 1
View file @ d43957b9
......@@ -114,7 +114,7 @@ namespace Dune {
unsigned int boundaryId_;
/** \brief links to refinements of this edge */
array<FoamGridEntityImp<1, dimgrid, dimworld>*,2> sons_;
std::array<FoamGridEntityImp<1, dimgrid, dimworld>*,2> sons_;
/** \brief The number of refined edges (0 or 2). */
unsigned int nSons_;
......
dune/foamgrid/foamgrid/foamgridelements.hh
+ 6
− 6
View file @ d43957b9
......@@ -146,12 +146,12 @@ namespace Dune {
DUNE_THROW(GridError, "Non-existing codimension requested!");
}
array<FoamGridEntityImp<0, dimgrid, dimworld>*, 2> vertex_;
std::array<FoamGridEntityImp<0, dimgrid, dimworld>*, 2> vertex_;
array<FoamGridEntityImp<dimgrid-1, dimgrid, dimworld>*, 2> facet_;
std::array<FoamGridEntityImp<dimgrid-1, dimgrid, dimworld>*, 2> facet_;
/** \brief links to refinements of this edge */
array<FoamGridEntityImp<dimgrid, dimgrid, dimworld>*, 2> sons_;
std::array<FoamGridEntityImp<dimgrid, dimgrid, dimworld>*, 2> sons_;
/** \brief The number of refined edges (0 or 2). */
unsigned int nSons_;
......@@ -335,11 +335,11 @@ namespace Dune {
unsigned int nSons_;
array<FoamGridEntityImp<dimgrid, dimgrid, dimworld>*, 4> sons_;
std::array<FoamGridEntityImp<dimgrid, dimgrid, dimworld>*, 4> sons_;
array<FoamGridEntityImp<dimgrid-1, dimgrid, dimworld>*, 3> facet_;
std::array<FoamGridEntityImp<dimgrid-1, dimgrid, dimworld>*, 3> facet_;
array<FoamGridEntityImp<0, dimgrid, dimworld>*, 3> vertex_;
std::array<FoamGridEntityImp<0, dimgrid, dimworld>*, 3> vertex_;
/** \brief Stores requests for refinement and coarsening */
MarkState markState_;
......
dune/foamgrid/foamgrid/foamgridindexsets.hh
+ 2
− 2
View file @ d43957b9
......@@ -188,7 +188,7 @@ namespace Dune {
int numVertices_;
/** \brief The GeometryTypes present for each codim */
array<std::vector<GeometryType>, dimgrid+1> myTypes_;
std::array<std::vector<GeometryType>, dimgrid+1> myTypes_;
};
......@@ -402,7 +402,7 @@ private:
int numVertices_;
/** \brief The GeometryTypes present for each codim */
array<std::vector<GeometryType>, dimgrid+1> myTypes_;
std::array<std::vector<GeometryType>, dimgrid+1> myTypes_;
};
......
dune/foamgrid/foamgrid/foamgridvertex.hh
+ 1
− 1
View file @ d43957b9
......@@ -133,7 +133,7 @@ namespace Dune {
FoamGridEntityImp<0, dimgrid, dimworld>* father_;
//! Son vertex on the next finer grid
array<FoamGridEntityImp<0, dimgrid, dimworld>*, 1> sons_;
std::array<FoamGridEntityImp<0, dimgrid, dimworld>*, 1> sons_;
//! If the vertex was newly inserted (at run-time)
bool isNew_;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment