Commit 43cefbd6 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

Merge branch 'feature/replace_make_functions' into 'master'

Feature/replace make functions

See merge request !201
parents 39a573a2 d64976bf
......@@ -72,7 +72,7 @@ int main(int argc, char** argv)
auto preBasis = composite(power<2>(lagrange<2>(), flatInterleaved()),
lagrange<1>(),
flatLexicographic());
auto basis = makeGlobalBasis(gridView, preBasis);
ParallelGlobalBasis basis(gridView, preBasis);
using Basis = decltype(basis);
......
......@@ -39,7 +39,6 @@ int main(int argc, char** argv)
};
GridFunctionMarker marker("mymarker", prob.grid(), markerFunc);
auto marker2 = makeGridFunctionMarker("mymarker", prob.grid(), markerFunc);
prob.addMarker(marker);
......
......@@ -22,9 +22,9 @@ void test()
// use T as range type for basis
using namespace Dune::Functions::BasisFactory;
#if DUNE_VERSION_LT(DUNE_FUNCTIONS,2,7)
auto basis = makeGlobalBasis(grid.leafGridView(), power<1>(lagrange<1>(), flatLexicographic()));
ParallelGlobalBasis basis(grid.leafGridView(), power<1>(lagrange<1>(), flatLexicographic()));
#else
auto basis = makeGlobalBasis(grid.leafGridView(), power<1>(lagrange<1,T>(), flatLexicographic()));
ParallelGlobalBasis basis(grid.leafGridView(), power<1>(lagrange<1,T>(), flatLexicographic()));
#endif
using Basis = decltype(basis);
......
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