From ebaf028514686580c3ee73a08eb41c4aed33c6dd Mon Sep 17 00:00:00 2001 From: Jonathan Youett <youett@math.fu-berlin.de> Date: Wed, 10 Oct 2018 10:50:02 +0200 Subject: [PATCH] Fix includes --- dune/elasticity/materials/mooneyrivlinmaterial.hh | 10 +++++----- dune/elasticity/materials/neohookeanmaterial.hh | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dune/elasticity/materials/mooneyrivlinmaterial.hh b/dune/elasticity/materials/mooneyrivlinmaterial.hh index 05ecb97..a1e51d2 100644 --- a/dune/elasticity/materials/mooneyrivlinmaterial.hh +++ b/dune/elasticity/materials/mooneyrivlinmaterial.hh @@ -4,17 +4,17 @@ #define DUNE_ELASTICITY_MATERIALS_MOONEY_RIVLIN_MATERIAL_HH #include <dune/fufem/assemblers/localassemblers/adolclocalenergy.hh> -#include <dune/fufem/quadraturerules/quadraturerulecache.hh> -#include <dune/fufem/functions/virtualgridfunction.hh> #include <dune/fufem/functions/basisgridfunction.hh> +#include <dune/fufem/quadraturerules/quadraturerulecache.hh> -#include <dune/matrix-vector/addtodiagonal.hh> - +#include <dune/elasticity/materials/material.hh> +#include <dune/elasticity/common/elasticityhelpers.hh> #include <dune/elasticity/assemblers/mooneyrivlinfunctionalassembler.hh> #include <dune/elasticity/assemblers/mooneyrivlinoperatorassembler.hh> -#include <dune/elasticity/materials/material.hh> +#include <dune/matrix-vector/addtodiagonal.hh> + #warning Mooney-Rivlin Might not work properly yet /** \brief Class representing a hyperelastic Mooney-Rivlin material. diff --git a/dune/elasticity/materials/neohookeanmaterial.hh b/dune/elasticity/materials/neohookeanmaterial.hh index 1ac21af..09b766b 100644 --- a/dune/elasticity/materials/neohookeanmaterial.hh +++ b/dune/elasticity/materials/neohookeanmaterial.hh @@ -4,13 +4,11 @@ #define DUNE_ELASTICITY_MATERIALS_NEO_HOOKEAN_MATERIAL_HH #include <dune/fufem/assemblers/localassemblers/adolclocalenergy.hh> -#include <dune/fufem/quadraturerules/quadraturerulecache.hh> -#include <dune/fufem/symmetrictensor.hh> -#include <dune/fufem/functions/virtualgridfunction.hh> #include <dune/fufem/functions/basisgridfunction.hh> #include <dune/fufem/quadraturerules/quadraturerulecache.hh> +#include <dune/elasticity/common/elasticityhelpers.hh> #include <dune/elasticity/materials/material.hh> #include <dune/elasticity/assemblers/neohookefunctionalassembler.hh> #include <dune/elasticity/assemblers/neohookeoperatorassembler.hh> -- GitLab