From ed8cedd49766cc1875480ed69cce8c2337698871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20He=C3=9F?= <rene.hess@iwr.uni-heidelberg.de>
Date: Thu, 18 Jan 2018 15:43:58 +0100
Subject: [PATCH] Run Navier Stokes test in parallel
---
cmake/modules/GeneratedSystemtests.cmake | 13 +++++++++----
test/navier-stokes/CMakeLists.txt | 1 +
.../navierstokes_2d_dg_quadrilateral.mini | 3 +++
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/cmake/modules/GeneratedSystemtests.cmake b/cmake/modules/GeneratedSystemtests.cmake
index de9dc259..d42b8aeb 100644
--- a/cmake/modules/GeneratedSystemtests.cmake
+++ b/cmake/modules/GeneratedSystemtests.cmake
@@ -67,10 +67,15 @@ function(dune_add_formcompiler_system_test)
_add_test(NAME ${tname}
COMMAND ${CMAKE_BINARY_DIR}/run-in-dune-env ${SYSTEMTEST_SCRIPT}
- --exec ${tname}
- --ini "${CMAKE_CURRENT_BINARY_DIR}/${inifile}"
- --source ${CMAKE_CURRENT_SOURCE_DIR}
- )
+ --exec ${tname}
+ --ini "${CMAKE_CURRENT_BINARY_DIR}/${inifile}"
+ --source ${CMAKE_CURRENT_SOURCE_DIR}
+ --mpi-exec "${MPIEXEC}"
+ --mpi-numprocflag=${MPIEXEC_NUMPROC_FLAG}
+ --mpi-preflags "${MPIEXEC_PREFLAGS}"
+ --mpi-postflags "${MPIEXEC_POSTFLAGS}"
+ --max-processors=${DUNE_MAX_TEST_CORES}
+ )
set_tests_properties(${tname} PROPERTIES SKIP_RETURN_CODE 77)
set_tests_properties(${tname} PROPERTIES TIMEOUT 60)
diff --git a/test/navier-stokes/CMakeLists.txt b/test/navier-stokes/CMakeLists.txt
index 15258652..a82d8bbf 100644
--- a/test/navier-stokes/CMakeLists.txt
+++ b/test/navier-stokes/CMakeLists.txt
@@ -3,6 +3,7 @@ add_subdirectory(reference_program)
dune_add_formcompiler_system_test(UFLFILE navierstokes_2d_dg_quadrilateral.ufl
BASENAME navierstokes_2d_dg_quadrilateral
INIFILE navierstokes_2d_dg_quadrilateral.mini
+ SCRIPT dune_execute_parallel.py
)
# dune_add_formcompiler_system_test(UFLFILE navierstokes_3d_dg_quadrilateral.ufl
diff --git a/test/navier-stokes/navierstokes_2d_dg_quadrilateral.mini b/test/navier-stokes/navierstokes_2d_dg_quadrilateral.mini
index bac1fc67..e8132ebb 100644
--- a/test/navier-stokes/navierstokes_2d_dg_quadrilateral.mini
+++ b/test/navier-stokes/navierstokes_2d_dg_quadrilateral.mini
@@ -8,6 +8,9 @@ periodic = true true
printmatrix = false
+[wrapper.execute_parallel]
+numprocessors = 4
+
[wrapper.vtkcompare]
name = {__name}
extension = vtu
--
GitLab