restructuring

CMakeLists.txt

@@ -59,7 +59,7 @@ set(MLMC_TEST_LIBRARIES MLMC sprng fftw3 m ${MPP_TEST_LIBRARIES})
 add_executable(MLMC-M++ mlmc/src/Main.cpp)
 
 # Linking
-target_link_libraries(MLMC-M++ ${MLMC_LIBRARIES})
+target_link_libraries(MLMC-M++ ${MLMC_LIBRARIES} PDESOLVER)
 
 # Tests
 if (BUILD_MLMC_TESTS)

mlmc/src/CMakeLists.txt

-include(assemble/CMakeLists.txt)
+include_directories(pdesolver)
+add_subdirectory(pdesolver)
+
+
 include(main/CMakeLists.txt)
 include(montecarlo/CMakeLists.txt)
 include(problem/CMakeLists.txt)
@@ -6,3 +9,4 @@ include(generators/CMakeLists.txt)
 
 add_library(MLMC STATIC ${assemble} ${main}
         ${montecarlo} ${problem} ${generators})
+target_link_libraries(MLMC PDESOLVER)

mlmc/src/assemble/CMakeLists.txt

-set(assemble
-        assemble/LagrangeEllipticAssemble.cpp
-        assemble/MixedEllipticAssemble.cpp
-        assemble/HybridEllipticAssemble.cpp
-        assemble/DGEllipticAssemble.cpp
-        assemble/DGTransportAssemble.cpp
-        assemble/PGReactionAssemble.cpp
-        assemble/DGReactionAssemble.cpp
-        )
\ No newline at end of file

mlmc/src/generators/HybridFluxGenerator.hpp

@@ -6,7 +6,7 @@
 #include "problem/StochasticHybridFlux.hpp"
 #include <memory>
 
-#include "montecarlo/PDESolver.hpp"
+#include "pdesolver/PDESolver.hpp"
 
 
 class HybridFluxGenerator : public SampleGenerator {

mlmc/src/montecarlo/CMakeLists.txt

 set(montecarlo
         montecarlo/MonteCarlo.cpp
         montecarlo/MultilevelMonteCarlo.cpp
-        montecarlo/PDESolver.cpp
         montecarlo/EmpiricMeasures.cpp
         montecarlo/EmpiricMeasureLevelMaps.cpp
         montecarlo/Exponents.cpp

mlmc/src/montecarlo/MonteCarlo.hpp

 #ifndef MLMC_MC_HPP
 #define MLMC_MC_HPP
 
-//#include "main/MultilevelPlotter.hpp"
 #include "EmpiricMeasures.hpp"
-#include "PDESolver.hpp"
-#include "Sample.hpp"
+#include "pdesolver/PDESolver.hpp"
 
 
 class MonteCarlo {
 protected:
-    int plotting = 0;
     int verbose = 1;
 
+    int plotting = 0;
+
     void method();
 
     void computeSampleSolution(int m, SampleID &id, SampleSolution &solution);

mlmc/src/pdesolver/CMakeLists.txt

+add_library(PDESOLVER STATIC
+        PDESolver.cpp
+        assembling/LagrangeEllipticAssemble.cpp
+        assembling/MixedEllipticAssemble.cpp
+        assembling/HybridEllipticAssemble.cpp
+        assembling/DGEllipticAssemble.cpp
+        assembling/DGTransportAssemble.cpp
+        assembling/PGReactionAssemble.cpp
+        assembling/DGReactionAssemble.cpp
+        )
+target_link_libraries(PDESOLVER ${MPP_LIBRARIES})
\ No newline at end of file

mlmc/src/pdesolver/IStochasticAcousticWaveAssemble.hpp

+#ifndef ISTOCHASTICACOUSTICWAVEASSEMBLE_HPP
+#define ISTOCHASTICACOUSTICWAVEASSEMBLE_HPP
+
+// Todo
+
+#endif //ISTOCHASTICACOUSTICWAVEASSEMBLE_HPP

mlmc/src/montecarlo/PDESolver.hpp → mlmc/src/pdesolver/PDESolver.hpp

 #ifndef PDESOLVER_HPP
 #define PDESOLVER_HPP
 
-#include "Sample.hpp"
+#include "montecarlo/Sample.hpp"
 
 // General solving approaches
 #include "dof/BasicDoFs.hpp"
@@ -10,20 +10,20 @@
 #include "timestepping/TimeIntegrator.hpp"
 
 // Assemble headers
-#include "assemble/IStochasticEllipticAssemble.hpp"
-#include "assemble/IStochasticTransportAssemble.hpp"
+#include "IStochasticEllipticAssemble.hpp"
+#include "IStochasticTransportAssemble.hpp"
 
-#include "assemble/LagrangeEllipticAssemble.hpp"
-#include "assemble/MixedEllipticAssemble.hpp"
-#include "assemble/HybridEllipticAssemble.hpp"
-#include "assemble/DGEllipticAssemble.hpp"
+#include "assembling/LagrangeEllipticAssemble.hpp"
+#include "assembling/MixedEllipticAssemble.hpp"
+#include "assembling/HybridEllipticAssemble.hpp"
+#include "assembling/DGEllipticAssemble.hpp"
 
-#include "assemble/DGTransportAssemble.hpp"
+#include "assembling/DGTransportAssemble.hpp"
 
-#include "assemble/DGReactionAssemble.hpp"
-#include "assemble/PGReactionAssemble.hpp"
+#include "assembling/DGReactionAssemble.hpp"
+#include "assembling/PGReactionAssemble.hpp"
 
-#include "PlotMap.hpp"
+#include "montecarlo/PlotMap.hpp"
 
 #include <typeinfo>
 

mlmc/src/assemble/DGEllipticAssemble.hpp → mlmc/src/pdesolver/assembling/DGEllipticAssemble.hpp

@@ -3,7 +3,7 @@
 
 #include "discretization/DGDiscretization.hpp"
 #include "elements/Elements.hpp"
-#include "IStochasticEllipticAssemble.hpp"
+#include "pdesolver/IStochasticEllipticAssemble.hpp"
 
 
 class DGEllipticAssemble : public IStochasticEllipticAssemble {

mlmc/src/assemble/DGReactionAssemble.hpp → mlmc/src/pdesolver/assembling/DGReactionAssemble.hpp

@@ -2,7 +2,7 @@
 #define _DG_REACTION_H_
 
 #include "problem/StochasticReactionProblem.hpp"
-#include "IStochasticReactionAssemble.hpp"
+#include "pdesolver/IStochasticReactionAssemble.hpp"
 #include "utility/ctools.hpp"
 #include "Plot.hpp"
 #include <iomanip>

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

 #ifndef TUTORIAL_DGTRANSPORT_HPP
 #define TUTORIAL_DGTRANSPORT_HPP
 
-#include "assemble/IStochasticTransportAssemble.hpp"
+#include "pdesolver/IStochasticTransportAssemble.hpp"
 #include "problem/StochasticTransportProblem.hpp"
 #include "discretization/DGDiscretization.hpp"
 #include "TimeSeries.hpp"