From e5a16f956c117293ba63575397a4b692c4c839e9 Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Tue, 18 Dec 2018 13:59:20 +0100
Subject: [PATCH] Minor cleanup
---
dune/gfe/nonplanarcosseratshellenergy.hh | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/dune/gfe/nonplanarcosseratshellenergy.hh b/dune/gfe/nonplanarcosseratshellenergy.hh
index d2bdf188..7378f356 100644
--- a/dune/gfe/nonplanarcosseratshellenergy.hh
+++ b/dune/gfe/nonplanarcosseratshellenergy.hh
@@ -279,7 +279,7 @@ energy(const typename Basis::LocalView& localView,
const auto& localFiniteElement = localView.tree().finiteElement();
////////////////////////////////////////////////////////////////////////////////////
- // Construct a linear (i.e., non-constant!) normal field on the surface
+ // Construct a linear (i.e., non-constant!) normal field on each element
////////////////////////////////////////////////////////////////////////////////////
auto gridView = localView.globalBasis().gridView();
@@ -314,8 +314,6 @@ energy(const typename Basis::LocalView& localView,
const DT integrationElement = geometry.integrationElement(quadPos);
- DT weight = quad[pt].weight() * integrationElement;
-
// The value of the local function
RigidBodyMotion<field_type,dim> value = localGeodesicFEFunction.evaluate(quadPos);
@@ -430,15 +428,18 @@ energy(const typename Basis::LocalView& localView,
//////////////////////////////////////////////////////////
// Add the membrane energy density
- energy += weight * (thickness_ - K*Dune::Power<3>::eval(thickness_) / 12.0) * W_m(Ee)
- + weight * (Dune::Power<3>::eval(thickness_) / 12.0 - K * Dune::Power<5>::eval(thickness_) / 80.0)*W_m(Ee*b + c*Ke)
- + weight * Dune::Power<3>::eval(thickness_) / 6.0 * W_mixt(Ee, c*Ke*b - 2*H*c*Ke)
- + weight * Dune::Power<5>::eval(thickness_) / 80.0 * W_mp( (Ee*b + c*Ke)*b);
+ auto energyDensity = (thickness_ - K*Dune::Power<3>::eval(thickness_) / 12.0) * W_m(Ee)
+ + (Dune::Power<3>::eval(thickness_) / 12.0 - K * Dune::Power<5>::eval(thickness_) / 80.0)*W_m(Ee*b + c*Ke)
+ + Dune::Power<3>::eval(thickness_) / 6.0 * W_mixt(Ee, c*Ke*b - 2*H*c*Ke)
+ + Dune::Power<5>::eval(thickness_) / 80.0 * W_mp( (Ee*b + c*Ke)*b);
// Add the bending energy density
- energy += weight * (thickness_ - K*Dune::Power<3>::eval(thickness_) / 12.0) * W_curv(Ke)
- + weight * (Dune::Power<3>::eval(thickness_) / 12.0 - K * Dune::Power<5>::eval(thickness_) / 80.0)*W_curv(Ke*b)
- + weight * Dune::Power<5>::eval(thickness_) / 80.0 * W_curv(Ke*b*b);
+ energyDensity += (thickness_ - K*Dune::Power<3>::eval(thickness_) / 12.0) * W_curv(Ke)
+ + (Dune::Power<3>::eval(thickness_) / 12.0 - K * Dune::Power<5>::eval(thickness_) / 80.0)*W_curv(Ke*b)
+ + Dune::Power<5>::eval(thickness_) / 80.0 * W_curv(Ke*b*b);
+
+ // Add energy density
+ energy += quad[pt].weight() * integrationElement * energyDensity;
///////////////////////////////////////////////////////////
// Volume load contribution
--
GitLab