cleanup whitspaces and naming of writer classes

dune/vtk/CMakeLists.txt

@@ -16,15 +16,15 @@ install(FILES
   function.hh
   localfunction.hh
   localfunctioninterface.hh
-  reader.hh
-  reader.impl.hh
-  timeserieswriter.hh
-  timeserieswriter.impl.hh
+  vtkreader.hh
+  vtkreader.impl.hh
+  vtktimeserieswriter.hh
+  vtktimeserieswriter.impl.hh
   types.hh
-  writer.hh
-  writerinterface.hh
-  writerinterface.impl.hh
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/vtkwriter)
+  vtkwriter.hh
+  vtkwriterinterface.hh
+  vtkwriterinterface.impl.hh
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/vtk)
 
 add_subdirectory(datacollectors)
 add_subdirectory(gridcreators)

dune/vtk/datacollectorinterface.hh

@@ -5,10 +5,8 @@
 
 namespace Dune
 {
-
   namespace Vtk
   {
-
     /// Base class for data collectors in a CRTP style.
     /**
     * \tparam GridViewType  Model of Dune::GridView

dune/vtk/datacollectorinterface.impl.hh

@@ -2,30 +2,26 @@
 
 #include <dune/geometry/referenceelements.hh>
 
-namespace Dune
-{
-
-  namespace Vtk
-  {
+namespace Dune {
+namespace Vtk {
 
-    template <class GV, class D, class P>
-      template <class T, class VtkFunction>
-    std::vector<T> DataCollectorInterface<GV,D,P>
-      ::cellDataImpl (VtkFunction const& fct) const
-    {
-      std::vector<T> data;
-      data.reserve(this->numCells() * fct.ncomps());
+template <class GV, class D, class P>
+  template <class T, class VtkFunction>
+std::vector<T> DataCollectorInterface<GV,D,P>
+  ::cellDataImpl (VtkFunction const& fct) const
+{
+  std::vector<T> data;
+  data.reserve(this->numCells() * fct.ncomps());
 
-      auto localFct = localFunction(fct);
-      for (auto const& e : elements(gridView_, partition)) {
-        localFct.bind(e);
-        auto refElem = referenceElement<T,dim>(e.type());
-        for (int comp = 0; comp < fct.ncomps(); ++comp)
-          data.emplace_back(localFct.evaluate(comp, refElem.position(0,0)));
-        localFct.unbind();
-      }
-      return data;
-    }
+  auto localFct = localFunction(fct);
+  for (auto const& e : elements(gridView_, partition)) {
+    localFct.bind(e);
+    auto refElem = referenceElement<T,dim>(e.type());
+    for (int comp = 0; comp < fct.ncomps(); ++comp)
+      data.emplace_back(localFct.evaluate(comp, refElem.position(0,0)));
+    localFct.unbind();
+  }
+  return data;
+}
 
-  } // end namespace Vtk
-} // end namespace Dune
+} } // end namespace Dune::Vtk

dune/vtk/datacollectors/CMakeLists.txt

@@ -7,6 +7,6 @@ install(FILES
   structureddatacollector.hh
   unstructureddatacollector.hh
   yaspdatacollector.hh
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/vtkwriter/datacollectors)
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/vtk/datacollectors)
 
 add_subdirectory(test)
\ No newline at end of file

dune/vtk/datacollectors/continuousdatacollector.hh

@@ -13,10 +13,8 @@
 
 namespace Dune
 {
-
   namespace Vtk
   {
-
     /// Implementation of \ref DataCollector for linear cells, with continuous data.
     template <class GridView, class Partition>
     class ContinuousDataCollector

dune/vtk/datacollectors/discontinuousdatacollector.hh

@@ -9,10 +9,8 @@
 
 namespace Dune
 {
-
   namespace Vtk
   {
-
     /// Implementation of \ref DataCollector for linear cells, with discontinuous data.
     template <class GridView, class Partition>
     class DiscontinuousDataCollector

dune/vtk/datacollectors/lagrangedatacollector.hh

@@ -15,10 +15,8 @@
 
 namespace Dune
 {
-
   namespace Vtk
   {
-
     /// Implementation of \ref DataCollector for lagrange cells
     template <class GridView, int ORDER = -1>
     class LagrangeDataCollector

dune/vtk/datacollectors/quadraticdatacollector.hh

@@ -12,10 +12,8 @@
 
 namespace Dune
 {
-
   namespace Vtk
   {
-
     /// Implementation of \ref DataCollector for quadratic cells, with continuous data.
     template <class GridView>
     class QuadraticDataCollector

dune/vtk/datacollectors/spdatacollector.hh

@@ -16,10 +16,8 @@
 
 namespace Dune
 {
-
   namespace Vtk
   {
-
     #if HAVE_DUNE_SPGRID
 
     // Specialization for SPGrid

dune/vtk/datacollectors/structureddatacollector.hh

@@ -12,10 +12,8 @@
 
 namespace Dune
 {
-
   namespace Vtk
   {
-
     /// The Interface for structured data-collectors
     template <class GridView, class Derived>
     class StructuredDataCollectorInterface

dune/vtk/datacollectors/unstructureddatacollector.hh

@@ -8,10 +8,8 @@
 
 namespace Dune
 {
-
   namespace Vtk
   {
-
     struct Cells
     {
       std::vector<std::uint8_t> types;

dune/vtk/datacollectors/yaspdatacollector.hh

@@ -17,10 +17,8 @@
 
 namespace Dune
 {
-
   namespace Vtk
   {
-
     // Specialization for YaspGrid
     template <class GridView>
     class YaspDataCollector

dune/vtk/defaultvtkfunction.hh

@@ -9,10 +9,8 @@
 
 namespace Dune
 {
-
   namespace Vtk
   {
-
     /// Type erasure for dune-functions LocalFunction interface
     template <class GridView, class LocalFunction>
     class LocalFunctionWrapper final

dune/vtk/filereader.hh

@@ -10,10 +10,8 @@
 
 namespace Dune
 {
-
   namespace Vtk
   {
-
     template <class Grid, class FilerReaderImp>
     class FileReader
     {

dune/vtk/filewriter.hh

@@ -7,10 +7,8 @@
 
 namespace Dune
 {
-
   namespace Vtk
   {
-
     class FileWriter
     {
     public:

dune/vtk/forward.hh

@@ -6,7 +6,6 @@ namespace Dune
 {
   namespace Vtk
   {
-
     // forward declaration of all classes in dune-vtk
 
     template <class GridView, class Derived, class Partition = Partitions::InteriorBorder>

dune/vtk/function.hh

@@ -10,7 +10,7 @@
 
 namespace Dune
 {
-
+  // forward declarations
   template <class T, int N>
   class FieldVector;
 
@@ -19,7 +19,6 @@ namespace Dune
 
   namespace Vtk
   {
-
     /// Wrapper class for functions allowing local evaluations.
     template <class GridView>
     class Function

dune/vtk/gridcreatorinterface.hh

@@ -12,10 +12,8 @@
 
 namespace Dune
 {
-
   namespace Vtk
   {
-
     /// Base class for grid creators in a CRTP style.
     /**
     * Construct a grid from data read from VTK files.

dune/vtk/gridcreators/CMakeLists.txt

@@ -7,4 +7,4 @@ install(FILES
   lagrangegridcreator.hh
   parallelgridcreator.hh
   serialgridcreator.hh
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/vtkwriter/gridcreators)
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/vtk/gridcreators)

dune/vtk/gridcreators/continuousgridcreator.hh

@@ -14,10 +14,8 @@
 
 namespace Dune
 {
-
   namespace Vtk
   {
-
     // Create a grid where the input points and connectivity is already
     // connected correctly.
     template <class Grid>