Skip to content
Snippets Groups Projects
Commit 5d1f6a7f authored by Steffen Müthing's avatar Steffen Müthing
Browse files

Merge branch 'master' into p/muething/heterogeneous-containers

* master: (82 commits)
  [bugfix][localfunctionspace] dereference shared_ptr to create the BaseT
  [Bugfix][VariableMonomFEM] allow to set the GeometryType in the constructor
  [test] update testordering to trigger a bug, I've been hunting for several days
  [ordering] add paranoiy checkt to ensure that the geometrytype is compatible with what we precomputed
  Use ctype and dimensionworld from Geometry.
  [Bugfix][GridFunctionSpace] Make sure to propagate grid partitions from Ordering to GFS
  [Makefile] add new headers to header list
  [Newton] fix error message
  Update various CMakeLists.txt
  [backend/istl] dg-amg: fix the construction of the conforming-FEM matrix
  [backend/istl] add new dg-amg backend
  [lfsindexcache] add typedefs for ContainerIndex and DOFIndex
  [LFSIndexCache] Replace C arrays that might be of length 0 with array class
  Remove more unused typedefs.
  Fix headercheck by adding missing include.
  [lfsindexcache] add typedefs for ContainerIndex and DOFIndex
  [LFSIndexCache] Replace C arrays that might be of length 0 with array class
  Remove more unused typedefs.
  Fix headercheck by adding missing include.
  [lfsindexcache] add typedefs for ContainerIndex and DOFIndex
  ...

Conflicts:
	dune/pdelab/gridfunctionspace/vectorgridfunctionspace.hh
parents 0d54a54d 80973d38
No related branches found
No related tags found
Loading
Showing
with 1266 additions and 36 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment