Skip to content
Snippets Groups Projects
Commit 6fcdb0cc authored by Oliver Sander's avatar Oliver Sander Committed by sander
Browse files

Use the type provided by Geometry for jacobianInverseTransposed

Because nowadays, it may not be a FieldMatrix anymore

[[Imported from SVN: r9305]]
parent e45d6f29
No related branches found
No related tags found
No related merge requests found
...@@ -57,6 +57,7 @@ energy(const Entity& element, ...@@ -57,6 +57,7 @@ energy(const Entity& element,
const std::vector<TargetSpace>& localSolution) const const std::vector<TargetSpace>& localSolution) const
{ {
assert(element.type() == localFiniteElement.type()); assert(element.type() == localFiniteElement.type());
typedef typename GridView::template Codim<0>::Entity::Geometry Geometry;
RT energy = 0; RT energy = 0;
LocalGeodesicFEFunction<gridDim, double, LocalFiniteElement, TargetSpace> localGeodesicFEFunction(localFiniteElement, LocalGeodesicFEFunction<gridDim, double, LocalFiniteElement, TargetSpace> localGeodesicFEFunction(localFiniteElement,
...@@ -77,7 +78,7 @@ energy(const Entity& element, ...@@ -77,7 +78,7 @@ energy(const Entity& element,
const double integrationElement = element.geometry().integrationElement(quadPos); const double integrationElement = element.geometry().integrationElement(quadPos);
const Dune::FieldMatrix<double,gridDim,gridDim>& jacobianInverseTransposed = element.geometry().jacobianInverseTransposed(quadPos); const typename Geometry::JacobianInverseTransposed& jacobianInverseTransposed = element.geometry().jacobianInverseTransposed(quadPos);
double weight = quad[pt].weight() * integrationElement; double weight = quad[pt].weight() * integrationElement;
...@@ -108,6 +109,8 @@ assembleEmbeddedGradient(const Entity& element, ...@@ -108,6 +109,8 @@ assembleEmbeddedGradient(const Entity& element,
const std::vector<TargetSpace>& localSolution, const std::vector<TargetSpace>& localSolution,
std::vector<typename TargetSpace::EmbeddedTangentVector>& localGradient) const std::vector<typename TargetSpace::EmbeddedTangentVector>& localGradient) const
{ {
typedef typename GridView::template Codim<0>::Entity::Geometry Geometry;
// initialize gradient // initialize gradient
localGradient.resize(localSolution.size()); localGradient.resize(localSolution.size());
std::fill(localGradient.begin(), localGradient.end(), typename TargetSpace::EmbeddedTangentVector(0)); std::fill(localGradient.begin(), localGradient.end(), typename TargetSpace::EmbeddedTangentVector(0));
...@@ -131,7 +134,7 @@ assembleEmbeddedGradient(const Entity& element, ...@@ -131,7 +134,7 @@ assembleEmbeddedGradient(const Entity& element,
const double integrationElement = element.geometry().integrationElement(quadPos); const double integrationElement = element.geometry().integrationElement(quadPos);
const Dune::FieldMatrix<double,gridDim,gridDim>& jacobianInverseTransposed = element.geometry().jacobianInverseTransposed(quadPos); const typename Geometry::JacobianInverseTransposed& jacobianInverseTransposed = element.geometry().jacobianInverseTransposed(quadPos);
double weight = quad[pt].weight() * integrationElement; double weight = quad[pt].weight() * integrationElement;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment