From 0803ad85daa72274442eb11e232e1741442cd6d0 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Sun, 7 Mar 2010 20:55:08 +0000
Subject: [PATCH] more dune-disc stuff removed
[[Imported from SVN: r5676]]
---
src/rodlocalstiffness.hh | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/rodlocalstiffness.hh b/src/rodlocalstiffness.hh
index 53ef0879..d443715a 100644
--- a/src/rodlocalstiffness.hh
+++ b/src/rodlocalstiffness.hh
@@ -500,9 +500,8 @@ assembleGradient(const Entity& element,
getLocalReferenceConfiguration(element, localReferenceConfiguration);
// Extract local solution on this element
- const Dune::LagrangeShapeFunctionSet<double, double, 1> & baseSet
- = Dune::LagrangeShapeFunctions<double, double, 1>::general(element.type(), 1); // first order
- const int numOfBaseFct = baseSet.size();
+ Dune::P1LocalFiniteElement<double,double,1> localFiniteElement;
+ int numOfBaseFct = localFiniteElement.localCoefficients().size();
// init
gradient.resize(numOfBaseFct);
@@ -533,15 +532,14 @@ assembleGradient(const Entity& element,
// ///////////////////////////////////////
// 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++) {
- shapeGrad[dof] = baseSet[dof].evaluateDerivative(0,0,quadPos);
-
// multiply with jacobian inverse
FieldVector<double,1> tmp(0);
- inv.umv(shapeGrad[dof], tmp);
+ inv.umv(shapeGrad[dof][0], tmp);
shapeGrad[dof] = tmp;
}
--
GitLab