Commit 3382099b authored by niklas.baumgarten's avatar niklas.baumgarten
Browse files

restructuring

parent 7145ec78
Pipeline #117849 failed with stages
in 4 minutes and 29 seconds
...@@ -59,7 +59,7 @@ set(MLMC_TEST_LIBRARIES MLMC sprng fftw3 m ${MPP_TEST_LIBRARIES}) ...@@ -59,7 +59,7 @@ set(MLMC_TEST_LIBRARIES MLMC sprng fftw3 m ${MPP_TEST_LIBRARIES})
add_executable(MLMC-M++ mlmc/src/Main.cpp) add_executable(MLMC-M++ mlmc/src/Main.cpp)
# Linking # Linking
target_link_libraries(MLMC-M++ ${MLMC_LIBRARIES}) target_link_libraries(MLMC-M++ ${MLMC_LIBRARIES} PDESOLVER)
# Tests # Tests
if (BUILD_MLMC_TESTS) if (BUILD_MLMC_TESTS)
......
include(assemble/CMakeLists.txt) include_directories(pdesolver)
add_subdirectory(pdesolver)
include(main/CMakeLists.txt) include(main/CMakeLists.txt)
include(montecarlo/CMakeLists.txt) include(montecarlo/CMakeLists.txt)
include(problem/CMakeLists.txt) include(problem/CMakeLists.txt)
...@@ -6,3 +9,4 @@ include(generators/CMakeLists.txt) ...@@ -6,3 +9,4 @@ include(generators/CMakeLists.txt)
add_library(MLMC STATIC ${assemble} ${main} add_library(MLMC STATIC ${assemble} ${main}
${montecarlo} ${problem} ${generators}) ${montecarlo} ${problem} ${generators})
target_link_libraries(MLMC PDESOLVER)
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
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include "problem/StochasticHybridFlux.hpp" #include "problem/StochasticHybridFlux.hpp"
#include <memory> #include <memory>
#include "montecarlo/PDESolver.hpp" #include "pdesolver/PDESolver.hpp"
class HybridFluxGenerator : public SampleGenerator { class HybridFluxGenerator : public SampleGenerator {
......
set(montecarlo set(montecarlo
montecarlo/MonteCarlo.cpp montecarlo/MonteCarlo.cpp
montecarlo/MultilevelMonteCarlo.cpp montecarlo/MultilevelMonteCarlo.cpp
montecarlo/PDESolver.cpp
montecarlo/EmpiricMeasures.cpp montecarlo/EmpiricMeasures.cpp
montecarlo/EmpiricMeasureLevelMaps.cpp montecarlo/EmpiricMeasureLevelMaps.cpp
montecarlo/Exponents.cpp montecarlo/Exponents.cpp
......
#ifndef MLMC_MC_HPP #ifndef MLMC_MC_HPP
#define MLMC_MC_HPP #define MLMC_MC_HPP
//#include "main/MultilevelPlotter.hpp"
#include "EmpiricMeasures.hpp" #include "EmpiricMeasures.hpp"
#include "PDESolver.hpp" #include "pdesolver/PDESolver.hpp"
#include "Sample.hpp"
class MonteCarlo { class MonteCarlo {
protected: protected:
int plotting = 0;
int verbose = 1; int verbose = 1;
int plotting = 0;
void method(); void method();
void computeSampleSolution(int m, SampleID &id, SampleSolution &solution); void computeSampleSolution(int m, SampleID &id, SampleSolution &solution);
......
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
#ifndef ISTOCHASTICACOUSTICWAVEASSEMBLE_HPP
#define ISTOCHASTICACOUSTICWAVEASSEMBLE_HPP
// Todo
#endif //ISTOCHASTICACOUSTICWAVEASSEMBLE_HPP
#ifndef PDESOLVER_HPP #ifndef PDESOLVER_HPP
#define PDESOLVER_HPP #define PDESOLVER_HPP
#include "Sample.hpp" #include "montecarlo/Sample.hpp"
// General solving approaches // General solving approaches
#include "dof/BasicDoFs.hpp" #include "dof/BasicDoFs.hpp"
...@@ -10,20 +10,20 @@ ...@@ -10,20 +10,20 @@
#include "timestepping/TimeIntegrator.hpp" #include "timestepping/TimeIntegrator.hpp"
// Assemble headers // Assemble headers
#include "assemble/IStochasticEllipticAssemble.hpp" #include "IStochasticEllipticAssemble.hpp"
#include "assemble/IStochasticTransportAssemble.hpp" #include "IStochasticTransportAssemble.hpp"
#include "assemble/LagrangeEllipticAssemble.hpp" #include "assembling/LagrangeEllipticAssemble.hpp"
#include "assemble/MixedEllipticAssemble.hpp" #include "assembling/MixedEllipticAssemble.hpp"
#include "assemble/HybridEllipticAssemble.hpp" #include "assembling/HybridEllipticAssemble.hpp"
#include "assemble/DGEllipticAssemble.hpp" #include "assembling/DGEllipticAssemble.hpp"
#include "assemble/DGTransportAssemble.hpp" #include "assembling/DGTransportAssemble.hpp"
#include "assemble/DGReactionAssemble.hpp" #include "assembling/DGReactionAssemble.hpp"
#include "assemble/PGReactionAssemble.hpp" #include "assembling/PGReactionAssemble.hpp"
#include "PlotMap.hpp" #include "montecarlo/PlotMap.hpp"
#include <typeinfo> #include <typeinfo>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "discretization/DGDiscretization.hpp" #include "discretization/DGDiscretization.hpp"
#include "elements/Elements.hpp" #include "elements/Elements.hpp"
#include "IStochasticEllipticAssemble.hpp" #include "pdesolver/IStochasticEllipticAssemble.hpp"
class DGEllipticAssemble : public IStochasticEllipticAssemble { class DGEllipticAssemble : public IStochasticEllipticAssemble {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define _DG_REACTION_H_ #define _DG_REACTION_H_
#include "problem/StochasticReactionProblem.hpp" #include "problem/StochasticReactionProblem.hpp"
#include "IStochasticReactionAssemble.hpp" #include "pdesolver/IStochasticReactionAssemble.hpp"
#include "utility/ctools.hpp" #include "utility/ctools.hpp"
#include "Plot.hpp" #include "Plot.hpp"
#include <iomanip> #include <iomanip>
......
#ifndef TUTORIAL_DGTRANSPORT_HPP #ifndef TUTORIAL_DGTRANSPORT_HPP
#define TUTORIAL_DGTRANSPORT_HPP #define TUTORIAL_DGTRANSPORT_HPP
#include "assemble/IStochasticTransportAssemble.hpp" #include "pdesolver/IStochasticTransportAssemble.hpp"
#include "problem/StochasticTransportProblem.hpp" #include "problem/StochasticTransportProblem.hpp"
#include "discretization/DGDiscretization.hpp" #include "discretization/DGDiscretization.hpp"
#include "TimeSeries.hpp" #include "TimeSeries.hpp"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment