fix some more deprecation warnings

dune/xt/functions/visualization.hh

@@ -183,7 +183,7 @@ void visualize_gradient(const GridFunctionInterface<E, r, rC, R>& grid_function,
 {
   static_assert(Grid::is_view<GridViewType>::value);
   auto vtk_writer = internal::create_vtkwriter(grid_view, subsampling);
-  add_gradient_to_vtkwriter(*vtk_writer, grid_function, param, visualizer);
+  internal::add_gradient_to_vtkwriter(*vtk_writer, grid_function, param, visualizer);
   internal::write_visualization(*vtk_writer, path, vtk_output_type);
 } // ... visualize_gradient(...)
 

dune/xt/test/functions/checkerboard.tpl

@@ -20,6 +20,7 @@
 #include <dune/xt/functions/checkerboard.hh>
 #include <dune/xt/functions/visualization.hh>
 
+using namespace Dune::XT;
 using namespace Dune::XT::Functions;
 
 
@@ -33,18 +34,18 @@ struct CheckerboardFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}} : public ::t
   static constexpr size_t r = {{r}};
   static constexpr size_t rC = {{rC}};
 
-  using FunctionType = Dune::XT::Functions::CheckerboardFunction<ElementType, r, rC>;
+  using FunctionType = CheckerboardFunction<ElementType, r, rC>;
 
   using RangeType = typename FunctionType::RangeType;
   using DomainType = typename FunctionType::DomainType;
   using DerivativeRangeType = typename FunctionType::LocalFunctionType::DerivativeRangeType;
 
   CheckerboardFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}()
-    : grid_(Dune::XT::Grid::make_cube_grid<GridType>(-1., 1., 4))
+    : grid_(Grid::make_cube_grid<GridType>(-1., 1., 4))
   {
   }
 
-  const Dune::XT::Grid::GridProvider<GridType> grid_;
+  const Grid::GridProvider<GridType> grid_;
 };
 
 
@@ -106,7 +107,7 @@ TEST_F(CheckerboardFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}, is_visualiz
   FunctionType function_all(lower_left_all, upper_right, num_elements, values);
 
   visualize(function, leaf_view, "test__CheckerboardFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}__is_visualizable");
-  function_all.visualize(leaf_view, "test__AllDomain__CheckerboardFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}__is_visualizable");
+  visualize(function_all, leaf_view, "test__AllDomain__CheckerboardFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}__is_visualizable");
 }
 
 TEST_F(CheckerboardFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}, is_bindable)
@@ -182,7 +183,7 @@ TEST_F(CheckerboardFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}, local_evalu
         RangeType expected_value(0.);
         const auto center = element.geometry().center();
         std::vector<size_t> which_partition(d, 0);
-        if (Dune::XT::Common::FloatCmp::le(lower_left, center) && Dune::XT::Common::FloatCmp::lt(center, upper_right)) {
+        if (Common::FloatCmp::le(lower_left, center) && Common::FloatCmp::lt(center, upper_right)) {
           for (size_t dd = 0; dd < d; ++dd) {
             which_partition[dd] =
                 std::min(size_t(std::floor(num_elements[dd]

dune/xt/test/functions/difference.tpl

@@ -19,8 +19,10 @@
 
 #include <dune/xt/functions/base/combined-grid-functions.hh>
 #include <dune/xt/functions/indicator.hh>
+#include <dune/xt/functions/visualization.hh>
 
 using namespace Dune::XT;
+using namespace Dune::XT::Functions;
 
 {% for GRIDNAME, GRID, r, rC in config['types'] %}
 
@@ -32,9 +34,9 @@ struct DifferenceFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}} : public ::tes
   static constexpr size_t r = {{r}};
   static constexpr size_t rC = {{rC}};
 
-  using IndicatorFunctionType = Dune::XT::Functions::IndicatorGridFunction<ElementType, r, rC>;
+  using IndicatorFunctionType = IndicatorGridFunction<ElementType, r, rC>;
 
-  using DifferenceFunctionType = Dune::XT::Functions::DifferenceGridFunction<IndicatorFunctionType, IndicatorFunctionType>;
+  using DifferenceFunctionType = DifferenceGridFunction<IndicatorFunctionType, IndicatorFunctionType>;
 
   using RangeType = typename IndicatorFunctionType::RangeType;
   using DomainType = typename IndicatorFunctionType::DomainType;
@@ -119,8 +121,8 @@ TEST_F(DifferenceFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}, is_visualizab
   DifferenceFunctionType manual_difference(f, g);
   const auto& difference = f - g;
 
-  manual_difference.visualize(leaf_view, "test__DifferenceFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}__is_visualizable");
-  difference.visualize(leaf_view, "test__DifferenceFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}__is_visualizable");
+  visualize(manual_difference, leaf_view, "test__DifferenceFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}__is_visualizable");
+  visualize(difference, leaf_view, "test__DifferenceFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}__is_visualizable");
 }
 
 TEST_F(DifferenceFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}, is_bindable)

dune/xt/test/functions/indicator_function.tpl

@@ -119,7 +119,7 @@ TEST_F(IndicatorFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}, is_visualizabl
   visualize(function, leaf_view, "test__IndicatorFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}__is_visualizable");
 
   FunctionType function_overlap({std::make_tuple(lower_left, middle_2, first_value), std::make_tuple(middle_1, upper_right, second_value)});
-  function_overlap.visualize(leaf_view, "test__IndicatorFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}__with_overlap__is_visualizable");
+  visualize(function_overlap, leaf_view, "test__IndicatorFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}__with_overlap__is_visualizable");
 }
 
 TEST_F(IndicatorFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}, global_order)

