Commit 1be3f875 authored by Oliver Sander's avatar Oliver Sander Committed by Steffen Müthing

Don't use deprecated enums exported by the Geometry class

In particular,
- replace 'dimension' by 'mydimension'
- replace 'dimensionworld' by 'coorddimension'

The code looks like the latter choices were intended to be used anyway.

(cherry picked from commit a9be860f)
Signed-off-by: Steffen Müthing's avatarSteffen Müthing <muething@dune-project.org>
parent d8a6fbdd
......@@ -107,7 +107,7 @@ public:
{
// flag+data+coordinates
typedef typename EntityType::Geometry Geometry;
return 2+e.geometry().corners() * Geometry::dimensionworld;
return 2+e.geometry().corners() * Geometry::coorddimension;
}
//! pack data from user to message buffer
......@@ -126,9 +126,9 @@ public:
const Geometry &geometry = e.geometry();
for( int i = 0; i < geometry.corners(); ++i )
{
typedef Dune::FieldVector< typename Geometry::ctype, Geometry::dimensionworld > Vector;
typedef Dune::FieldVector< typename Geometry::ctype, Geometry::coorddimension > Vector;
const Vector corner = geometry.corner( i );
for( int j = 0; j < Geometry::dimensionworld; ++j )
for( int j = 0; j < Geometry::coorddimension; ++j )
buff.write( corner[ j ] );
}
}
......@@ -177,9 +177,9 @@ public:
const Geometry &geometry = e.geometry();
for( int i = 0; i < geometry.corners(); ++i )
{
typedef Dune::FieldVector< typename Geometry::ctype, Geometry::dimensionworld > Vector;
typedef Dune::FieldVector< typename Geometry::ctype, Geometry::coorddimension > Vector;
const Vector corner = geometry.corner( i );
for( int j = 0; j < Geometry::dimensionworld; ++j )
for( int j = 0; j < Geometry::coorddimension; ++j )
{
buff.read(x);
if( std::abs( corner[ j ] - x ) > 1e-8 )
......
......@@ -217,8 +217,8 @@ void checkGeometryInFather(const GridType& grid)
DUNE_THROW(GridError, "entity and geometryInFather have different number of corners!");
// Compute the element center just to have an argument for the following methods
const Dune::ReferenceElement< ctype, Geometry::dimension > &refElement
= Dune::ReferenceElements< ctype, Geometry::dimension >::general( geometryInFather.type() );
const Dune::ReferenceElement< ctype, Geometry::mydimension > &refElement
= Dune::ReferenceElements< ctype, Geometry::mydimension >::general( geometryInFather.type() );
typename LocalGeometry::GlobalCoordinate center = refElement.position(0,0);
......
......@@ -619,7 +619,7 @@ void iterate(Grid &g)
assert( (l1 == l2) && (l2 == l1) );
origin = Dune::ReferenceElements<typename Geometry::ctype,
Geometry::dimension>::general(it->type()).position(0,0);
Geometry::mydimension>::general(it->type()).position(0,0);
const Geometry &geo = it->geometry();
result = geo.local( geo.global( origin ) );
......
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