Commit 5297f82b authored by Stenger, Florian's avatar Stenger, Florian
Browse files

Merge branch 'issue/intersection_geometry' into 'master'

small bugs regarding intersection geometry corrected

See merge request iwr/dune-curvedsurfacegrid!1
parents 4d644e1e a71bc452
......@@ -354,8 +354,9 @@ namespace Dune
public:
IntersectionCoordProvider ( const ElementGeometryImpl &elementGeometry,
const HostLocalGeometry &hostLocalGeometry )
: //!coordFunction_(coordFunction), //! $flo (obsolete)
const HostLocalGeometry &hostLocalGeometry,
const CoordFunction & /*coordFunction*/ )
: //coordFunction_(coordFunction), //! $flo (obsolete)
elementGeometry_( elementGeometry ),
hostLocalGeometry_( hostLocalGeometry )
{}
......
......@@ -188,15 +188,21 @@ namespace Dune
GeometryType type () const { return mapping_->type(); }
std::vector<GlobalCoordinate> interpolatoryVertices() const { return mapping_->vertexSet(); } //! $flo
int corners () const { return mapping_->corners(); }
int corners () const { return mapping_->nCorner(); }
GlobalCoordinate corner ( const int i ) const { return mapping_->corner( i ); }
GlobalCoordinate center () const { return mapping_->center(); }
GlobalCoordinate global ( const LocalCoordinate &local ) const { return mapping_->global( local ); }
LocalCoordinate local ( const GlobalCoordinate &global ) const { return mapping_->local( global ); }
LocalCoordinate local ( const GlobalCoordinate &global ) const
{
LocalCoordinate l;
DUNE_UNUSED bool b = mapping_->local( global, l );
assert(b);
return l;
}
ctype integrationElement ( const LocalCoordinate &local ) const { return mapping_->integrationElement( local ); }
ctype volume () const { return mapping_->volume(); }
ctype volume () const { return mapping_->volume(std::numeric_limits<ctype>::epsilon()); }
JacobianTransposed jacobianTransposed ( const LocalCoordinate &local ) const { return mapping_->jacobianTransposed( local ); }
JacobianInverseTransposed jacobianInverseTransposed ( const LocalCoordinate &local ) const { return mapping_->jacobianInverseTransposed( local ); }
......
Supports Markdown
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