From bad12e1ad0d905fec877c87b559dae44a3dd11dd Mon Sep 17 00:00:00 2001 From: Oliver Sander <oliver.sander@tu-dresden.de> Date: Sat, 12 Oct 2024 22:20:50 +0200 Subject: [PATCH] Adapt to new header paths in dune-elasticity 2.11 In particular, there is a directory dune/elasticy/densities now. --- src/film-on-substrate-stress-plot.cc | 8 ++++++++ src/film-on-substrate.cc | 8 ++++++++ test/filmonsubstratetest.cc | 8 ++++++++ test/surfacecosseratstressassemblertest.cc | 4 ++++ 4 files changed, 28 insertions(+) diff --git a/src/film-on-substrate-stress-plot.cc b/src/film-on-substrate-stress-plot.cc index 77158d11..29524617 100644 --- a/src/film-on-substrate-stress-plot.cc +++ b/src/film-on-substrate-stress-plot.cc @@ -15,11 +15,19 @@ #include <dune/common/parametertreeparser.hh> #include <dune/common/version.hh> +#if DUNE_VERSION_GTE(DUNE_ELASTICITY, 2, 11) +#include <dune/elasticity/densities/exphenckydensity.hh> +#include <dune/elasticity/densities/henckydensity.hh> +#include <dune/elasticity/densities/mooneyrivlindensity.hh> +#include <dune/elasticity/densities/neohookedensity.hh> +#include <dune/elasticity/densities/stvenantkirchhoffdensity.hh> +#else #include <dune/elasticity/materials/exphenckydensity.hh> #include <dune/elasticity/materials/henckydensity.hh> #include <dune/elasticity/materials/mooneyrivlindensity.hh> #include <dune/elasticity/materials/neohookedensity.hh> #include <dune/elasticity/materials/stvenantkirchhoffdensity.hh> +#endif #include <dune/functions/functionspacebases/interpolate.hh> #include <dune/functions/functionspacebases/lagrangebasis.hh> diff --git a/src/film-on-substrate.cc b/src/film-on-substrate.cc index 42a04ae6..06171cee 100644 --- a/src/film-on-substrate.cc +++ b/src/film-on-substrate.cc @@ -35,11 +35,19 @@ #include <dune/common/tuplevector.hh> #include <dune/common/version.hh> +#if DUNE_VERSION_GTE(DUNE_ELASTICITY, 2, 11) +#include <dune/elasticity/densities/exphenckydensity.hh> +#include <dune/elasticity/densities/henckydensity.hh> +#include <dune/elasticity/densities/mooneyrivlindensity.hh> +#include <dune/elasticity/densities/neohookedensity.hh> +#include <dune/elasticity/densities/stvenantkirchhoffdensity.hh> +#else #include <dune/elasticity/materials/exphenckydensity.hh> #include <dune/elasticity/materials/henckydensity.hh> #include <dune/elasticity/materials/mooneyrivlindensity.hh> #include <dune/elasticity/materials/neohookedensity.hh> #include <dune/elasticity/materials/stvenantkirchhoffdensity.hh> +#endif #include <dune/functions/functionspacebases/interpolate.hh> #include <dune/functions/functionspacebases/lagrangebasis.hh> diff --git a/test/filmonsubstratetest.cc b/test/filmonsubstratetest.cc index af4228c1..d4b61c59 100644 --- a/test/filmonsubstratetest.cc +++ b/test/filmonsubstratetest.cc @@ -19,11 +19,19 @@ #include <dune/common/tuplevector.hh> #include <dune/common/version.hh> +#if DUNE_VERSION_GTE(DUNE_ELASTICITY, 2, 11) +#include <dune/elasticity/densities/exphenckydensity.hh> +#include <dune/elasticity/densities/henckydensity.hh> +#include <dune/elasticity/densities/mooneyrivlindensity.hh> +#include <dune/elasticity/densities/neohookedensity.hh> +#include <dune/elasticity/densities/stvenantkirchhoffdensity.hh> +#else #include <dune/elasticity/materials/exphenckydensity.hh> #include <dune/elasticity/materials/henckydensity.hh> #include <dune/elasticity/materials/mooneyrivlindensity.hh> #include <dune/elasticity/materials/neohookedensity.hh> #include <dune/elasticity/materials/stvenantkirchhoffdensity.hh> +#endif #include <dune/functions/functionspacebases/interpolate.hh> #include <dune/functions/functionspacebases/lagrangebasis.hh> diff --git a/test/surfacecosseratstressassemblertest.cc b/test/surfacecosseratstressassemblertest.cc index b50f2fb9..429d154f 100644 --- a/test/surfacecosseratstressassemblertest.cc +++ b/test/surfacecosseratstressassemblertest.cc @@ -15,7 +15,11 @@ #include <dune/common/parametertreeparser.hh> #include <dune/common/version.hh> +#if DUNE_VERSION_GTE(DUNE_ELASTICITY, 2, 11) +#include <dune/elasticity/densities/stvenantkirchhoffdensity.hh> +#else #include <dune/elasticity/materials/stvenantkirchhoffdensity.hh> +#endif #include <dune/functions/functionspacebases/interpolate.hh> #include <dune/functions/functionspacebases/lagrangebasis.hh> -- GitLab