dune/xt/test/functions/indicator_grid_function.tpl

@@ -119,7 +119,7 @@ TEST_F(IndicatorGridFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}, is_visuali
 
   FunctionType function_overlap({std::make_tuple(lower_left, middle_2, first_value),
                                  std::make_tuple(middle_1, upper_right, second_value)});
-  function_overlap.visualize(leaf_view, "test__IndicatorGridFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}__with_overlap__is_visualizable");
+  visualize(function_overlap, leaf_view, "test__IndicatorGridFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}__with_overlap__is_visualizable");
 }
 
 TEST_F(IndicatorGridFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}, is_bindable)

dune/xt/test/functions/product.tpl

@@ -19,8 +19,10 @@
 
 #include <dune/xt/functions/base/combined-grid-functions.hh>
 #include <dune/xt/functions/indicator.hh>
+#include <dune/xt/functions/visualization.hh>
 
 using namespace Dune::XT;
+using namespace Dune::XT::Functions;
 
 {% for GRIDNAME, GRID, r, rC in config['types'] %}
 
@@ -32,10 +34,10 @@ struct ProductFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}} : public ::testin
   static constexpr size_t r = {{r}};
   static constexpr size_t rC = {{rC}};
 
-  using IndicatorFunctionType = Dune::XT::Functions::IndicatorGridFunction<ElementType, r, rC>;
-  using ScalarIndicatorFunctionType = Dune::XT::Functions::IndicatorGridFunction<ElementType, 1, 1>;
+  using IndicatorFunctionType = IndicatorGridFunction<ElementType, r, rC>;
+  using ScalarIndicatorFunctionType = IndicatorGridFunction<ElementType, 1, 1>;
 
-  using ProductFunctionType = Dune::XT::Functions::ProductGridFunction<ScalarIndicatorFunctionType, IndicatorFunctionType>;
+  using ProductFunctionType = ProductGridFunction<ScalarIndicatorFunctionType, IndicatorFunctionType>;
 
   using RangeType = typename IndicatorFunctionType::RangeType;
   using ScalarRangeType = typename ScalarIndicatorFunctionType::RangeType;
@@ -122,8 +124,8 @@ TEST_F(ProductFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}, is_visualizable)
   ProductFunctionType manual_product(f, g);
   const auto& product = f * g;
 
-  manual_product.visualize(leaf_view, "test__ProductFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}__is_visualizable");
-  product.visualize(leaf_view, "test__ProductFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}__is_visualizable");
+  visualize(manual_product, leaf_view, "test__ProductFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}__is_visualizable");
+  visualize(product, leaf_view, "test__ProductFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}__is_visualizable");
 }
 
 TEST_F(ProductFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}, is_bindable)

dune/xt/test/functions/spe10_model1.tpl

@@ -93,7 +93,7 @@ TEST_F(Spe10Model1Function_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}, is_visualiza
       {0, 0},
       {Dune::XT::Functions::Spe10::internal::model_1_length_x, Dune::XT::Functions::Spe10::internal::model_1_length_z});
   const auto leaf_view = grid_.leaf_view();
