The TS-GitLab will have to shut down towards the end of the year — please think about migrating your projects to GitLab.com or GitHub.
(This is still a very early message, meant to keep you informed. There will be more urgent ones in the future.)

Commit 27a3d22d authored by Lukas Riedel's avatar Lukas Riedel
Browse files

testing if CG solver is faster than BiCGSTAB #14

parent 02f52012
......@@ -67,7 +67,7 @@ protected:
/// Linear solver types
using LSSeq = Dune::PDELab::ISTLBackend_SEQ_SuperLU;
using LSPar = Dune::PDELab::ISTLBackend_OVLP_AMG_4_DG<IGO,CC,LSGFS,LSCC,
Dune::PDELab::CG2DGProlongation,Dune::SeqSSOR,Dune::BiCGSTABSolver>;
Dune::PDELab::CG2DGProlongation,Dune::SeqSSOR,Dune::CGSolver>;
/// Non-linear solver types
using PDESOLVERSeq = Dune::PDELab::Newton<IGO,LSSeq,U>;
using PDESOLVERPar = Dune::PDELab::Newton<IGO,LSPar,U>;
......
......@@ -15,36 +15,38 @@ function(dorie_add_system_test_dependency test1 test2)
set_tests_properties(${test1} PROPERTIES DEPENDS ${test2})
endfunction()
dorie_add_system_test(dorie parallel_performance.mini)
# dorie run
dorie_add_system_test(dorie ode.mini)
dorie_add_system_test(dorie ode_higherorder.mini)
dorie_add_system_test(dorie ode_evaporation.mini)
dorie_add_system_test(dorie ode_linear_interpolator.mini)
dorie_add_system_test(dorie muphi.mini)
dorie_add_system_test_dependency(dorie_muphi dorie-rfg_muphi_pfg)
dorie_add_system_test(dorie reference_2d.mini)
dorie_add_system_test(dorie reference_3d.mini)
dorie_add_system_test(dorie reference_evaporation.mini)
dorie_add_system_test(dorie reference_interpolators.mini)
# dorie in parallel
if(num_proc GREATER 1)
dorie_add_system_test(dorie parallel_reference.mini)
dorie_add_system_test(dorie parallel_reference_compare.mini)
foreach(n RANGE 0 3)
dorie_add_system_test_dependency(dorie_parallel_reference_compare_000${n} dorie_parallel_reference)
endforeach()
endif()
# dorie pfg
dorie_add_system_test(dorie-rfg parfield.mini)
dorie_add_system_test(dorie-rfg parfield_muphi.mini)
dorie_add_system_test(dorie-rfg correlation.mini)
dorie_add_system_test(dorie-rfg correlation_parallel.mini)
# dorie plot
dorie_add_system_test(dorie plot.mini)
dorie_add_system_test_dependency(dorie_plot dorie_reference_2d_0000)
# dorie create
dorie_add_system_test(dorie create.mini)
# dorie_add_system_test(dorie ode.mini)
# dorie_add_system_test(dorie ode_higherorder.mini)
# dorie_add_system_test(dorie ode_evaporation.mini)
# dorie_add_system_test(dorie ode_linear_interpolator.mini)
# dorie_add_system_test(dorie muphi.mini)
# dorie_add_system_test_dependency(dorie_muphi dorie-rfg_muphi_pfg)
# dorie_add_system_test(dorie reference_2d.mini)
# dorie_add_system_test(dorie reference_3d.mini)
# dorie_add_system_test(dorie reference_evaporation.mini)
# dorie_add_system_test(dorie reference_interpolators.mini)
# # dorie in parallel
# if(num_proc GREATER 1)
# dorie_add_system_test(dorie parallel_reference.mini)
# dorie_add_system_test(dorie parallel_reference_compare.mini)
# foreach(n RANGE 0 3)
# dorie_add_system_test_dependency(dorie_parallel_reference_compare_000${n} dorie_parallel_reference)
# endforeach()
# endif()
# # dorie pfg
# dorie_add_system_test(dorie-rfg parfield.mini)
# dorie_add_system_test(dorie-rfg parfield_muphi.mini)
# dorie_add_system_test(dorie-rfg correlation.mini)
# dorie_add_system_test(dorie-rfg correlation_parallel.mini)
# # dorie plot
# dorie_add_system_test(dorie plot.mini)
# dorie_add_system_test_dependency(dorie_plot dorie_reference_2d_0000)
# # dorie create
# dorie_add_system_test(dorie create.mini)
include ${CMAKE_BINARY_DIR}/doc/default_files/config.ini
__name = parallel_performance
_test_command = run
_test_command_options = --parallel 2 -m=--allow-run-as-root
_asset_path = "${CMAKE_CURRENT_LIST_DIR}"
output.fileName = parallel_performance | unique
output.outputPath = parallel_performance | unique
output.verbose = 0
time.end = 1E6
time.maxTimestep = 1E6
time.startTimestep = 1E3
time.minIterations = 100
time.maxIterations = 100
adaptivity.useAdaptivity = false
grid.FEorder = 1, 2, 3 | expand
grid.gridType = rectangular
grid.cells = 10 10
grid.initialLevel = 0, 1, 2 | expand
boundary.file = "{_asset_path}/bcs/infiltration_2d.dat"
parameters.arrayFile = "{_asset_path}/parfields/fft_2d.h5"
[NewtonParameters]
AbsoluteLimit = 1E-10
Reduction = 1E-10
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