From cefc765c4c8cc8edc9bf5c9631ccfe6f009ab05f Mon Sep 17 00:00:00 2001
From: Jonathan Youett <youett@math.fu-berlin.de>
Date: Wed, 10 Oct 2018 10:49:54 +0200
Subject: [PATCH] Adjust quadrature rule
---
dune/elasticity/materials/neohookeanmaterial.hh | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/dune/elasticity/materials/neohookeanmaterial.hh b/dune/elasticity/materials/neohookeanmaterial.hh
index 29a2304..1ac21af 100644
--- a/dune/elasticity/materials/neohookeanmaterial.hh
+++ b/dune/elasticity/materials/neohookeanmaterial.hh
@@ -92,15 +92,14 @@ public:
for (const auto& e : elements(leafView)) {
- // get quadrature rule
- QuadratureRuleKey feKey(this->basis_->getLocalFiniteElement(e));
+ // TODO Get proper quadrature rule
+ //QuadratureRuleKey feKey(this->basis_->getLocalFiniteElement(e));
// the determinant involves derivative^dim
// further use 2nd order to approximate the logarithm
//feKey.setOrder(std::pow(feKey.derivative().order(),2*dim));
+ const int order = (e.type().isSimplex()) ? 5 : 4*dim;
- const int order = (e.type().isSimplex()) ? 6 : 4*dim;
- const auto& quad = QuadratureRuleCache<ctype, dim>::rule(e.type(), order, 0);
- //const auto& quad = QuadratureRuleCache<ctype, dim>::rule(feKey);
+ const auto& quad = QuadratureRuleCache<typename GridType::ctype, dim>::rule(e.type(), order, 0);
const auto& geometry = e.geometry();
--
GitLab