diff --git a/dune/elasticity/common/trustregionsolver.hh b/dune/elasticity/common/trustregionsolver.hh index 9856856bde42fc227c53abe687f8fd2b2a197add..ca65bde1b302f6d6942bdcaadbc7e286494329ae 100644 --- a/dune/elasticity/common/trustregionsolver.hh +++ b/dune/elasticity/common/trustregionsolver.hh @@ -26,6 +26,11 @@ #include <dune/elasticity/assemblers/feassembler.hh> #if HAVE_DUNE_PARMG + +// enable a temporary hack to let parmg work with powerBases +// which is needed for the current implementation of elasticty +#define DUNE_PARMG_POWER_BASIS_HACK + #include <dune/parmg/iterationstep/lambdastep.hh> #include <dune/parmg/iterationstep/multigrid.hh> #include <dune/parmg/parallel/dofmap.hh> @@ -68,14 +73,7 @@ public: TrustRegionSolver() : IterativeSolver<VectorType, Dune::BitSetVector<blocksize> >(0,100,NumProc::FULL), hessianMatrix_(std::shared_ptr<MatrixType>(NULL)), h1SemiNorm_(NULL) - { -#if HAVE_DUNE_PARMG - // TODO currently, we cannot use PARMG together with dune-functions bases - static_assert( not Dune::models<Dune::Functions::Concept::GlobalBasis<GridView>, BasisType>() , - "Currently, dune-parmg and dune-functions bases cannot be used together." - ); -#endif - } + {} /** \brief Set up the solver using a monotone multigrid method as the inner solver */ void setup(const GridType& grid,