Commit 4fe5dc82 authored by niklas.baumgarten's avatar niklas.baumgarten
Browse files

Merge branch '31-clean-library-dependency' into 'feature'

Resolve "Clean Library Dependency"

Closes #31

See merge request !43
parents 6ad73e86 0160f3c0
Pipeline #157243 canceled with stages
in 52 seconds
......@@ -49,7 +49,7 @@ add_mpp_subdirectory(${PROJECT_SOURCE_DIR}/mluq/src/)
add_executable(MLUQ-M++ mluq/src/Main.cpp)
# Linking
target_link_libraries(MLUQ-M++ MONTECARLO)
target_link_libraries(MLUQ-M++ ESTIMATORS)
# Tests
if (BUILD_MLUQ_TESTS)
......
add_subdirectory(generators)
add_subdirectory(problems)
add_subdirectory(pdesolver)
add_subdirectory(pdesolvers)
add_subdirectory(estimators)
# --- Project Structure / Dependencies ---
#
# SPRNG TASMANIAN MPP
# | | |
# |-> GENERATORS <-| Up to LIB2 (<--|
# | | | For problems where the
# PROBLEMS | | random parameter is
# | | | solution of other pde
# PDESOLVERS <-| Complete MPP (---|
# |
# ESTIMATORS
#
add_library(MONTECARLO STATIC
add_library(ESTIMATORS STATIC
Estimator.cpp
MonteCarlo.cpp
MultilevelEstimator.cpp
......@@ -8,4 +8,4 @@ add_library(MONTECARLO STATIC
datastructure/WelfordAggregate.cpp
datastructure/LevelMaps.cpp
)
target_link_libraries(MONTECARLO PDESOLVER MPP_LIBRARIES)
target_link_libraries(ESTIMATORS PDESOLVERS)
......@@ -6,4 +6,4 @@ add_library(GENERATORS STATIC
SymmetricCovariance.cpp
HybridFluxGenerator.cpp
)
target_link_libraries(GENERATORS MPP_LIBRARIES PDESOLVER sprng Tasmanian_libsparsegrid)
target_link_libraries(GENERATORS MPP_LIBRARIES PDESOLVERS sprng Tasmanian_libsparsegrid)
#include "HybridFluxGenerator.hpp"
#include "pdesolver/PDESolverCreator.hpp"
#include "pdesolver/assembling/elliptic/HybridEllipticAssemble.hpp"
#include "PDESolverCreator.hpp"
#include "HybridEllipticAssemble.hpp"
void HybridFaceNormalFluxGenerator::createPDESolver() {
......
add_library(PDESOLVER STATIC
add_library(PDESOLVERS STATIC
PDESolverCreator.cpp
EllipticPDESolver.cpp
TransportPDESolver.cpp
......@@ -10,4 +10,4 @@ add_library(PDESOLVER STATIC
assembling/reaction/PGReactionAssemble.cpp
assembling/reaction/DGReactionAssemble.cpp
)
target_link_libraries(PDESOLVER PROBLEMS MPP_LIBRARIES)
\ No newline at end of file
target_link_libraries(PDESOLVERS PROBLEMS MPP_LIBRARIES)
\ No newline at end of file
Supports Markdown
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