Commit e6edf8e2 authored by Lukas Riedel's avatar Lukas Riedel

Merge branch '67-pklocalfiniteelementmap-creates-continuous-function-space' into 'master'

Resolve "PkLocalFiniteElementMap creates continuous function space"

Closes #67

See merge request !46
parents 7b1dcc23 eaad770c
# DORiE Changelog
## Unreleased
### Changed
* Switch VTK output from conforming to non-conforming
### Fixed
* Fix finite element map used for simplex grids. The old one did not implement
a discontinuous function space.
## 1.0.0 (2018-03-28)
First stable version
\ No newline at end of file
#ifndef DUNE_DORIE_UTIL_HH
#define DUNE_DORIE_UTIL_HH
#include <dune/pdelab/finiteelementmap/opbfem.hh>
namespace Dune{
namespace Dorie{
......@@ -114,13 +116,14 @@ template<typename GridView, typename RF, int order>
struct GridFunctionSpaceHelper<GridView,RF,order,Dune::GeometryType::BasicType::simplex>
{
private:
static constexpr int dim = GridView::dimension;
using DF = typename GridView::Grid::ctype;
public:
/// Entity set of the GFS
using ES = Dune::PDELab::OverlappingEntitySet<GridView>;
/// FiniteElementMap type of GFS
using FEM = typename Dune::PDELab::PkLocalFiniteElementMap<ES,DF,RF,order>;
using FEM = typename Dune::PDELab::OPBLocalFiniteElementMap<DF, RF, order, dim, Dune::GeometryType::BasicType::simplex>;
/// Constraints type of the GFS
using CON = Dune::PDELab::P0ParallelConstraints;
/// GFS type
......@@ -133,7 +136,7 @@ public:
static Type create (const GridView& gv)
{
ES es(gv);
auto fem = std::make_shared<FEM>(es);
auto fem = std::make_shared<FEM>();
auto con = std::make_shared<CON>();
return Type(es,fem,con);
}
......
......@@ -5,7 +5,7 @@ _asset_path = "${CMAKE_CURRENT_LIST_DIR}"
_limit_cube_static = 4e-7
_limit_cube_adapt = 3E-7
_limit_simplex_static = 4E-7
_limit_simplex_adapt = 2E-6
_limit_simplex_adapt = 4E-7
_prefix = _simplex, _cube | expand grid
_suffix = _static, _adapt | expand adaptive
......
......@@ -31,8 +31,8 @@ parameters.interpolation = linear
[_ode]
flux = -5.55e-6
head_abstol = 3E-5, 2E-4 | expand gridtype
flux_abstol = 2E-9, 7E-8 | expand gridtype
head_abstol = 3E-5, 9E-5 | expand gridtype
flux_abstol = 2E-9, 5E-8 | expand gridtype
[NewtonParameters]
AbsoluteLimit = 1E-10
......
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