restructured project

mlmc/src/generators/SampleGenerator.hpp

 #ifndef SAMPLEGENERATOR_HPP
 #define SAMPLEGENERATOR_HPP
 
-#include "utility/Config.hpp"
-#include "basics/Sample.hpp"
-#include "mesh/Meshes.hpp"
+#include "Config.hpp"
+#include "Sample.hpp"
 
+#include "Meshes.hpp"
 #include "RVector.hpp"
 #include "CVector.hpp"
 #include "RMatrix.hpp"

mlmc/src/generators/SampleGeneratorContainer.hpp

@@ -3,7 +3,7 @@
 
 #include "SampleGenerator.hpp"
 #include "algorithms/CirculantEmbedding.hpp"
-#include "algorithms/HybridFluxGenerator.hpp"
+#include "HybridFluxGenerator.hpp"
 #include "NormalDistribution.hpp"
 #include "UniformDistribution.hpp"
 

mlmc/src/generators/algorithms/HybridFluxGenerator.cpp

 #include "HybridFluxGenerator.hpp"
 #include "pdesolver/PDESolverCreator.hpp"
-
+#include "pdesolver/assembling/elliptic/HybridEllipticAssemble.hpp"
 
 void HybridFaceNormalFluxGenerator::createPDESolver() {
     string problemName;

mlmc/src/generators/algorithms/HybridFluxGenerator.hpp

 #ifndef HYBRIDFLUXGENERATOR_HPP
 #define HYBRIDFLUXGENERATOR_HPP
 
-#include "generators/SampleGenerator.hpp"
+#include "SampleGenerator.hpp"
 #include "CirculantEmbedding.hpp"
 
 

mlmc/src/pdesolver/CMakeLists.txt

@@ -2,12 +2,12 @@ add_library(PDESOLVER STATIC
         PDESolverCreator.cpp
         EllipticPDESolver.cpp
         TransportPDESolver.cpp
-        assembling/LagrangeEllipticAssemble.cpp
-        assembling/MixedEllipticAssemble.cpp
-        assembling/HybridEllipticAssemble.cpp
-        assembling/DGEllipticAssemble.cpp
-        assembling/DGTransportAssemble.cpp
-        assembling/PGReactionAssemble.cpp
-        assembling/DGReactionAssemble.cpp
+        assembling/elliptic/LagrangeEllipticAssemble.cpp
+        assembling/elliptic/MixedEllipticAssemble.cpp
+        assembling/elliptic/HybridEllipticAssemble.cpp
+        assembling/elliptic/DGEllipticAssemble.cpp
+        assembling/advection/DGTransportAssemble.cpp
+        assembling/reaction/PGReactionAssemble.cpp
+        assembling/reaction/DGReactionAssemble.cpp
         )
 target_link_libraries(PDESOLVER PROBLEMS MPP_LIBRARIES)
\ No newline at end of file

mlmc/src/pdesolver/EllipticPDESolver.hpp

 #ifndef ELLIPTICPDESOLVER_HPP
 #define ELLIPTICPDESOLVER_HPP
 
+
+#include "LagrangeEllipticAssemble.hpp"
+#include "MixedEllipticAssemble.hpp"
+#include "HybridEllipticAssemble.hpp"
+#include "DGEllipticAssemble.hpp"
+
 #include "PDESolver.hpp"
 
 

mlmc/src/pdesolver/PDESolver.hpp

@@ -2,14 +2,7 @@
 #define PDESOLVER_HPP
 
 // Assembling imports
-#include "assembling/LagrangeEllipticAssemble.hpp"
-#include "assembling/MixedEllipticAssemble.hpp"
-#include "assembling/HybridEllipticAssemble.hpp"
-#include "assembling/DGEllipticAssemble.hpp"
-#include "assembling/DGTransportAssemble.hpp"
-#include "assembling/DGReactionAssemble.hpp"
-#include "assembling/PGReactionAssemble.hpp"
-#include "IStochasticDummyAssemble.hpp"
+#include "assembling/IStochasticDummyAssemble.hpp"
 
 // Imports from basics
 #include "basics/Sample.hpp"

mlmc/src/pdesolver/ParabolicPDESolver.cpp

+//
+// Created by niklas on 11.05.21.
+//
+
+#include "ParabolicPDESolver.hpp"

mlmc/src/pdesolver/ParabolicPDESolver.hpp

+#ifndef PARABOLICPDESOLVER_HPP
+#define PARABOLICPDESOLVER_HPP
+
+#include "DGReactionAssemble.hpp"
+#include "PGReactionAssemble.hpp"
+
+class ParabolicPDESolver {
+};
+
+#endif //PARABOLICPDESOLVER_HPP

mlmc/src/pdesolver/TransportPDESolver.hpp

 #ifndef TRANSPORTPDESOLVER_HPP
 #define TRANSPORTPDESOLVER_HPP
 
+#include "DGTransportAssemble.hpp"
+
 #include "PDESolver.hpp"
 
 

mlmc/src/pdesolver/IStochasticDummyAssemble.hpp → mlmc/src/pdesolver/assembling/IStochasticDummyAssemble.hpp

@@ -3,7 +3,7 @@
 
 #include "Assemble.hpp"
 #include "Elements.hpp"
-#include "discretization/IDiscretization.hpp"
+#include "IDiscretization.hpp"
 #include "problems/IStochasticProblem.hpp"
 
 

mlmc/src/pdesolver/assembling/DGTransportAssemble.hpp → mlmc/src/pdesolver/assembling/advection/DGTransportAssemble.hpp

 #ifndef TUTORIAL_DGTRANSPORT_HPP
 #define TUTORIAL_DGTRANSPORT_HPP
 
-#include "pdesolver/IStochasticTransportAssemble.hpp"
-#include "problems/StochasticTransportProblem.hpp"
-#include "discretization/DGDiscretization.hpp"
+#include "IStochasticTransportAssemble.hpp"
+#include "StochasticTransportProblem.hpp"
+#include "DGDiscretization.hpp"
 #include "TimeSeries.hpp"
-#include "utility/ctools.hpp"
+#include "ctools.hpp"
 #include <iomanip>