Removed dune-functions requirement

dune.module

@@ -7,5 +7,5 @@ Module: dune-vtk
 Version: 0.1
 Maintainer: simon.praetorius@tu-dresden.de
 #depending on
-Depends: dune-grid dune-functions
-Suggests: dune-spgrid dune-polygongrid
\ No newline at end of file
+Depends: dune-grid
+Suggests: dune-functions dune-spgrid dune-polygongrid
\ No newline at end of file

dune/vtk/datacollectors/continuousdatacollector.hh

 #pragma once
 
+#include <numeric>
 #include "unstructureddatacollector.hh"
 
 namespace Dune

dune/vtk/vtkfunction.hh

@@ -3,7 +3,6 @@
 #include <type_traits>
 
 #include <dune/common/std/type_traits.hh>
-#include <dune/functions/common/signature.hh>
 
 #include "vtklocalfunction.hh"
 #include "vtktypes.hh"

src/CMakeLists.txt

-add_executable("vtkwriter" vtkwriter.cc)
-target_link_dune_default_libraries("vtkwriter")
-target_link_libraries("vtkwriter" dunevtk)
 
 add_executable("vtkreader" vtkreader.cc)
 target_link_dune_default_libraries("vtkreader")
 target_link_libraries("vtkreader" dunevtk)
 
-add_executable("benchmark" benchmark.cc)
-target_link_dune_default_libraries("benchmark")
-target_link_libraries("benchmark" dunevtk)
-
-add_executable("datacollector" datacollector.cc)
-target_link_dune_default_libraries("datacollector")
-target_link_libraries("datacollector" dunevtk)
-
-add_executable("structuredgridwriter" structuredgridwriter.cc)
-target_link_dune_default_libraries("structuredgridwriter")
-target_link_libraries("structuredgridwriter" dunevtk)
-
 add_executable("legacyvtkwriter" legacyvtkwriter.cc)
 target_link_dune_default_libraries("legacyvtkwriter")
 target_link_libraries("legacyvtkwriter" dunevtk)
 
-add_executable("geometrygrid" geometrygrid.cc)
-target_link_dune_default_libraries("geometrygrid")
-target_link_libraries("geometrygrid" dunevtk)
+if (dune-functions_FOUND)
+  add_executable("vtkwriter" vtkwriter.cc)
+  target_link_dune_default_libraries("vtkwriter")
+  target_link_libraries("vtkwriter" dunevtk)
+
+  add_executable("benchmark" benchmark.cc)
+  target_link_dune_default_libraries("benchmark")
+  target_link_libraries("benchmark" dunevtk)
+
+  add_executable("datacollector" datacollector.cc)
+  target_link_dune_default_libraries("datacollector")
+  target_link_libraries("datacollector" dunevtk)
+
+  add_executable("structuredgridwriter" structuredgridwriter.cc)
+  target_link_dune_default_libraries("structuredgridwriter")
+  target_link_libraries("structuredgridwriter" dunevtk)
+
+  add_executable("geometrygrid" geometrygrid.cc)
+  target_link_dune_default_libraries("geometrygrid")
+  target_link_libraries("geometrygrid" dunevtk)
+endif ()
 
 if (dune-polygongrid_FOUND)
   add_executable("polygongrid" polygongrid.cc)

src/legacyvtkwriter.cc

@@ -12,11 +12,6 @@
 #include <dune/common/exceptions.hh> // We use exceptions
 #include <dune/common/filledarray.hh>
 
-#include <dune/functions/functionspacebases/defaultglobalbasis.hh>
-#include <dune/functions/functionspacebases/lagrangebasis.hh>
-#include <dune/functions/functionspacebases/interpolate.hh>
-#include <dune/functions/gridfunctions/analyticgridviewfunction.hh>
-#include <dune/functions/gridfunctions/discreteglobalbasisfunction.hh>
 #include <dune/grid/uggrid.hh>
 #include <dune/grid/yaspgrid.hh>
 
@@ -24,7 +19,6 @@
 #include <dune/vtk/legacyvtkfunction.hh>
 
 using namespace Dune;
-using namespace Dune::Functions;
 
 int main(int argc, char** argv)
 {
@@ -39,14 +33,7 @@ int main(int argc, char** argv)
   using GridView = typename GridType::LeafGridView;
   GridView gridView = grid.leafGridView();
 
-  using namespace BasisFactory;
-  auto basis = makeBasis(gridView, lagrange<1>());
-
-  std::vector<double> p1function(basis.dimension());
-  interpolate(basis, p1function, [](auto const& x) {
-    return 100*x[0] + 10*x[1] + 1*x[2];
-  });
-
+  std::vector<double> p1function(gridView.size(dim), 1.0);
   using P1Function = P1VTKFunction<GridView,std::vector<double>>;
   std::shared_ptr<VTKFunction<GridView> const> p1FctWrapped(new P1Function(gridView, p1function, "p1"));
 

src/test/CMakeLists.txt

 dune_add_test(SOURCES reader_writer_test.cc
-              LINK_LIBRARIES dunevtk)
+              LINK_LIBRARIES dunevtk
+              CMAKE_GUARD)
 
 dune_add_test(SOURCES mixed_element_test.cc
               LINK_LIBRARIES dunevtk