Commit a47218dd authored by niklas.baumgarten's avatar niklas.baumgarten
Browse files

new config and minor fixes

parent 74586d7f
......@@ -9,7 +9,7 @@ project(MLMC)
option(NO_DEPRECATED "Suppress deprecated warnings" OFF)
option(BUILD_TESTS "Build test executables" ON)
option(BUILD_TESTS "Build test executables" OFF)
option(USE_CXSC "Use interval arithmetic library cxsc" OFF)
option(PROBLEM_NO_TIME "Time independent problem" OFF)
......@@ -34,6 +34,7 @@ include_directories(${PROJECT_SOURCE_DIR}/mlmc/src)
# Subdirectories
add_subdirectory(mlmc/src)
add_subdirectory(mlmc/tests)
#---------------------------------------------------------------------------------------#
# Executables
......@@ -42,14 +43,4 @@ add_executable(MLMC-M++ mlmc/src/Main.C)
# Linking
target_link_libraries(MLMC-M++ MLMC sprng SRC LIB_PS ${SUPERLU}
${BLAS_LIBRARIES} ${LAPACK_LIBRARIES} fftw3 m)
#---------------------------------------------------------------------------------------#
# Test Executables
#add_executable(TestCirculantEmbedding mlmc/tests/TestCirculantEmbedding.C)
#add_executable(TestRNManager mlmc/tests/TestRNManager.C)
# Linking
#target_link_libraries(TestCirculantEmbedding MLMC sprng SRC LIB_PS ${SUPERLU}
# blas lapack fftw3 m ${GTEST_LIB})
#target_link_libraries(TestRNManager MLMC sprng fftw3 m ${GTEST_LIB})
#---------------------------------------------------------------------------------------#
\ No newline at end of file
......@@ -40,25 +40,26 @@ Experiment = ConvergenceTest
#Experiment = MLMCOverEpsilon
initLevels = 4, 5, 6
initSampleAmount = 0, 0, 1
initSampleAmount = 16, 4, 2
uniformSampleAmount = 1
epsilon = 0.01
mcOnly = false
epsilonList = 0.01, 0.005, 0.001
epsilonList = 0.01, 0.005, 0.003, 0.001
maxLevel = 7
maxLevel = 9
plevel = 3
MainVerbose = 1
MCVerbose = 2
MLMCVerbose = 2
PDEVerbose = 1
PDEVerbose = 0
GeneratorVerbose = 0
AssembleVerbose = 0
GeneratorPlotting = 4
MCPlotting = 3
MLMCPlotting = 2
GeneratorPlotting = 0
MCPlotting = 0
MLMCPlotting = 0
# Stochastic Field
mean = 1.0
......
......@@ -22,7 +22,7 @@ void MonteCarloTransport::method() {
assemble->plot = finePlot;
assemble->problem->LoadNewSample(&fineNormalFlux);
solvePDE(l, 0, true, fineQ, fineCost, fineSolution);
solvePDE(l, m, true, fineQ, fineCost, fineSolution);
if (!onlyFineLevel) {
......@@ -37,7 +37,7 @@ void MonteCarloTransport::method() {
assemble->plot = coarsePlot;
assemble->problem->LoadNewSample(&coarseNormalFlux);
solvePDE(l, 0, false, coarseQ, coarseCost, coarseSolution);
solvePDE(l, m, false, coarseQ, coarseCost, coarseSolution);
} else {
coarseQ = 0.0, coarseCost = 0.0;
......
# Test Executables
#add_executable(TestCirculantEmbedding mlmc/tests/TestCirculantEmbedding.C)
#add_executable(TestRNManager mlmc/tests/TestRNManager.C)
# Linking
#target_link_libraries(TestCirculantEmbedding MLMC sprng SRC LIB_PS ${SUPERLU}
# blas lapack fftw3 m ${GTEST_LIB})
#target_link_libraries(TestRNManager MLMC sprng fftw3 m ${GTEST_LIB})
\ No newline at end of file
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