Commit 287554f9 authored by Oliver Sander's avatar Oliver Sander

use Entity::type() instead of Geometry::type() whenever possible

[[Imported from SVN: r188]]
parent e3d01cde
......@@ -59,7 +59,7 @@ void gnuplot (G& grid, std::vector<double>& c)
for (ElementLeafIterator it = grid.template leafbegin<0>();
it!=grid.template leafend<0>(); ++it)
{
Dune::GeometryType gt = it->geometry().type();
Dune::GeometryType gt = it->type();
const Dune::FieldVector<ct,dim>&
local = Dune::ReferenceElements<ct,dim>::general(gt).position(0,0);
Dune::FieldVector<ct,dimworld>
......
......@@ -40,7 +40,7 @@ void elementdata (const G& grid, const F& f)
it!=grid.template leafend<0>(); ++it)
{
// cell geometry type
Dune::GeometryType gt = it->geometry().type();
Dune::GeometryType gt = it->type();
// cell center in reference element
const Dune::FieldVector<ct,dim>&
......
......@@ -33,7 +33,7 @@ void evolve (const G& grid, const M& mapper, V& c, double t, double& dt)
for (LeafIterator it = grid.template leafbegin<0>(); it!=endit; ++it)
{
// cell geometry type
Dune::GeometryType gt = it->geometry().type();
Dune::GeometryType gt = it->type();
// cell center in reference element
const Dune::FieldVector<ct,dim>&
......@@ -96,7 +96,7 @@ void evolve (const G& grid, const M& mapper, V& c, double t, double& dt)
(it->level()==outside->level() && indexi<indexj) )
{
// compute factor in neighbor
Dune::GeometryType nbgt = outside->geometry().type();
Dune::GeometryType nbgt = outside->type();
const Dune::FieldVector<ct,dim>&
nblocal = Dune::ReferenceElements<ct,dim>::general(nbgt).position(0,0);
double nbvolume = outside->geometry().integrationElement(nblocal)
......
......@@ -21,7 +21,7 @@ void initialize (const G& grid, const M& mapper, V& c)
for (LeafIterator it = grid.template leafbegin<0>(); it!=endit; ++it)
{
// get geometry type
Dune::GeometryType gt = it->geometry().type();
Dune::GeometryType gt = it->type();
// get cell center in reference element
const Dune::FieldVector<ct,dim>&
......
......@@ -17,7 +17,7 @@ double integrateentity (const Iterator& it, const Functor& f, int p)
typedef typename Iterator::Entity::ctype ct;
// get geometry type
Dune::GeometryType gt = it->geometry().type();
Dune::GeometryType gt = it->type();
// get quadrature rule of order p
const Dune::QuadratureRule<ct,dim>&
......
......@@ -38,7 +38,7 @@ void parevolve (const G& grid, const M& mapper, V& c, double t, double& dt)
for (LeafIterator it = grid.template leafbegin<0,Dune::All_Partition>(); it!=endit; ++it) /*@\label{peh:begin}@*/
{
// cell geometry type
Dune::GeometryType gt = it->geometry().type();
Dune::GeometryType gt = it->type();
// cell center in reference element
const Dune::FieldVector<ct,dim>&
......@@ -100,7 +100,7 @@ void parevolve (const G& grid, const M& mapper, V& c, double t, double& dt)
(it->level()==outside->level() && indexi<indexj) )
{
// compute factor in neighbor
Dune::GeometryType nbgt = outside->geometry().type();
Dune::GeometryType nbgt = outside->type();
const Dune::FieldVector<ct,dim>&
nblocal = Dune::ReferenceElements<ct,dim>::general(nbgt).position(0,0);
double nbvolume = outside->geometry().integrationElement(nblocal)
......
......@@ -37,7 +37,7 @@ void traversal (G& grid)
for (ElementLeafIterator it = grid.template leafbegin<0>(); /*@\label{tc:forel}@*/
it!=grid.template leafend<0>(); ++it)
{ /*@\label{tc:forel0}@*/
Dune::GeometryType gt = it->geometry().type(); /*@\label{tc:reftype}@*/
Dune::GeometryType gt = it->type(); /*@\label{tc:reftype}@*/
std::cout << "visiting leaf " << gt /*@\label{tc:print}@*/
<< " with first vertex at " << it->geometry()[0]
<< std::endl;
......@@ -59,7 +59,7 @@ void traversal (G& grid)
for (VertexLeafIterator it = grid.template leafbegin<dim>(); /*@\label{tc:forve}@*/
it!=grid.template leafend<dim>(); ++it)
{
Dune::GeometryType gt = it->geometry().type();
Dune::GeometryType gt = it->type();
std::cout << "visiting " << gt
<< " at " << it->geometry()[0]
<< std::endl;
......@@ -83,7 +83,7 @@ void traversal (G& grid)
for (ElementLevelIterator it = grid.template lbegin<0>(level);
it!=grid.template lend<0>(level); ++it)
{
Dune::GeometryType gt = it->geometry().type();
Dune::GeometryType gt = it->type();
std::cout << "visiting " << gt
<< " with first vertex at " << it->geometry()[0]
<< std::endl;
......
Markdown is supported
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