[Cleanup] Move init functions to headers

src/one-body-sample.cc

@@ -84,52 +84,11 @@
 #include "enum_scheme.cc"
 #include "enum_verbosity.cc"
 
+#include "state.hh"
 #include "timestepping.hh"
 
-#include "state/stateupdater.hh"
-#include "state/ruinastateupdater.hh"
-#include "state/dieterichstateupdater.hh"
-
 size_t const dims = DIM;
 
-template <class Vector, class Matrix, class Function, int dimension>
-std::shared_ptr<TimeSteppingScheme<Vector, Matrix, Function, dimension>>
-initTimeStepper(Config::scheme scheme,
-                Function const &velocityDirichletFunction,
-                Dune::BitSetVector<dimension> const &velocityDirichletNodes,
-                Matrix const &massMatrix, Matrix const &stiffnessMatrix,
-                Matrix const &dampingMatrix, Vector const &u_initial,
-                Vector const &v_initial, Vector const &a_initial) {
-  switch (scheme) {
-    case Config::Newmark:
-      return std::make_shared<Newmark<Vector, Matrix, Function, dims>>(
-          stiffnessMatrix, massMatrix, dampingMatrix, u_initial, v_initial,
-          a_initial, velocityDirichletNodes, velocityDirichletFunction);
-    case Config::BackwardEuler:
-      return std::make_shared<BackwardEuler<Vector, Matrix, Function, dims>>(
-          stiffnessMatrix, massMatrix, dampingMatrix, u_initial, v_initial,
-          velocityDirichletNodes, velocityDirichletFunction);
-    default:
-      assert(false);
-  }
-}
-
-template <class ScalarVector, class Vector>
-std::shared_ptr<StateUpdater<ScalarVector, Vector>> initStateUpdater(
-    Config::stateModel model, ScalarVector const &alpha_initial,
-    Dune::BitSetVector<1> const &frictionalNodes, FrictionData const &fd) {
-  switch (model) {
-    case Config::Dieterich:
-      return std::make_shared<DieterichStateUpdater<ScalarVector, Vector>>(
-          alpha_initial, frictionalNodes, fd.L);
-    case Config::Ruina:
-      return std::make_shared<RuinaStateUpdater<ScalarVector, Vector>>(
-          alpha_initial, frictionalNodes, fd.L);
-    default:
-      assert(false);
-  }
-}
-
 void initPython() {
   Python::start();
 

src/state.hh

+#ifndef DUNE_TECTONIC_STATE_HH
+#define DUNE_TECTONIC_STATE_HH
+
+#include <dune/common/bitsetvector.hh>
+
+#include "enums.hh"
+#include "state/stateupdater.hh"
+#include "state/ruinastateupdater.hh"
+#include "state/dieterichstateupdater.hh"
+
+template <class ScalarVector, class Vector>
+std::shared_ptr<StateUpdater<ScalarVector, Vector>> initStateUpdater(
+    Config::stateModel model, ScalarVector const &alpha_initial,
+    Dune::BitSetVector<1> const &frictionalNodes, FrictionData const &fd) {
+  switch (model) {
+    case Config::Dieterich:
+      return std::make_shared<DieterichStateUpdater<ScalarVector, Vector>>(
+          alpha_initial, frictionalNodes, fd.L);
+    case Config::Ruina:
+      return std::make_shared<RuinaStateUpdater<ScalarVector, Vector>>(
+          alpha_initial, frictionalNodes, fd.L);
+    default:
+      assert(false);
+  }
+}
+#endif

src/timestepping.hh

 #ifndef DUNE_TECTONIC_TIMESTEPPING_HH
 #define DUNE_TECTONIC_TIMESTEPPING_HH
 
+#include "enums.hh"
 #include <dune/common/bitsetvector.hh>
 
 template <class Vector, class Matrix, class Function, size_t dim>
@@ -18,4 +19,27 @@ class TimeSteppingScheme {
 #include "timestepping/newmark.hh"
 #include "timestepping/backward_euler.hh"
 
+template <class Vector, class Matrix, class Function, int dimension>
+std::shared_ptr<TimeSteppingScheme<Vector, Matrix, Function, dimension>>
+initTimeStepper(Config::scheme scheme,
+                Function const &velocityDirichletFunction,
+                Dune::BitSetVector<dimension> const &velocityDirichletNodes,
+                Matrix const &massMatrix, Matrix const &stiffnessMatrix,
+                Matrix const &dampingMatrix, Vector const &u_initial,
+                Vector const &v_initial, Vector const &a_initial) {
+  switch (scheme) {
+    case Config::Newmark:
+      return std::make_shared<Newmark<Vector, Matrix, Function, dimension>>(
+          stiffnessMatrix, massMatrix, dampingMatrix, u_initial, v_initial,
+          a_initial, velocityDirichletNodes, velocityDirichletFunction);
+    case Config::BackwardEuler:
+      return std::make_shared<
+          BackwardEuler<Vector, Matrix, Function, dimension>>(
+          stiffnessMatrix, massMatrix, dampingMatrix, u_initial, v_initial,
+          velocityDirichletNodes, velocityDirichletFunction);
+    default:
+      assert(false);
+  }
+}
+
 #endif