-  default_visualize(function, leaf_view, "test__Spe10Model1Function_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}__is_visualizable");
+  visualize(default_function, leaf_view, "test__Spe10Model1Function_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}__is_visualizable");
 #else
   std::cout << "Test disabled, missing dune-xt-data!" << std::endl;
 #endif

dune/xt/test/functions/sum_for_grid_functions.tpl

@@ -19,8 +19,10 @@
 
 #include <dune/xt/functions/base/combined-grid-functions.hh>
 #include <dune/xt/functions/indicator.hh>
+#include <dune/xt/functions/visualization.hh>
 
 using namespace Dune::XT;
+using namespace Dune::XT::Functions;
 
 {% for GRIDNAME, GRID, r, rC in config['types'] %}
 
@@ -32,9 +34,9 @@ struct SumFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}} : public ::testing::T
   static constexpr size_t r = {{r}};
   static constexpr size_t rC = {{rC}};
 
-  using IndicatorFunctionType = Dune::XT::Functions::IndicatorGridFunction<ElementType, r, rC>;
+  using IndicatorFunctionType = IndicatorGridFunction<ElementType, r, rC>;
 
-  using SumFunctionType = Dune::XT::Functions::SumGridFunction<IndicatorFunctionType, IndicatorFunctionType>;
+  using SumFunctionType = SumGridFunction<IndicatorFunctionType, IndicatorFunctionType>;
 
   using RangeType = typename IndicatorFunctionType::RangeType;
   using DomainType = typename IndicatorFunctionType::DomainType;
@@ -116,8 +118,8 @@ TEST_F(SumFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}, is_visualizable)
   SumFunctionType manual_sum(f, g);
   const auto& sum = f + g;
 
-  manual_sum.visualize(leaf_view, "test__SumFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}__is_visualizable");
-  sum.visualize(leaf_view, "test__SumFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}__is_visualizable");
+  visualize(manual_sum, leaf_view, "test__SumFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}__is_visualizable");
+  visualize(sum, leaf_view, "test__SumFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}__is_visualizable");
 }
 
 TEST_F(SumFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}, is_bindable)

dune/xt/test/functions/visualization.tpl

@@ -15,8 +15,10 @@
 #include <dune/xt/grid/gridprovider/cube.hh>
 
 #include <dune/xt/functions/generic/grid-function.hh>
+#include <dune/xt/functions/visualization.hh>
 
 using namespace Dune::XT;
+using namespace Dune::XT::Functions;
 
 {% for GRIDNAME, GRID, r, rC in config['types'] %}
 
@@ -60,16 +62,16 @@ TEST_F(VisualizeGenericGridFunction_from_{{GRIDNAME}}_to_{{r}}_times_{{rC}}, vis
       [](const auto& /*xx*/, const auto& /*param*/) { return DerivativeRangeReturnType(); },
       [](const auto& /*alpha*/, const auto& /*xx*/, const auto& /*param*/) { return DerivativeRangeReturnType(); });
 
-  function.visualize(leaf_view, "default");
+  visualize(function, leaf_view, "default");
   SumVisualizer<r, rC> sum_visualizer;
-  function.visualize(leaf_view, "sum", true, Dune::VTK::appendedraw, {}, sum_visualizer);
+  visualize(function, leaf_view, "sum", true, Dune::VTK::appendedraw, {}, sum_visualizer);
   ComponentVisualizer<r, rC> first_comp_visualizer(0);
-  function.visualize(leaf_view, "component", false, Dune::VTK::appendedraw, {}, first_comp_visualizer);
+  visualize(function, leaf_view, "component", false, Dune::VTK::appendedraw, {}, first_comp_visualizer);
   GenericVisualizer<r, rC> sin_abs_visualizer(1, [](const int, const RangeType& val) { return std::sin(val.two_norm()); });
-  function.visualize(leaf_view, "sin_abs", false, Dune::VTK::appendedraw, {}, sin_abs_visualizer);
+  visualize(function, leaf_view, "sin_abs", false, Dune::VTK::appendedraw, {}, sin_abs_visualizer);
 
   if (r == 1)
-    function.visualize_gradient(leaf_view, "gradient");
+    visualize_gradient(function, leaf_view, "gradient");
 }
 
 {% endfor  %}