diff --git a/src/film-on-substrate-stress-plot.cc b/src/film-on-substrate-stress-plot.cc index 77158d11c90aa2fcc0b911eff68626553a61f43a..2952461726b4b39f209548fe1b0d6d004c07dc28 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 42a04ae60ed2d8cfe5255ef5b1952799fde0b144..06171cee2f09611ed0cf39126b98f7b38163ce50 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 af4228c17c4c2203484358d61bad8cbbad9019d0..d4b61c599d432b7897e755d846a325258e5b816f 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 b50f2fb933893258652f8459ef04ba8e0b14a626..429d154fb8df5ec1049c405ca3c69986523fd304 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>