Commit 93f77079 authored by niklas.baumgarten's avatar niklas.baumgarten
Browse files

new structure

parent c293f736
......@@ -3,9 +3,9 @@ project(MLMC)
#---------------------------------------------------------------------------------------#
# Google test (Placed here to not compile it with mpiCC)
add_subdirectory(googletest)
include_directories(${PROJECT_BINARY_DIR}/googletest/googletest/include)
include_directories(${PROJECT_BINARY_DIR}/googlemock/googletest/include)
add_subdirectory(mpp/googletest)
include_directories(${PROJECT_BINARY_DIR}/mpp/googletest/googletest/include)
include_directories(${PROJECT_BINARY_DIR}/mpp/googlemock/googletest/include)
set(GTEST_LIB gtest gtest_main)
#---------------------------------------------------------------------------------------#
......@@ -24,7 +24,9 @@ set(CMAKE_BUILD_TYPE distribution)
set(CMAKE_CXX_FLAGS_DISTRIBUTION "-O0")
#set(CMAKE_CXX_FLAGS_DISTRIBUTION "-O1")
#set(CMAKE_CXX_FLAGS_DISTRIBUTION "-O2")
#set(CMAKE_CXX_FLAGS_DISTRIBUTION "-O3")
set(CMAKE_CXX_FLAGS "-fPIC -g -Wno-deprecated -std=gnu++11")
#set(CMAKE_CXX_FLAGS "-fPIC -g -Wno-deprecated -Wall -std=gnu++11")
#---------------------------------------------------------------------------------------#
# Blas Lapack
......@@ -41,12 +43,6 @@ file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/data/vtk)
file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/log)
#---------------------------------------------------------------------------------------#
# Include directories
include_directories(${PROJECT_SOURCE_DIR}/mlmc/src)
include_directories(${PROJECT_SOURCE_DIR}/sprng5/include)
include_directories(${PROJECT_SOURCE_DIR}/mpp/src)
#---------------------------------------------------------------------------------------#
# Link libraries
link_directories(${PROJECT_SOURCE_DIR}/sprng5/lib)
link_directories(${PROJECT_SOURCE_DIR}/mpp/superlu/lib)
......@@ -59,6 +55,12 @@ elseif (WIN32)
endif ()
#---------------------------------------------------------------------------------------#
# Include directories
include_directories(${PROJECT_SOURCE_DIR}/sprng5/include)
include_directories(${PROJECT_SOURCE_DIR}/mlmc/src)
include_directories(${PROJECT_SOURCE_DIR}/mpp/src)
#---------------------------------------------------------------------------------------#
# Subdirectories
add_subdirectory(mpp)
add_subdirectory(mlmc/src)
......@@ -72,12 +74,11 @@ target_link_libraries(MLMC-M++ MLMC sprng SRC LIB_PS ${SUPERLU} blas lapack fftw
#---------------------------------------------------------------------------------------#
# Test Executables
#add_executable(TestCirculantEmbedding mlmc/tests/TestCirculantEmbedding.C)
#add_executable(TestRNManager mlmc/tests/TestRNManager.C)
add_executable(TestCirculantEmbedding mlmc/tests/TestCirculantEmbedding.C)
add_executable(TestRNManager mlmc/tests/TestRNManager.C)
# Linking
#target_link_libraries(TestCirculantEmbedding MultilevelMonteCarlo sprng SRC SRC_Solver
# blas lapack ${SUPERLU} fftw3 m ${GTEST_LIB})
#target_link_libraries(TestRNManager MultilevelMonteCarlo sprng fftw3 m ${GTEST_LIB})
#set(MPI_COMMAND mpirun -np 4 )
target_link_libraries(TestCirculantEmbedding MultilevelMonteCarlo sprng SRC SRC_Solver
blas lapack ${SUPERLU} fftw3 m ${GTEST_LIB})
target_link_libraries(TestRNManager MultilevelMonteCarlo sprng fftw3 m ${GTEST_LIB})
#---------------------------------------------------------------------------------------#
Subproject commit 2134e3fd857d952e03ce76064fad5ac6e9036104
......@@ -12,8 +12,6 @@ set(MLMC_SRC
stochfields/RNManager.C
stochfields/StochasticFields.C
stochfields/CirculantEmbedding.C
discgalerkin/DGDiscretization.C
discgalerkin/DGMatrixGraph.C
)
add_library(MLMC STATIC ${MLMC_SRC})
......@@ -20,7 +20,6 @@ Meshes *MLMCMain::getMeshes() {
if (problemName.find("2D") != string::npos)
return new Meshes("UnitSquare", plevel, Lmax);
Exit("\nMesh name not found\n")
return nullptr;
}
Discretization *MLMCMain::getDiscretization(string _modelName_) {
......@@ -38,7 +37,6 @@ Discretization *MLMCMain::getDiscretization(string _modelName_) {
if (_modelName_ == "QuadraticDGFEM")
return new DGDiscretization(new DGDoF(2));
Exit("\nDiscretization not implemented yet\n")
return nullptr;
}
StochasticFields *MLMCMain::getStochasticFields() {
......
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