Merge branch 'cleanup/includes' into 'master'

cleanup: remove/add includes See merge request !36

Merge branch 'cleanup/includes' into 'master'
cleanup: remove/add includes See merge request !36
4b6c0e43 · Patrick Jaap · 5f333c65 · 8e06eba1 · 4b6c0e43 · 4b6c0e43
Commit 4b6c0e43 authored May 12, 2020 by Patrick Jaap
--- a/dune/elasticity/assemblers/feassembler.hh
+++ b/dune/elasticity/assemblers/feassembler.hh
@@ -2,7 +2,6 @@
 #define DUNE_ELASTICITY_ASSEMBLERS_FEASSEMBLER_HH

 #include <dune/common/fmatrix.hh>
-#include <dune/common/hybridutilities.hh>

 #include <dune/fufem/assemblers/istlbackend.hh>


--- a/dune/elasticity/materials/localintegralenergy.hh
+++ b/dune/elasticity/materials/localintegralenergy.hh
@@ -2,7 +2,6 @@
 #define DUNE_ELASTICITY_MATERIALS_LOCALINTEGRALENERGY_HH

 #include <dune/common/fmatrix.hh>
-#include <dune/common/fmatrixev.hh>

 #include <dune/geometry/quadraturerules.hh>


--- a/dune/elasticity/materials/neumannenergy.hh
+++ b/dune/elasticity/materials/neumannenergy.hh
@@ -3,6 +3,8 @@

 #include <functional>

+#include <dune/common/fvector.hh>
+
 #include <dune/geometry/quadraturerules.hh>

 #include <dune/fufem/boundarypatch.hh>

--- a/dune/elasticity/materials/sumenergy.hh
+++ b/dune/elasticity/materials/sumenergy.hh
@@ -3,14 +3,6 @@

 #include <vector>

-#include <dune/common/fmatrix.hh>
-#include <dune/common/fmatrixev.hh>
-
-#include <dune/geometry/quadraturerules.hh>
-
-#include <dune/fufem/functions/virtualgridfunction.hh>
-#include <dune/fufem/boundarypatch.hh>
-
 #include <dune/elasticity/assemblers/localenergy.hh>

 namespace Dune::Elasticity {