Merge branch 'feature/fix-remove-vtksubsampling-deprication-warning' into 'master'

adjust subsamplingvtkwriter to changes in dune-grid 2.6

See merge request dominic/dune-perftool!205

python/dune/perftool/pdelab/driver/vtk.py

 from dune.perftool.generation import (include_file,
                                       preamble,
                                       )
+from dune.perftool.options import get_option
 from dune.perftool.pdelab.driver import (get_formdata,
                                          get_trial_element,
                                          name_initree,
@@ -44,19 +45,21 @@ def define_subsamplinglevel(name):
     degree = get_trial_element().degree()
     if isinstance(degree, tuple):
         degree = max(degree)
-    return "int {} = {}.get<int>(\"vtk.subsamplinglevel\", {});".format(name, ini, max(degree - 1, 0))
+    if get_option("blockstructured"):
+        degree *= get_option("number_of_blocks")
+    return "Dune::RefinementIntervals {}({}.get<int>(\"vtk.subsamplinglevel\", {}));".format(name, ini, max(degree, 1))
 
 
-def name_subsamplinglevel():
-    define_subsamplinglevel("sublevel")
-    return "sublevel"
+def name_subsamplingintervals():
+    define_subsamplinglevel("subint")
+    return "subint"
 
 
 @preamble
 def define_vtkwriter(name):
     _type = type_vtkwriter()
     gv = name_leafview()
-    subsamp = name_subsamplinglevel()
+    subsamp = name_subsamplingintervals()
     return "{} {}({}, {});".format(_type, name, gv, subsamp)