Skip to content
Snippets Groups Projects
Commit 0803ad85 authored by Oliver Sander's avatar Oliver Sander Committed by sander@PCPOOL.MI.FU-BERLIN.DE
Browse files

more dune-disc stuff removed

[[Imported from SVN: r5676]]
parent 2b720aad
No related branches found
No related tags found
No related merge requests found
...@@ -500,9 +500,8 @@ assembleGradient(const Entity& element, ...@@ -500,9 +500,8 @@ assembleGradient(const Entity& element,
getLocalReferenceConfiguration(element, localReferenceConfiguration); getLocalReferenceConfiguration(element, localReferenceConfiguration);
// Extract local solution on this element // Extract local solution on this element
const Dune::LagrangeShapeFunctionSet<double, double, 1> & baseSet Dune::P1LocalFiniteElement<double,double,1> localFiniteElement;
= Dune::LagrangeShapeFunctions<double, double, 1>::general(element.type(), 1); // first order int numOfBaseFct = localFiniteElement.localCoefficients().size();
const int numOfBaseFct = baseSet.size();
// init // init
gradient.resize(numOfBaseFct); gradient.resize(numOfBaseFct);
...@@ -533,15 +532,14 @@ assembleGradient(const Entity& element, ...@@ -533,15 +532,14 @@ assembleGradient(const Entity& element,
// /////////////////////////////////////// // ///////////////////////////////////////
// Compute deformation gradient // Compute deformation gradient
// /////////////////////////////////////// // ///////////////////////////////////////
FieldVector<double,1> shapeGrad[numOfBaseFct]; std::vector<Dune::FieldMatrix<double,1,1> > shapeGrad;
localFiniteElement.localBasis().evaluateJacobian(quadPos, shapeGrad);
for (int dof=0; dof<numOfBaseFct; dof++) { for (int dof=0; dof<numOfBaseFct; dof++) {
shapeGrad[dof] = baseSet[dof].evaluateDerivative(0,0,quadPos);
// multiply with jacobian inverse // multiply with jacobian inverse
FieldVector<double,1> tmp(0); FieldVector<double,1> tmp(0);
inv.umv(shapeGrad[dof], tmp); inv.umv(shapeGrad[dof][0], tmp);
shapeGrad[dof] = tmp; shapeGrad[dof] = tmp;
} }
......
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