Fix/bugs when using growing grids

Merged Timo Koch requested to merge fix/bugs-when-using-growing-grids into next

Also prepares for using adaptivity

Merge request reports