[Cleanup] Move common explicit templates to header

src/assemblers_tmpl.cc

@@ -2,24 +2,11 @@
 #error DIM unset
 #endif
 
-#include <dune/common/fmatrix.hh>
-#include <dune/common/fvector.hh>
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wignored-qualifiers"
-#include <dune/grid/alugrid.hh>
-#pragma clang diagnostic pop
-#include <dune/istl/bvector.hh>
-#include <dune/istl/bcrsmatrix.hh>
-
 #include <dune/fufem/functionspacebases/p1nodalbasis.hh>
 
-using SmallVector = Dune::FieldVector<double, DIM>;
-using SmallMatrix = Dune::FieldMatrix<double, DIM, DIM>;
-using Matrix = Dune::BCRSMatrix<SmallMatrix>;
-using Vector = Dune::BlockVector<SmallVector>;
+#include "explicitgrid.hh"
+#include "explicitvectors.hh"
 
-using Grid = Dune::ALUGrid<DIM, DIM, Dune::simplex, Dune::nonconforming>;
-using GridView = Grid::LeafGridView;
 using P1Basis = P1NodalBasis<GridView, double>;
 using MyAssembler = Assembler<P1Basis, P1Basis>;
 

src/explicitgrid.hh

+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wignored-qualifiers"
+#include <dune/grid/alugrid.hh>
+#pragma clang diagnostic pop
+
+using Grid = Dune::ALUGrid<DIM, DIM, Dune::simplex, Dune::nonconforming>;
+using GridView = Grid::LeafGridView;

src/explicitvectors.hh

+#include <dune/common/fmatrix.hh>
+#include <dune/common/fvector.hh>
+#include <dune/istl/bcrsmatrix.hh>
+#include <dune/istl/bvector.hh>
+
+using SmallVector = Dune::FieldVector<double, DIM>;
+using SmallMatrix = Dune::FieldMatrix<double, DIM, DIM>;
+using Vector = Dune::BlockVector<SmallVector>;
+using Matrix = Dune::BCRSMatrix<SmallMatrix>;
+using ScalarVector = Dune::BlockVector<Dune::FieldVector<double, 1>>;

src/friction_writer_tmpl.cc

+#ifndef DIM
+#error DIM unset
+#endif
+
 #include <dune/common/bitsetvector.hh>
-#include <dune/istl/bvector.hh>
+
+#include "explicitvectors.hh"
 
 using BitVector = Dune::BitSetVector<1>;
-using ScalarVector = Dune::BlockVector<Dune::FieldVector<double, 1>>;
-using Vector2 = Dune::BlockVector<Dune::FieldVector<double, 2>>;
-using Vector3 = Dune::BlockVector<Dune::FieldVector<double, 3>>;
 
 template class FrictionWriter<BitVector>;
 
 template void FrictionWriter<BitVector>::writeInfo(ScalarVector const &alpha,
-                                                   Vector2 const &u,
-                                                   Vector2 const &v);
-template void FrictionWriter<BitVector>::writeInfo(ScalarVector const &alpha,
-                                                   Vector3 const &u,
-                                                   Vector3 const &v);
+                                                   Vector const &u,
+                                                   Vector const &v);

src/solverfactory_tmpl.cc

@@ -2,30 +2,15 @@
 #error DIM unset
 #endif
 
-#include <dune/common/fmatrix.hh>
-#include <dune/common/fvector.hh>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wignored-qualifiers"
-#include <dune/grid/alugrid.hh>
-#pragma clang diagnostic pop
-
-#include <dune/istl/bcrsmatrix.hh>
-#include <dune/istl/bvector.hh>
+#include "explicitgrid.hh"
+#include "explicitvectors.hh"
 
 #include <dune/tnnmg/nonlinearities/zerononlinearity.hh>
+#include <dune/tnnmg/problem-classes/blocknonlineartnnmgproblem.hh>
 #include <dune/tnnmg/problem-classes/convexproblem.hh>
 
 #include <dune/tectonic/globalnonlinearity.hh>
 #include <dune/tectonic/myblockproblem.hh>
-#include <dune/tnnmg/problem-classes/blocknonlineartnnmgproblem.hh>
-
-using SmallVector = Dune::FieldVector<double, DIM>;
-using SmallMatrix = Dune::FieldMatrix<double, DIM, DIM>;
-using Vector = Dune::BlockVector<SmallVector>;
-using Matrix = Dune::BCRSMatrix<SmallMatrix>;
-
-using Grid = Dune::ALUGrid<DIM, DIM, Dune::simplex, Dune::nonconforming>;
 
 template class SolverFactory<
     DIM, MyBlockProblem<

src/timestepping_tmpl.cc

@@ -2,16 +2,10 @@
 #error DIM unset
 #endif
 
-#include <dune/common/fmatrix.hh>
 #include <dune/common/function.hh>
-#include <dune/common/fvector.hh>
-#include <dune/istl/bcrsmatrix.hh>
-#include <dune/istl/bvector.hh>
 
-using SmallVector = Dune::FieldVector<double, DIM>;
-using SmallMatrix = Dune::FieldMatrix<double, DIM, DIM>;
-using Matrix = Dune::BCRSMatrix<SmallMatrix>;
-using Vector = Dune::BlockVector<SmallVector>;
+#include "explicitvectors.hh"
+
 using Function = Dune::VirtualFunction<double, double>;
 
 template class Newmark<Vector, Matrix, Function, DIM>;

src/vtk_tmpl.cc

@@ -2,27 +2,12 @@
 #error DIM unset
 #endif
 
-#include <dune/common/fmatrix.hh>
-#include <dune/common/fvector.hh>
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wignored-qualifiers"
-#include <dune/grid/alugrid.hh>
-#pragma clang diagnostic pop
-
-#include <dune/istl/bvector.hh>
+#include "explicitgrid.hh"
+#include "explicitvectors.hh"
 
 #include <dune/fufem/functionspacebases/p0basis.hh>
 #include <dune/fufem/functionspacebases/p1nodalbasis.hh>
 
-using ScalarVector = Dune::BlockVector<Dune::FieldVector<double, 1>>;
-
-using SmallVector = Dune::FieldVector<double, DIM>;
-using SmallMatrix = Dune::FieldMatrix<double, DIM, DIM>;
-using Vector = Dune::BlockVector<SmallVector>;
-
-using Grid = Dune::ALUGrid<DIM, DIM, Dune::simplex, Dune::nonconforming>;
-using GridView = Grid::LeafGridView;
 using P1Basis = P1NodalBasis<GridView, double>;
 using MyP0Basis = P0Basis<GridView, double>;