Commit c56588bb authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

Merge branch 'issue/fix-taylorhood-in-globalidset' into issue/remove-node-indexset

parents 5629246c 3d4ae36f
Pipeline #6054 passed with stage
in 120 minutes and 51 seconds
......@@ -8,6 +8,7 @@
#include <dune/common/hybridutilities.hh>
#include <dune/common/version.hh>
#include <dune/functions/functionspacebases/nodes.hh>
#include <dune/functions/functionspacebases/lagrangebasis.hh>
#include <dune/grid/common/gridenums.hh>
#include <dune/localfunctions/common/localkey.hh>
......@@ -433,9 +434,15 @@ namespace AMDiS
using VTP = decltype(Dune::TypeTree::push_back(std::declval<TP>(), Dune::index_constant<0>{}));
using V0TP = decltype(Dune::TypeTree::push_back(std::declval<VTP>(), std::size_t(0)));
#if DUNE_VERSION_GTE(DUNE_FUNCTIONS,2,7)
using PQMultiIndex = std::array<size_type, 1>;
using PQ1PreBasis = Dune::Functions::LagrangePreBasis<GridView,1,PQMultiIndex>;
using PQ2PreBasis = Dune::Functions::LagrangePreBasis<GridView,2,PQMultiIndex>;
#else
// Note: PreBasis::PQ1PreBasis is private
using PQ1PreBasis = typename NodeIndexSet_t<PreBasis,TP>::PQ1NodeIndexSet::PreBasis;
using PQ2PreBasis = typename NodeIndexSet_t<PreBasis,TP>::PQ2NodeIndexSet::PreBasis;
#endif
using PQ1NodeIdSet = NodeIdSet<PQ1PreBasis, PTP>; // pressure
using PQ2NodeIdSet = NodeIdSet<PQ2PreBasis, V0TP>; // velocity
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment