diff --git a/dune/fem-dg/examples/advdiff/algorithmcreator.hh b/dune/fem-dg/examples/advdiff/algorithmcreator.hh
index 6ca123be4e8ee94fc215152e5b2d2f0dd088a08d..0aab62457f547439ee6ff4fb2e6c2ff29690aa77 100644
--- a/dune/fem-dg/examples/advdiff/algorithmcreator.hh
+++ b/dune/fem-dg/examples/advdiff/algorithmcreator.hh
@@ -58,7 +58,8 @@ namespace Fem
Adaptivity::Enum::default_,
//DiscreteFunctionSpaces::Enum::gausslobatto, //legendre
//DiscreteFunctionSpaces::Enum::gausslegendre, //legendre
- DiscreteFunctionSpaces::Enum::default_,
+ DiscreteFunctionSpaces::Enum::legendre,
+ //DiscreteFunctionSpaces::Enum::default_,
Solver::Enum::default_,
AdvectionLimiter::Enum::default_,
Matrix::Enum::default_,
diff --git a/dune/fem-dg/examples/advdiff/test/CMakeLists.txt b/dune/fem-dg/examples/advdiff/test/CMakeLists.txt
index e6ab16aeeb2361a6f72cc2700642baf831e59473..7fb9a636f2e779880b211d2929acb616ede55e6e 100644
--- a/dune/fem-dg/examples/advdiff/test/CMakeLists.txt
+++ b/dune/fem-dg/examples/advdiff/test/CMakeLists.txt
@@ -1,10 +1,10 @@
include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/examples/advdiff/")
# specify type of grid implementation, dimension and polynomial order
-set( GRIDTYPE ALUGRID_CUBE )
-#set( GRIDTYPE SPGRID )
+#set( GRIDTYPE ALUGRID_CUBE )
+set( GRIDTYPE SPGRID )
set( GRIDDIM 2 )
-set( POLORDER 2 )
+set( POLORDER 4 )
add_definitions( "-DGRIDDIM=${GRIDDIM}" )
add_definitions( "-DDIMRANGE=3" )
diff --git a/dune/fem-dg/examples/advdiff/test/parameters/advdiff b/dune/fem-dg/examples/advdiff/test/parameters/advdiff
index 74df44ff346117939bafd690b4b6a724e85d9801..a6390f72c02bb4696a463ded666b390b2cc011ba 100644
--- a/dune/fem-dg/examples/advdiff/test/parameters/advdiff
+++ b/dune/fem-dg/examples/advdiff/test/parameters/advdiff
@@ -15,7 +15,15 @@ gridsol.filename: heat-checkpoint
# GENERAL
#--------
-# femdg.stepper.printcount: 10
+fem.adaptation.method: none # none | generic | callback
+
+# coarsest level that should be present
+fem.adaptation.coarsestLevel: 3
+# finest level that should be present
+fem.adaptation.finestLevel: 6
+
+fem.eoc.steps: 1
+femdg.stepper.printcount: 100
paramfile: ../../parameter/paramBase
# PROBLEM SETUP
@@ -24,7 +32,6 @@ paramfile: ../../parameter/paramBase
# problem: heat, quasi, plaplace
problem: pulse
-fem.eoc.steps: 5
femdg.stepper.endtime: 0.15
femdg.stepper.diffusiontimestep: 1
epsilon: 0.001
diff --git a/dune/fem-dg/examples/euler/algorithmcreator.hh b/dune/fem-dg/examples/euler/algorithmcreator.hh
index 5e5439094c9f87ff175981ec62910e6946658986..e94620adf178ac50d7248686b3d812b702c8b5a8 100644
--- a/dune/fem-dg/examples/euler/algorithmcreator.hh
+++ b/dune/fem-dg/examples/euler/algorithmcreator.hh
@@ -62,8 +62,11 @@ namespace Fem
typedef AlgorithmConfigurator< GridSelectorGridType,
Galerkin::Enum::dg,
Adaptivity::Enum::yes,
- DiscreteFunctionSpaces::Enum::orthonormal,
+ //DiscreteFunctionSpaces::Enum::orthonormal,
//DiscreteFunctionSpaces::Enum::lagrange,
+ //DiscreteFunctionSpaces::Enum::gausslobatto,
+ //DiscreteFunctionSpaces::Enum::gausslegendre,
+ DiscreteFunctionSpaces::Enum::hierarchic_legendre,
Solver::Enum::fem,
AdvectionLimiter::Enum::limited,
Matrix::Enum::matrixfree,
diff --git a/dune/fem-dg/examples/euler/test/CMakeLists.txt b/dune/fem-dg/examples/euler/test/CMakeLists.txt
index 73005fd61a0aeca37523461dd51e16d027faefa3..790e36d294eb77b2468bf6857739dad6e4a4d94a 100644
--- a/dune/fem-dg/examples/euler/test/CMakeLists.txt
+++ b/dune/fem-dg/examples/euler/test/CMakeLists.txt
@@ -1,11 +1,11 @@
include_directories("${CMAKE_SOURCE_DIR}/dune/fem-dg/examples/euler/")
# specify type of grid implemention, dimension and polynomial order
-set( GRIDTYPE ALUGRID_CUBE )
+#set( GRIDTYPE ALUGRID_CUBE )
#set( GRIDTYPE SPGRID_COUNT_FLOPS )
-#set( GRIDTYPE SPGRID )
+set( GRIDTYPE SPGRID )
set( GRIDDIM 2 )
-set( POLORDER 2 )
+set( POLORDER 4 )
add_definitions( "-D${GRIDTYPE}" )
add_definitions( "-DGRIDDIM=${GRIDDIM}" )
diff --git a/dune/fem-dg/examples/euler/test/parameters/euler b/dune/fem-dg/examples/euler/test/parameters/euler
index 0ff43612550f79db78774482c3e6461be641f20b..42f3d563e97ff4da38d68043b47bb475792265e7 100644
--- a/dune/fem-dg/examples/euler/test/parameters/euler
+++ b/dune/fem-dg/examples/euler/test/parameters/euler
@@ -29,8 +29,8 @@ gridsol.savestep: 0.5
gridsol.firstwrite: 0.5
gridsol.filename: straka-checkpoint
-fem.eoc.steps: 5
-
+fem.eoc.steps: 4
+femdg.stepper.printcount: 100
# STEPPER
#--------
@@ -65,7 +65,7 @@ r: 0.25 # radius of perturbation ball
# coarsest level that should be present
fem.adaptation.coarsestLevel: 0
# finest level that should be present
-fem.adaptation.finestLevel: 0
+fem.adaptation.finestLevel: 6
# DOMAIN SETUP
diff --git a/dune/fem-dg/examples/euler/test/parameters/parameter b/dune/fem-dg/examples/euler/test/parameters/parameter
index cedc1cb15fd16de58cd1b056b706d4ee00c88625..d453d8d0ab311a0919c52940130f7f965a444fca 100644
--- a/dune/fem-dg/examples/euler/test/parameters/parameter
+++ b/dune/fem-dg/examples/euler/test/parameters/parameter
@@ -32,12 +32,17 @@ gridsol.filename: straka-checkpoint
# GENERAL
#--------
+# coarsest level that should be present
+fem.adaptation.coarsestLevel: 3
+# finest level that should be present
+fem.adaptation.finestLevel: 3
+
paramfile: ../../parameter/paramBase
# STEPPER
#--------
-fem.eoc.steps: 6
+fem.eoc.steps: 1
femdg.stepper.starttime: 0.
femdg.stepper.endtime: 0.15
femdg.stepper.maxtimestep: 0.1
diff --git a/dune/fem-dg/examples/grids/grid2d_nonaffine.dgf b/dune/fem-dg/examples/grids/grid2d_nonaffine.dgf
new file mode 100644
index 0000000000000000000000000000000000000000..b6a197c7c60a2f971bbba38b5d8fcad878dce985
--- /dev/null
+++ b/dune/fem-dg/examples/grids/grid2d_nonaffine.dgf
@@ -0,0 +1,76 @@
+DGF
+% Elements = 16 | Vertices = 27
+
+VERTEX
+1.2500000000000000e-01 0.0000000000000000e+00
+2.5000000000000000e-01 0.0000000000000000e+00
+1.2500000000000000e-01 1.5000000000000000e-01
+2.8000000000000000e-01 1.1000000000000000e-01
+0.0000000000000000e+00 0.0000000000000000e+00
+0.0000000000000000e+00 1.2500000000000000e-01
+3.7500000000000000e-01 0.0000000000000000e+00
+5.0000000000000000e-01 0.0000000000000000e+00
+3.4500000000000000e-01 1.4500000000000000e-01
+5.0000000000000000e-01 1.2500000000000000e-01
+6.2500000000000000e-01 0.0000000000000000e+00
+5.9000000000000000e-01 1.2000000000000000e-01
+7.5000000000000000e-01 0.0000000000000000e+00
+7.2000000000000000e-01 1.5000000000000000e-01
+8.7500000000000000e-01 0.0000000000000000e+00
+1.0000000000000000e+00 0.0000000000000000e+00
+8.7500000000000000e-01 1.1500000000000000e-01
+1.0000000000000000e+00 1.2500000000000000e-01
+5.0000000000000000e-01 2.5000000000000000e-01
+6.2500000000000000e-01 2.5000000000000000e-01
+7.5000000000000000e-01 2.5000000000000000e-01
+8.7500000000000000e-01 2.5000000000000000e-01
+1.0000000000000000e+00 2.5000000000000000e-01
+3.7500000000000000e-01 2.5000000000000000e-01
+2.5000000000000000e-01 2.5000000000000000e-01
+1.2500000000000000e-01 2.5000000000000000e-01
+0.0000000000000000e+00 2.5000000000000000e-01
+#
+
+CUBE
+0 1 2 3
+4 0 5 2
+6 7 8 9
+1 6 3 8
+7 10 9 11
+10 12 11 13
+14 15 16 17
+12 14 13 16
+9 11 18 19
+11 13 19 20
+16 17 21 22
+13 16 20 21
+8 9 23 18
+3 8 24 23
+2 3 25 24
+5 2 26 25
+#
+
+BOUNDARYSEGMENTS
+2 0 1
+2 4 5
+2 4 0
+2 6 7
+2 1 6
+2 7 10
+2 10 12
+2 15 17
+2 14 15
+2 12 14
+2 18 19
+2 19 20
+2 17 22
+2 21 22
+2 20 21
+2 23 18
+2 24 23
+2 25 24
+2 5 26
+2 26 25
+#
+
+#