From 71a30d10517af648971aec7d1fc8985a85e94411 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Wed, 11 Mar 2020 17:38:32 +0100
Subject: [PATCH] [test] Run dambreak test in parallel
---
.../shallowwater/dambreak/CMakeLists.txt | 26 +++++++++++++++----
.../shallowwater/dambreak/params.input | 10 +++----
.../shallowwater/roughchannel/CMakeLists.txt | 7 ++---
3 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/test/freeflow/shallowwater/dambreak/CMakeLists.txt b/test/freeflow/shallowwater/dambreak/CMakeLists.txt
index 88e0ced92a..ee23f9b411 100644
--- a/test/freeflow/shallowwater/dambreak/CMakeLists.txt
+++ b/test/freeflow/shallowwater/dambreak/CMakeLists.txt
@@ -1,12 +1,28 @@
dune_symlink_to_source_files(FILES "params.input")
-dumux_add_test(NAME test_shallowwater_dambreak
- SOURCES main.cc
- TIMEOUT 1500
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
+add_executable(test_shallowwater_dambreak EXCLUDE_FROM_ALL main.cc)
+
+dumux_add_test(NAME test_shallowwater_dambreak_sequential
+ TARGET test_shallowwater_dambreak
+ LABELS shallowwater
+ TIMEOUT 1500
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_shallowwater_dambreak-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/dambreak-00001.vtu
--zeroThreshold {"velocityY":1e-14}
--command "${CMAKE_CURRENT_BINARY_DIR}/test_shallowwater_dambreak params.input
-Problem.Name dambreak")
+
+dumux_add_test(NAME test_shallowwater_dambreak_parallel
+ TARGET test_shallowwater_dambreak
+ LABELS shallowwater parallel
+ TIMEOUT 1500
+ CMAKE_GUARD MPI_FOUND
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_shallowwater_dambreak-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/s0002-dambreak_parallel-00001.pvtu
+ --zeroThreshold {"velocityY":1e-14,"process rank":100}
+ --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_shallowwater_dambreak params.input
+ -Problem.Name dambreak_parallel")
diff --git a/test/freeflow/shallowwater/dambreak/params.input b/test/freeflow/shallowwater/dambreak/params.input
index 03b5a00414..7254db45d5 100644
--- a/test/freeflow/shallowwater/dambreak/params.input
+++ b/test/freeflow/shallowwater/dambreak/params.input
@@ -17,13 +17,11 @@ EnablePartialReassembly = true
EnableDynamicOutput = false
[LinearSolver]
-Type = cgsolver
+Type = bicgstabsolver
MaxIterations = 80
[LinearSolver.Preconditioner]
-Type = amg
+Type = ilu
Verbosity = 0
-AmgMaxLevel = 2
-AmgPreSmoothingSteps = 1
-AmgPostSmoothingSteps = 1
-AmgCriterionSymmetric = true
+ILUOrder = 0
+ILUResort = true
diff --git a/test/freeflow/shallowwater/roughchannel/CMakeLists.txt b/test/freeflow/shallowwater/roughchannel/CMakeLists.txt
index 3ae5d9a161..b6d509befe 100644
--- a/test/freeflow/shallowwater/roughchannel/CMakeLists.txt
+++ b/test/freeflow/shallowwater/roughchannel/CMakeLists.txt
@@ -1,9 +1,10 @@
dune_symlink_to_source_files(FILES "params.input")
dumux_add_test(NAME test_shallowwater_roughchannel
- SOURCES main.cc
- COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- CMD_ARGS --script fuzzy
+ SOURCES main.cc
+ LABELS shallowwater
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_shallowwater_roughchannel-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/roughchannel-00001.vtu
--zeroThreshold {"velocityY":1e-14}
--
GitLab