Skip to content
Snippets Groups Projects
Commit a3c21984 authored by Oliver Sander's avatar Oliver Sander
Browse files

adapted to new grid interface

[[Imported from SVN: r1446]]
parent 4131f323
No related branches found
No related tags found
No related merge requests found
......@@ -61,7 +61,7 @@ namespace Dune
{
for(int qP = 0; qP < quad.nop(); qP++)
{
double det = (*it).geometry().integration_element(quad.point(qP));
double det = (*it).geometry().integrationElement(quad.point(qP));
f.evaluate((*it).geometry().global( quad.point(qP) ), ret);
set.eval(i,quad,qP,phi);
lf[i] += det * quad.weight(qP) * (ret * phi);
......
......@@ -46,7 +46,8 @@ namespace Dune {
for(; it != endit ; ++it) {
double det = (*it).geometry().integration_element(quad.point(0));
double det = (*it).geometry().integrationElement(quad.point(0));
/** \todo Do we really need the following const_cast?? */
(const_cast<DiscreteFunctionType*>(&discFunc))->localFunction(*it,lf);
for(int qP = 0; qP < quad.nop(); qP++) {
......
......@@ -28,9 +28,6 @@ namespace Dune
//! The grid's dimension
enum { dim = GridType::dimension };
//! The coordinate type
typedef typename GridType::template codim<0>::CoordType CoordType;
//! ???
typedef typename FunctionSpaceType::JacobianRange JacobianRange;
......@@ -110,9 +107,9 @@ namespace Dune
const BaseFunctionSetType & baseSet = this->functionSpace_.getBaseFunctionSet( entity );
// calc Jacobian inverse before volume is evaluated
const Mat<dim,dim,double>& inv = entity.geometry().Jacobian_inverse(quad.point(0));
const Mat<dim,dim,double>& inv = entity.geometry().jacobianInverse(quad.point(0));
const double vol = entity.geometry().integration_element(quad.point(0));
const double vol = entity.geometry().integrationElement(quad.point(0));
double val = 0.;
for ( int pt=0; pt < quad.nop(); pt++ )
......@@ -150,9 +147,9 @@ namespace Dune
const BaseFunctionSetType & baseSet = this->functionSpace_.getBaseFunctionSet( entity );
// calc Jacobian inverse before volume is evaluated
const Mat<dim,dim,double>& inv = entity.geometry().Jacobian_inverse(quad.point(0));
const Mat<dim,dim,double>& inv = entity.geometry().jacobianInverse(quad.point(0));
const double vol = entity.geometry().integration_element(quad.point(0));
const double vol = entity.geometry().integrationElement(quad.point(0));
int i,j;
for(i=0; i<matSize; i++)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment