[Cleanup] Restructure with subdirectories

src/CMakeLists.txt

 set(SOURCE_FILES
-  adaptivetimestepper.cc
   assemblers.cc
-  coupledtimestepper.cc
   enumparser.cc
-  fixedpointiterator.cc
   hdf5/frictionalboundary-writer.cc
   hdf5/iteration-writer.cc
   hdf5/patchinfo-writer.cc
   hdf5/restart-io.cc
   hdf5/surface-writer.cc
   hdf5/time-writer.cc
-  rate.cc
-  rate/rateupdater.cc
-  sand-wedge.cc
   sand-wedge-data/mygeometry.cc
   sand-wedge-data/mygrid.cc
-  solverfactory.cc
-  state.cc
+  sand-wedge.cc
+  spatial-solving/fixedpointiterator.cc
+  spatial-solving/solverfactory.cc
+  time-stepping/adaptivetimestepper.cc
+  time-stepping/coupledtimestepper.cc
+  time-stepping/rate.cc
+  time-stepping/rate/rateupdater.cc
+  time-stepping/state.cc
   vtk.cc
 )
 

src/hdf5/iteration-writer.hh

@@ -3,7 +3,7 @@
 
 #include <dune/fufem/hdf5/hdf5-sequence-io.hh>
 
-#include "../adaptivetimestepper.hh"
+#include "../time-stepping/adaptivetimestepper.hh"
 
 class IterationWriter {
 public:

src/program_state.hh

@@ -11,7 +11,7 @@
 
 #include "assemblers.hh"
 #include "matrices.hh"
-#include "solverfactory.hh"
+#include "spatial-solving/solverfactory.hh"
 
 template <class VectorTEMPLATE, class ScalarVectorTEMPLATE> class ProgramState {
 public:

src/sand-wedge.cc

@@ -50,7 +50,6 @@
 #include <dune/tectonic/globalfriction.hh>
 #include <dune/fufem/hdf5/hdf5file.hh>
 
-#include "adaptivetimestepper.hh"
 #include "assemblers.hh"
 #include "diameter.hh"
 #include "enumparser.hh"
@@ -60,15 +59,16 @@
 #include "hdf5/restart-io.hh"
 #include "matrices.hh"
 #include "program_state.hh"
-#include "rate.hh"
 #include "sand-wedge-data/mybody.hh"
 #include "sand-wedge-data/mygeometry.hh"
 #include "sand-wedge-data/myglobalfrictiondata.hh"
 #include "sand-wedge-data/mygrid.hh"
 #include "sand-wedge-data/weakpatch.hh"
-#include "solverfactory.hh"
-#include "state.hh"
-#include "updaters.hh"
+#include "spatial-solving/solverfactory.hh"
+#include "time-stepping/adaptivetimestepper.hh"
+#include "time-stepping/rate.hh"
+#include "time-stepping/state.hh"
+#include "time-stepping/updaters.hh"
 #include "vtk.hh"
 
 size_t const dims = MY_DIM;

src/fixedpointiterator.cc → src/spatial-solving/fixedpointiterator.cc

@@ -8,8 +8,8 @@
 #include <dune/solvers/norms/energynorm.hh>
 #include <dune/solvers/solvers/loopsolver.hh>
 
-#include "enums.hh"
-#include "enumparser.hh"
+#include "../enums.hh"
+#include "../enumparser.hh"
 
 #include "fixedpointiterator.hh"
 

src/fixedpointiterator.hh → src/spatial-solving/fixedpointiterator.hh

-#ifndef SRC_FIXEDPOINTITERATOR_HH
-#define SRC_FIXEDPOINTITERATOR_HH
+#ifndef SRC_SPATIAL_SOLVING_FIXEDPOINTITERATOR_HH
+#define SRC_SPATIAL_SOLVING_FIXEDPOINTITERATOR_HH
 
 #include <memory>
 

src/fixedpointiterator_tmpl.cc → src/spatial-solving/fixedpointiterator_tmpl.cc

@@ -2,6 +2,9 @@
 #error MY_DIM unset
 #endif
 
+#include "../explicitgrid.hh"
+#include "../explicitvectors.hh"
+
 #include <dune/common/function.hh>
 
 #include <dune/solvers/norms/energynorm.hh>
@@ -10,13 +13,10 @@
 #include <dune/tectonic/globalfriction.hh>
 #include <dune/tectonic/myblockproblem.hh>
 
-#include "explicitgrid.hh"
-#include "explicitvectors.hh"
-
-#include "rate/rateupdater.hh"
+#include "../time-stepping/rate/rateupdater.hh"
+#include "../time-stepping/state/stateupdater.hh"
+#include "../time-stepping/updaters.hh"
 #include "solverfactory.hh"
-#include "state/stateupdater.hh"
-#include "updaters.hh"
 
 using Function = Dune::VirtualFunction<double, double>;
 using Factory = SolverFactory<

src/solverfactory.hh → src/spatial-solving/solverfactory.hh

-#ifndef SRC_SOLVERFACTORY_HH
-#define SRC_SOLVERFACTORY_HH
+#ifndef SRC_SPATIAL_SOLVING_SOLVERFACTORY_HH
+#define SRC_SPATIAL_SOLVING_SOLVERFACTORY_HH
 
 #include <dune/common/bitsetvector.hh>
 #include <dune/common/parametertree.hh>

src/solverfactory_tmpl.cc → src/spatial-solving/solverfactory_tmpl.cc

@@ -2,8 +2,8 @@
 #error MY_DIM unset
 #endif
 
-#include "explicitgrid.hh"
-#include "explicitvectors.hh"
+#include "../explicitgrid.hh"
+#include "../explicitvectors.hh"
 
 #include <dune/tnnmg/nonlinearities/zerononlinearity.hh>
 #include <dune/tnnmg/problem-classes/blocknonlineartnnmgproblem.hh>

src/adaptivetimestepper.hh → src/time-stepping/adaptivetimestepper.hh

-#ifndef SRC_ADAPTIVETIMESTEPPER_HH
-#define SRC_ADAPTIVETIMESTEPPER_HH
+#ifndef SRC_TIME_STEPPING_ADAPTIVETIMESTEPPER_HH
+#define SRC_TIME_STEPPING_ADAPTIVETIMESTEPPER_HH
 
 #include <fstream>
 

src/adaptivetimestepper_tmpl.cc → src/time-stepping/adaptivetimestepper_tmpl.cc

@@ -2,6 +2,9 @@
 #error MY_DIM unset
 #endif
 
+#include "../explicitgrid.hh"
+#include "../explicitvectors.hh"
+
 #include <dune/common/function.hh>
 
 #include <dune/solvers/norms/energynorm.hh>
@@ -10,11 +13,8 @@
 #include <dune/tectonic/globalfriction.hh>
 #include <dune/tectonic/myblockproblem.hh>
 
-#include "explicitgrid.hh"
-#include "explicitvectors.hh"
-
+#include "../spatial-solving/solverfactory.hh"
 #include "rate/rateupdater.hh"
-#include "solverfactory.hh"
 #include "state/stateupdater.hh"
 #include "updaters.hh"
 

src/coupledtimestepper.hh → src/time-stepping/coupledtimestepper.hh

-#ifndef SRC_COUPLEDTIMESTEPPER_HH
-#define SRC_COUPLEDTIMESTEPPER_HH
+#ifndef SRC_TIME_STEPPING_COUPLEDTIMESTEPPER_HH
+#define SRC_TIME_STEPPING_COUPLEDTIMESTEPPER_HH
 
 #include <functional>
 #include <memory>
 
 #include <dune/common/parametertree.hh>
-#include "fixedpointiterator.hh"
+
+#include "../spatial-solving/fixedpointiterator.hh"
 
 template <class Factory, class Updaters, class ErrorNorm>
 class CoupledTimeStepper {

src/coupledtimestepper_tmpl.cc → src/time-stepping/coupledtimestepper_tmpl.cc

@@ -2,6 +2,9 @@
 #error MY_DIM unset
 #endif
 
+#include "../explicitgrid.hh"
+#include "../explicitvectors.hh"
+
 #include <dune/common/function.hh>
 
 #include <dune/solvers/norms/energynorm.hh>
@@ -10,11 +13,8 @@
 #include <dune/tectonic/globalfriction.hh>
 #include <dune/tectonic/myblockproblem.hh>
 
-#include "explicitgrid.hh"
-#include "explicitvectors.hh"
-
+#include "../spatial-solving/solverfactory.hh"
 #include "rate/rateupdater.hh"
-#include "solverfactory.hh"
 #include "state/stateupdater.hh"
 #include "updaters.hh"
 

src/rate.hh → src/time-stepping/rate.hh

-#ifndef SRC_RATE_HH
-#define SRC_RATE_HH
+#ifndef SRC_TIME_STEPPING_RATE_HH
+#define SRC_TIME_STEPPING_RATE_HH
 
 #include <memory>
 
-#include "enums.hh"
+#include "../enums.hh"
 #include "rate/rateupdater.hh"
 
 template <class Vector, class Matrix, class Function, int dimension>

src/rate/backward_euler.hh → src/time-stepping/rate/backward_euler.hh

-#ifndef SRC_RATE_BACKWARD_EULER_HH
-#define SRC_RATE_BACKWARD_EULER_HH
+#ifndef SRC_TIME_STEPPING_RATE_BACKWARD_EULER_HH
+#define SRC_TIME_STEPPING_RATE_BACKWARD_EULER_HH
 
 template <class Vector, class Matrix, class Function, size_t dim>
 class BackwardEuler : public RateUpdater<Vector, Matrix, Function, dim> {