Skip to content
Snippets Groups Projects
Commit 237d9c5b authored by Jonathan Youett's avatar Jonathan Youett
Browse files

Don't use deprecated methods 'make*' of GeometryType

parent 3f57260d
No related branches found
No related tags found
No related merge requests found
...@@ -82,21 +82,19 @@ class P3NodalBasis : ...@@ -82,21 +82,19 @@ class P3NodalBasis :
// One for each vertex, and two for each element // One for each vertex, and two for each element
return gridview_.size(1) + 2*gridview_.size(0); return gridview_.size(1) + 2*gridview_.size(0);
case 2: { case 2: {
Dune::GeometryType triangle, quad; Dune::GeometryType triangle = Dune::GeometryTypes::triangle;
triangle.makeTriangle(); Dune::GeometryType quad = Dune::GeometryTypes::quadrilateral;
quad.makeQuadrilateral();
// One for each vertex, two for each edge, // One for each vertex, two for each edge,
// one for each triangle element, four for each quad element // one for each triangle element, four for each quad element
return gridview_.size(dim) + 2*gridview_.size(1) return gridview_.size(dim) + 2*gridview_.size(1)
+ gridview_.size(triangle) + 4*gridview_.size(quad); + gridview_.size(triangle) + 4*gridview_.size(quad);
} }
case 3: { case 3: {
Dune::GeometryType triangle, quad, pyramid, prism, hexahedron; Dune::GeometryType triangle = Dune::GeometryTypes::triangle;
triangle.makeTriangle(); Dune::GeometryType quad = Dune::GeometryTypes::quadrilateral;
quad.makeQuadrilateral(); Dune::GeometryType pyramid = Dune::GeometryTypes::pyramid;
pyramid.makePyramid(); Dune::GeometryType prism = Dune::GeometryTypes::prism;
prism.makePrism(); Dune::GeometryType hexahedron = Dune::GeometryTypes::cube(3);
hexahedron.makeCube(3);
// One for each vertex, two for each edge, // One for each vertex, two for each edge,
// one for each triangle element, four for each quad element // one for each triangle element, four for each quad element
return gridview_.size(dim) + 2*gridview_.size(2) return gridview_.size(dim) + 2*gridview_.size(2)
...@@ -185,26 +183,13 @@ class P3NodalBasis : ...@@ -185,26 +183,13 @@ class P3NodalBasis :
edgeOffset_ = vertexOffset_ + gridview_.size(dim); edgeOffset_ = vertexOffset_ + gridview_.size(dim);
triangleOffset_ = edgeOffset_ + 2*gridview_.size(dim-1); triangleOffset_ = edgeOffset_ + 2*gridview_.size(dim-1);
Dune::GeometryType triangle; quadrilateralOffset_ = triangleOffset_ + 1*gridview_.size(Dune::GeometryTypes::triangle);
triangle.makeTriangle();
quadrilateralOffset_ = triangleOffset_ + 1*gridview_.size(triangle);
Dune::GeometryType quadrilateral;
quadrilateral.makeQuadrilateral();
if (dim==3) { if (dim==3) {
tetrahedronOffset_ = quadrilateralOffset_ + 4*gridview_.size(quadrilateral); tetrahedronOffset_ = quadrilateralOffset_ + 4*gridview_.size(Dune::GeometryTypes::quadrilateral);
pyramidOffset_ = tetrahedronOffset_ + 0*gridview_.size(Dune::GeometryTypes::tetrahedron);
Dune::GeometryType tetrahedron; prismOffset_ = tetrahedronOffset_ + 1*gridview_.size(Dune::GeometryTypes::pyramid);
tetrahedron.makeSimplex(3); hexahedronOffset_ = tetrahedronOffset_ + 2*gridview_.size(Dune::GeometryTypes::prism);
pyramidOffset_ = tetrahedronOffset_ + 0*gridview_.size(tetrahedron);
Dune::GeometryType pyramid;
pyramid.makePyramid();
prismOffset_ = tetrahedronOffset_ + 1*gridview_.size(pyramid);
Dune::GeometryType prism;
prism.makePrism();
hexahedronOffset_ = tetrahedronOffset_ + 2*gridview_.size(prism);
} }
} }
......
...@@ -168,7 +168,7 @@ GridType* constructCoarseUnitSquareGrid() ...@@ -168,7 +168,7 @@ GridType* constructCoarseUnitSquareGrid()
} }
std::cout << std::endl; std::cout << std::endl;
gridFactory.insertElement( Dune::GeometryType(Dune::GeometryType::simplex,dim), element); gridFactory.insertElement( Dune::GeometryTypes::simplex(dim), element);
for (int i=dim; i>=0; i--) for (int i=dim; i>=0; i--)
{ {
...@@ -176,7 +176,7 @@ GridType* constructCoarseUnitSquareGrid() ...@@ -176,7 +176,7 @@ GridType* constructCoarseUnitSquareGrid()
} }
std::cout << std::endl; std::cout << std::endl;
gridFactory.insertElement( Dune::GeometryType(Dune::GeometryType::simplex,dim), element); gridFactory.insertElement( Dune::GeometryTypes::simplex(dim), element);
return gridFactory.createGrid(); return gridFactory.createGrid();
} }
......
...@@ -58,13 +58,10 @@ struct GridConstruction<GridType,1> { ...@@ -58,13 +58,10 @@ struct GridConstruction<GridType,1> {
for(ctype x=lower[0]; x<=upper[0]; x+=size[0]) for(ctype x=lower[0]; x<=upper[0]; x+=size[0])
factory.insertVertex(FV({x})); factory.insertVertex(FV({x}));
Dune::GeometryType gt;
gt.makeLine();
using E = std::vector<unsigned>; using E = std::vector<unsigned>;
for (unsigned i=0;i<nElements[0]; i++) { for (unsigned i=0;i<nElements[0]; i++) {
factory.insertElement(gt, E({i, i+1})); factory.insertElement(Dune::GeometryTypes::line, E({i, i+1}));
} }
return std::unique_ptr<GridType>(factory.createGrid()); return std::unique_ptr<GridType>(factory.createGrid());
...@@ -113,12 +110,10 @@ public: ...@@ -113,12 +110,10 @@ public:
for(unsigned j=0; j<=nElements[1]; j++) for(unsigned j=0; j<=nElements[1]; j++)
factory.insertVertex(FV({lower[0]+i*size[0], lower[1]+j*size[1]})); factory.insertVertex(FV({lower[0]+i*size[0], lower[1]+j*size[1]}));
Dune::GeometryType gt; Dune::GeometryType gt = Dune::GeometryTypes::cube(dim);
bool tetra = config.get<bool>("tetrahedral"); bool tetra = config.get<bool>("tetrahedral");
if (tetra) if (tetra)
gt.makeSimplex(dim); gt = Dune::GeometryTypes::simplex(dim);
else
gt.makeCube(dim);
using E = std::vector<unsigned>; using E = std::vector<unsigned>;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment