Skip to content
GitLab
Commit ac4f38c9 authored by Alexander Jaust's avatar Alexander Jaust
Browse files

Merge branch 'develop' into 'master' 

Update master to a reasonably current version.

Closes #13, #17, and #22

See merge request !14
parents ffe75aa9 46351425
Pipeline #12531 failed with stages
in 11 minutes and 23 seconds
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ ac4f38c9
#image: dumux-precice:3.3git-iterative-pr-2.2.0
image: dumux-precice:3.3git-iterative-pr-1.6.1
#image: dumux-precice:3.1-1.6.1
#image: dumux-precice:3.3-2.2.1
image: ub2004-style-check:clang-10
stages:
- check
- build
- test
check-style:
check-style-clang-10:
stage: check
script:
- ./scripts/format/run-clang-format.sh
......@@ -15,11 +16,12 @@ check-style:
- if [ -s style-patch.diff ]; then echo "Download the style patch as artifact and apply it or run ./scripts/format/run-clang-format.sh and commit again."; false; fi
needs: []
artifacts:
when: on_failure
paths:
- style-patch.diff
expire_in: 7 day
build:iterative-coupling:
.build_template: &build-iterative-coupling
stage: build
script:
- cd ..
......@@ -39,28 +41,29 @@ build:iterative-coupling:
- build-cmake/appl/coupling-ff-pm/fvca-iterative/Makefile
- build-cmake/appl/coupling-ff-pm/fvca-iterative/CTestTestfile.cmake
test:iterative-coupling:
stage: test
script:
- cd build-cmake/appl/coupling-ff-pm/fvca-iterative/
- ctest
artifacts:
expire_in: 5 days
paths:
- build-cmake/appl/coupling-ff-pm/fvca-iterative/Testing/Temporary/LastTest.log
- build-cmake/appl/coupling-ff-pm/fvca-iterative/Testing/Temporary/LastTestsFailed.log
needs:
- build:iterative-coupling
build-iterative-coupling:3.3-2.2.1:
image: ub2004-dumux-precice:3.3-2.2.1
<<: *build-iterative-coupling
build-iterative-coupling:3.4-2.2.1:
image: ub2004-dumux-precice:3.4-2.2.1
<<: *build-iterative-coupling
build:monolithic-coupling:
build-iterative-coupling:master-2.2.1:
image: dumux-precice:master-2.2.1
rules:
- if: '$CI_NIGHTLY_BUILD == "TRUE"'
<<: *build-iterative-coupling
.build_template: &build-monolithic-coupling
stage: build
script:
- cd ..
- export DUNE_CONTROL_PATH=${PWD}/dumux-precice:${DUNE_CONTROL_PATH}
- cd dumux-precice/
- echo $DUNE_CONTROL_PATH
- dunecontrol --only=dumux-precice --opts=/home/dumux/dumux/dumux/cmake.opts all
#- dunecontrol --only=dumux-precice --opts=./test/cmake-test.opts all
#- dunecontrol --only=dumux-precice --opts=/home/dumux/dumux/dumux/cmake.opts all
- dunecontrol --only=dumux-precice --opts=./test/cmake-test.opts all
- cd build-cmake/appl/coupling-ff-pm/fvca-monolithic
- make -j2 fvca-monolithic
artifacts:
......@@ -72,27 +75,97 @@ build:monolithic-coupling:
- build-cmake/appl/coupling-ff-pm/fvca-monolithic/Makefile
- build-cmake/appl/coupling-ff-pm/fvca-monolithic/CTestTestfile.cmake
test:monolithic-coupling:
build-monolithic-coupling:3.3-2.2.1:
image: ub2004-dumux-precice:3.3-2.2.1
<<: *build-monolithic-coupling
build-monolithic-coupling:3.4-2.2.1:
image: ub2004-dumux-precice:3.4-2.2.1
<<: *build-monolithic-coupling
build-monolithic-coupling:master-2.2.1:
image: dumux-precice:master-2.2.1
rules:
- if: '$CI_NIGHTLY_BUILD == "TRUE"'
<<: *build-monolithic-coupling
.test_template: &test-iterative-coupling
stage: test
script:
- cd build-cmake/appl/coupling-ff-pm/fvca-iterative/
- CTEST_OUTPUT_ON_FAILURE=1 ctest --verbose
artifacts:
expire_in: 2 days
when: on_failure
paths:
- build-cmake/appl/coupling-ff-pm/fvca-iterative/Testing/Temporary/LastTest.log
- build-cmake/appl/coupling-ff-pm/fvca-iterative/Testing/Temporary/LastTestsFailed.log
- build-cmake/appl/coupling-ff-pm/fvca-iterative/*.log
- build-cmake/appl/coupling-ff-pm/fvca-iterative/*.txt
- build-cmake/appl/coupling-ff-pm/fvca-iterative/CTestTestfile.cmake
test-iterative-coupling:3.3-2.2.1:
image: ub2004-dumux-precice:3.3-2.2.1
<<: *test-iterative-coupling
needs:
- build-iterative-coupling:3.3-2.2.1
test-iterative-coupling:3.4-2.2.1:
image: ub2004-dumux-precice:3.4-2.2.1
<<: *test-iterative-coupling
needs:
- build-iterative-coupling:3.4-2.2.1
test-iterative-coupling:master-2.2.1:
image: ub2004-dumux-precice:master-2.2.1
<<: *test-iterative-coupling
rules:
- if: '$CI_NIGHTLY_BUILD == "TRUE"'
needs:
- build-iterative-coupling:master-2.2.1
.test_template: &test-monolithic-coupling
stage: test
script:
- cd build-cmake/appl/coupling-ff-pm/fvca-monolithic/
- ctest
- - CTEST_OUTPUT_ON_FAILURE=1 ctest
artifacts:
expire_in: 5 days
paths:
- build-cmake/appl/coupling-ff-pm/fvca-monolithic/Testing/Temporary/LastTest.log
- build-cmake/appl/coupling-ff-pm/fvca-monolithic/Testing/Temporary/LastTestsFailed.log
test-monolithic-coupling:3.3-2.2.1:
image: ub2004-dumux-precice:3.3-2.2.1
<<: *test-monolithic-coupling
needs:
- build-monolithic-coupling:3.3-2.2.1
test-monolithic-coupling:3.4-2.2.1:
image: ub2004-dumux-precice:3.4-2.2.1
<<: *test-monolithic-coupling
needs:
- build:monolithic-coupling
- build-monolithic-coupling:3.4-2.2.1
build:monolithic:flow-over-step-2d:
test-monolithic-coupling:master-2.2.1:
image: ub2004-dumux-precice:master-2.2.1
<<: *test-monolithic-coupling
rules:
- if: '$CI_NIGHTLY_BUILD == "TRUE"'
needs:
- build-monolithic-coupling:master-2.2.1
.build_template: &build-monolithic-flow-over-step-2d
stage: build
script:
- cd ..
- export DUNE_CONTROL_PATH=${PWD}/dumux-precice:${DUNE_CONTROL_PATH}
- cd dumux-precice/
- echo $DUNE_CONTROL_PATH
- dunecontrol --only=dumux-precice --opts=/home/dumux/dumux/dumux/cmake.opts all
#- dunecontrol --only=dumux-precice --opts=/home/dumux/dumux/dumux/cmake.opts all
- dunecontrol --only=dumux-precice --opts=./test/cmake-test.opts all
- cd build-cmake/appl/coupling-ff-pm/monolithic/flow-over-step-2d
- make -j2 flow-over-step-2d
artifacts:
......@@ -104,28 +177,61 @@ build:monolithic:flow-over-step-2d:
- build-cmake/appl/coupling-ff-pm/monolithic/flow-over-step-2d/Makefile
- build-cmake/appl/coupling-ff-pm/monolithic/flow-over-step-2d/CTestTestfile.cmake
test:monolithic:flow-over-step-2d:
build-monolithic-flow-over-step-2d:3.3-2.2.1:
image: ub2004-dumux-precice:3.3-2.2.1
<<: *build-monolithic-flow-over-step-2d
build-monolithic-flow-over-step-2d:3.4-2.2.1:
image: ub2004-dumux-precice:3.4-2.2.1
<<: *build-monolithic-flow-over-step-2d
build-monolithic-flow-over-step-2d:master-2.2.1:
image: dumux-precice:master-2.2.1
rules:
- if: '$CI_NIGHTLY_BUILD == "TRUE"'
<<: *build-monolithic-flow-over-step-2d
.test_template: &test-monolithic-flow-over-step-2d
stage: test
script:
- cd build-cmake/appl/coupling-ff-pm/monolithic/flow-over-step-2d/
- ctest
- - CTEST_OUTPUT_ON_FAILURE=1 ctest
artifacts:
expire_in: 5 days
when: on_failure
expire_in: 2 days
paths:
- build-cmake/appl/coupling-ff-pm/monolithic/flow-over-step-2d/Testing/Temporary/LastTest.log
- build-cmake/appl/coupling-ff-pm/monolithic/flow-over-step-2d/Testing/Temporary/LastTestsFailed.log
test-monolithic-flow-over-step-2d:3.3-2.2.1:
image: ub2004-dumux-precice:3.3-2.2.1
<<: *test-monolithic-flow-over-step-2d
needs:
- build:monolithic:flow-over-step-2d
- build-monolithic-flow-over-step-2d:3.3-2.2.1
test-monolithic-flow-over-step-2d:3.4-2.2.1:
image: ub2004-dumux-precice:3.4-2.2.1
<<: *test-monolithic-flow-over-step-2d
needs:
- build-monolithic-flow-over-step-2d:3.4-2.2.1
test-monolithic-flow-over-step-2d:master-2.2.1:
image: ub2004-dumux-precice:master-2.2.1
<<: *test-monolithic-flow-over-step-2d
rules:
- if: '$CI_NIGHTLY_BUILD == "TRUE"'
needs:
- build-monolithic-flow-over-step-2d:master-2.2.1
build:monolithic:ff-pm-3d:
.build_template: &build-monolithic-ff-pm-3d
stage: build
script:
- cd ..
- export DUNE_CONTROL_PATH=${PWD}/dumux-precice:${DUNE_CONTROL_PATH}
- cd dumux-precice/
- echo $DUNE_CONTROL_PATH
- dunecontrol --only=dumux-precice --opts=/home/dumux/dumux/dumux/cmake.opts all
#- dunecontrol --only=dumux-precice --opts=/home/dumux/dumux/dumux/cmake.opts all
- dunecontrol --only=dumux-precice --opts=./test/cmake-test.opts all
- cd build-cmake/appl/coupling-ff-pm/monolithic/ff-pm-3d
- make -j2 ff-pm-3d
artifacts:
......@@ -137,15 +243,51 @@ build:monolithic:ff-pm-3d:
- build-cmake/appl/coupling-ff-pm/monolithic/ff-pm-3d/Makefile
- build-cmake/appl/coupling-ff-pm/monolithic/ff-pm-3d/CTestTestfile.cmake
test:monolithic:ff-pm-3d:
build-monolithic-ff-pm-3d:3.3-2.2.1:
image: ub2004-dumux-precice:3.3-2.2.1
<<: *build-monolithic-ff-pm-3d
build-monolithic-ff-pm-3d:3.4-2.2.1:
image: ub2004-dumux-precice:3.4-2.2.1
<<: *build-monolithic-ff-pm-3d
build-monolithic-ff-pm-3d:master-2.2.1:
image: dumux-precice:master-2.2.1
rules:
- if: '$CI_NIGHTLY_BUILD == "TRUE"'
<<: *build-monolithic-ff-pm-3d
.test_template: &test-monolithic-ff-pm-3d
stage: test
script:
- cd build-cmake/appl/coupling-ff-pm/monolithic/ff-pm-3d/
- ctest
- - CTEST_OUTPUT_ON_FAILURE=1 ctest
artifacts:
expire_in: 5 days
expire_in: 2 days
when: on_failure
paths:
- build-cmake/appl/coupling-ff-pm/monolithic/ff-pm-3d/Testing/Temporary/LastTest.log
- build-cmake/appl/coupling-ff-pm/monolithic/ff-pm-3d/Testing/Temporary/LastTestsFailed.log
needs:
- build:monolithic:ff-pm-3d
\ No newline at end of file
- build:monolithic:ff-pm-3d
test-monolithic-ff-pm-3d:3.3-2.2.1:
image: ub2004-dumux-precice:3.3-2.2.1
<<: *test-monolithic-ff-pm-3d
needs:
- build-monolithic-ff-pm-3d:3.3-2.2.1
test-monolithic-ff-pm-3d:3.4-2.2.1:
image: ub2004-dumux-precice:3.4-2.2.1
<<: *test-monolithic-ff-pm-3d
needs:
- build-monolithic-ff-pm-3d:3.4-2.2.1
test-monolithic-ff-pm-3d:master-2.2.1:
image: ub2004-dumux-precice:master-2.2.1
<<: *test-monolithic-ff-pm-3d
rules:
- if: '$CI_NIGHTLY_BUILD == "TRUE"'
needs:
- build-monolithic-ff-pm-3d:master-2.2.1
.gitmodules
View file @ ac4f38c9
[submodule "appl/precice-adapter"]
path = appl/precice-adapter
url = git@gitlab-sgs.informatik.uni-stuttgart.de:jaustar/dumux-precice-wrapper.git
CMakeLists.txt
View file @ ac4f38c9
......@@ -33,7 +33,8 @@ dune_enable_all_packages()
add_subdirectory(cmake/modules)
add_subdirectory(doc)
add_subdirectory(dumux)
#add_subdirectory(dumux-addon)
add_subdirectory(dumux-precice)
add_subdirectory(appl)
......
README.md
View file @ ac4f38c9
......@@ -5,8 +5,7 @@ This repository provides a DuMuX specific adapter to couple to other codes using
- DuMuX **newer** than 3.2
- Some of
- preCICE 1.6.X
- We are working on supporting newer versions of preCICE at the moment.
- preCICE >=2.0.0
## Running partitioned coupling
......
appl/coupling-ff-pm/fvca-iterative/Allclean.sh
View file @ ac4f38c9
#! /usr/bin/env bash
rm -rf "precice-run/"
rm -f "${ff_solver}.log" "${pm_solver}.log"
rm -f precice-*.log
rm -f precice-*.json
rm -f *.vtu *.pvd *.log
\ No newline at end of file
appl/coupling-ff-pm/fvca-iterative/CMakeLists.txt
View file @ ac4f38c9
......@@ -17,14 +17,6 @@ target_compile_definitions(fvca-iterative-pm PUBLIC "ENABLEMONOLITHIC=0")
target_link_libraries(fvca-iterative-ff PRIVATE ${PRECICE_LIB})
target_link_libraries(fvca-iterative-pm PRIVATE ${PRECICE_LIB})
#target_compile_definitions(fvca-iterative-ff PRIVATE BOOST_ALL_DYN_LINK)
#target_link_libraries(fvca-iterative-ff PRIVATE ${Boost_LIBRARIES} ${PRECICE_LIB})
#target_include_directories(fvca-iterative-ff PRIVATE ${Boost_INCLUDE_DIRS})
#target_compile_definitions(fvca-iterative-pm PRIVATE BOOST_ALL_DYN_LINK)
#target_link_libraries(fvca-iterative-pm PRIVATE ${Boost_LIBRARIES} ${PRECICE_LIB})
#target_include_directories(fvca-iterative-pm PRIVATE ${Boost_INCLUDE_DIRS})
# add a symlink for each input file
add_input_file_links()
macro(add_precice_file_links)
......@@ -51,155 +43,138 @@ dumux_add_test(NAME test_ff_pm_coupling_serial_implicit_stokes_first
TIMEOUT 30
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/test/run-iterative-test.py
CMD_ARGS --files ${CMAKE_SOURCE_DIR}/test/coupling-ff-pm/reference-solutions/iterative/serial-implicit/stokes-first/stokes-iterative-final.vtu
${CMAKE_CURRENT_BINARY_DIR}/stokes-iterative-00006.vtu
${CMAKE_SOURCE_DIR}/test/coupling-ff-pm/reference-solutions/iterative/serial-implicit/stokes-first/darcy-iterative-final.vtu
${CMAKE_CURRENT_BINARY_DIR}/darcy-iterative-00006.vtu
--dumux-param-file ${CMAKE_SOURCE_DIR}/test/coupling-ff-pm/reference-solutions/iterative/serial-implicit/stokes-first/params.input
--precice-config-file ${CMAKE_SOURCE_DIR}/test/coupling-ff-pm/reference-solutions/iterative/serial-implicit/stokes-first/precice-config.xml
CMD_ARGS --files ${CMAKE_SOURCE_DIR}/test/reference-solutions/partitioned/flow-over-square-2d/test_stokes_first_si_stokes.vtu
${CMAKE_CURRENT_BINARY_DIR}/stokes-iterative-00005.vtu
${CMAKE_SOURCE_DIR}/test/reference-solutions/partitioned/flow-over-square-2d/test_stokes_first_si_darcy.vtu
${CMAKE_CURRENT_BINARY_DIR}/darcy-iterative-00005.vtu
--dumux-param-file ${CMAKE_SOURCE_DIR}/test/partitioned/flow-over-square-2d/params-stokesdarcy.input
--precice-config-file ${CMAKE_SOURCE_DIR}/test/partitioned/flow-over-square-2d/precice-config-si-free-flow-first.xml
--precice-iteration-files ${CMAKE_SOURCE_DIR}/test/reference-solutions/partitioned/flow-over-square-2d/test_stokes_first_si_coupliter_stokes.log ${CMAKE_CURRENT_BINARY_DIR}/precice-FreeFlow-iterations.log
--case-name "flow-over-box-2d-si-stokes-first"
--relative 1e-6
--zeroThreshold {"velocity_liq \(m/s\)":1e-14,"p":1e-12}
)
set_tests_properties(test_ff_pm_coupling_serial_implicit_stokes_first PROPERTIES
ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/../dumux/bin/testing:$ENV{PYTHONPATH})
dumux_add_test(NAME test_ff_pm_coupling_serial_implicit_stokes_first_coupling_iterations
dumux_add_test(NAME test_ff_pm_coupling_serial_implicit_stokes_second
TARGET fvca-iterative-ff
TARGET fvca-iterative-pm
LABELS freeflow stokes precice darcy iterations
LABELS freeflow darcy precice darcy
TIMEOUT 30
CMAKE_GUARD HAVE_UMFPACK
COMMAND diff
CMD_ARGS ${CMAKE_SOURCE_DIR}/test/coupling-ff-pm/reference-solutions/iterative/serial-implicit/stokes-first/precice-FreeFlow-iterations.log
${CMAKE_CURRENT_BINARY_DIR}/precice-FreeFlow-iterations.log
)
dumux_add_test(NAME test_ff_pm_coupling_serial_implicit_stokes_first_cleanup
TARGET fvca-iterative-ff
TARGET fvca-iterative-pm
LABELS freeflow stokes precice darcy cleanup
TIMEOUT 5
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/scripts/cleanup_directory.sh
CMD_ARGS ${CMAKE_CURRENT_BINARY_DIR}
COMMAND ${CMAKE_SOURCE_DIR}/test/run-iterative-test.py
CMD_ARGS --files ${CMAKE_SOURCE_DIR}/test/reference-solutions/partitioned/flow-over-square-2d/test_stokes_second_si_stokes.vtu
${CMAKE_CURRENT_BINARY_DIR}/stokes-iterative-00006.vtu
${CMAKE_SOURCE_DIR}/test/reference-solutions/partitioned/flow-over-square-2d/test_stokes_second_si_darcy.vtu
${CMAKE_CURRENT_BINARY_DIR}/darcy-iterative-00006.vtu
--dumux-param-file ${CMAKE_SOURCE_DIR}/test/partitioned/flow-over-square-2d/params-stokesdarcy.input
--precice-config-file ${CMAKE_SOURCE_DIR}/test/partitioned/flow-over-square-2d/precice-config-si-free-flow-second.xml
--precice-iteration-files ${CMAKE_SOURCE_DIR}/test/reference-solutions/partitioned/flow-over-square-2d/test_stokes_second_si_coupliter_darcy.log ${CMAKE_CURRENT_BINARY_DIR}/precice-Darcy-iterations.log
--case-name "flow-over-box-2d-si-stokes-second"
--relative 1e-6
--zeroThreshold {"velocity_liq \(m/s\)":1e-14,"p":1e-12}
)
set_tests_properties(test_ff_pm_coupling_serial_implicit_stokes_second PROPERTIES
ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/../dumux/bin/testing:$ENV{PYTHONPATH})
dumux_add_test(NAME test_ff_pm_coupling_serial_implicit_darcy_first
dumux_add_test(NAME test_ff_pm_coupling_parallel_implicit_stokes
TARGET fvca-iterative-ff
TARGET fvca-iterative-pm
LABELS freeflow stokes precice darcy
TIMEOUT 30
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/test/run-iterative-test.py
CMD_ARGS --files ${CMAKE_SOURCE_DIR}/test/coupling-ff-pm/reference-solutions/iterative/serial-implicit/darcy-first/stokes-iterative-final.vtu
CMD_ARGS --files ${CMAKE_SOURCE_DIR}/test/reference-solutions/partitioned/flow-over-square-2d/test_stokes_pi_stokes.vtu
${CMAKE_CURRENT_BINARY_DIR}/stokes-iterative-00007.vtu
${CMAKE_SOURCE_DIR}/test/coupling-ff-pm/reference-solutions/iterative/serial-implicit/darcy-first/darcy-iterative-final.vtu
${CMAKE_SOURCE_DIR}/test/reference-solutions/partitioned/flow-over-square-2d/test_stokes_pi_darcy.vtu
${CMAKE_CURRENT_BINARY_DIR}/darcy-iterative-00007.vtu
--dumux-param-file ${CMAKE_SOURCE_DIR}/test/coupling-ff-pm/reference-solutions/iterative/serial-implicit/darcy-first/params.input
--precice-config-file ${CMAKE_SOURCE_DIR}/test/coupling-ff-pm/reference-solutions/iterative/serial-implicit/darcy-first/precice-config.xml
--dumux-param-file ${CMAKE_SOURCE_DIR}/test/partitioned/flow-over-square-2d/params-stokesdarcy.input
--precice-config-file ${CMAKE_SOURCE_DIR}/test/partitioned/flow-over-square-2d/precice-config-pi.xml
--precice-iteration-files ${CMAKE_SOURCE_DIR}/test/reference-solutions/partitioned/flow-over-square-2d/test_stokes_pi_coupliter_stokes.log
${CMAKE_CURRENT_BINARY_DIR}/precice-FreeFlow-iterations.log
--case-name "flow-over-box-2d-pi"
--relative 1e-6
--zeroThreshold {"velocity_liq \(m/s\)":1e-14,"p":1e-12}
)
set_tests_properties(test_ff_pm_coupling_serial_implicit_darcy_first PROPERTIES
# Adding DuMuX directory to Python search path such that we can use DuMuX'x fuzzy (inexact) testing of vtu files
set_tests_properties(test_ff_pm_coupling_parallel_implicit_stokes PROPERTIES
ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/../dumux/bin/testing:$ENV{PYTHONPATH})
dumux_add_test(NAME test_ff_pm_coupling_serial_implicit_darcy_first_coupling_iterations
TARGET fvca-iterative-ff
TARGET fvca-iterative-pm
LABELS freeflow stokes precice darcy iterations
TIMEOUT 30
CMAKE_GUARD HAVE_UMFPACK
COMMAND diff
CMD_ARGS ${CMAKE_SOURCE_DIR}/test/coupling-ff-pm/reference-solutions/iterative/serial-implicit/darcy-first/precice-Darcy-iterations.log
${CMAKE_CURRENT_BINARY_DIR}/precice-Darcy-iterations.log
)
### Setting test dependencies
set_property(TEST test_ff_pm_coupling_serial_implicit_stokes_second APPEND PROPERTY DEPENDS test_ff_pm_coupling_serial_implicit_stokes_first)
set_property(TEST test_ff_pm_coupling_parallel_implicit_stokes APPEND PROPERTY DEPENDS test_ff_pm_coupling_serial_implicit_stokes_second)
dumux_add_test(NAME test_ff_pm_coupling_serial_implicit_darcy_first_cleanup
TARGET fvca-iterative-ff
TARGET fvca-iterative-pm
LABELS freeflow stokes precice darcy cleanup
TIMEOUT 5
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/scripts/cleanup_directory.sh
CMD_ARGS ${CMAKE_CURRENT_BINARY_DIR}
)
######################
# Navier-Stokes tests
######################
dumux_add_test(NAME test_ff_pm_coupling_parallel_implicit
dumux_add_test(NAME test_ff_pm_coupling_serial_implicit_navierstokes_first
TARGET fvca-iterative-ff
TARGET fvca-iterative-pm
LABELS freeflow stokes precice darcy
TIMEOUT 30
LABELS freeflow navierstokes precice darcy
TIMEOUT 60
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/test/run-iterative-test.py
CMD_ARGS --files ${CMAKE_SOURCE_DIR}/test/coupling-ff-pm/reference-solutions/iterative/parallel-implicit/stokes-iterative-final.vtu
${CMAKE_CURRENT_BINARY_DIR}/stokes-iterative-00008.vtu
${CMAKE_SOURCE_DIR}/test/coupling-ff-pm/reference-solutions/iterative/parallel-implicit/darcy-iterative-final.vtu
${CMAKE_CURRENT_BINARY_DIR}/darcy-iterative-00008.vtu
--dumux-param-file ${CMAKE_SOURCE_DIR}/test/coupling-ff-pm/reference-solutions/iterative/parallel-implicit/params.input
--precice-config-file ${CMAKE_SOURCE_DIR}/test/coupling-ff-pm/reference-solutions/iterative/parallel-implicit/precice-config.xml
CMD_ARGS --files ${CMAKE_SOURCE_DIR}/test/reference-solutions/partitioned/flow-over-square-2d/test_navierstokes_first_si_navierstokes.vtu
${CMAKE_CURRENT_BINARY_DIR}/navierstokes-iterative-00006.vtu
${CMAKE_SOURCE_DIR}/test/reference-solutions/partitioned/flow-over-square-2d/test_navierstokes_first_si_darcy.vtu
${CMAKE_CURRENT_BINARY_DIR}/darcy-iterative-00006.vtu
--dumux-param-file ${CMAKE_SOURCE_DIR}/test/partitioned/flow-over-square-2d/params-navierstokesdarcy.input
--precice-config-file ${CMAKE_SOURCE_DIR}/test/partitioned/flow-over-square-2d/precice-config-si-free-flow-first.xml
--precice-iteration-files ${CMAKE_SOURCE_DIR}/test/reference-solutions/partitioned/flow-over-square-2d/test_navierstokes_first_si_coupliter_navierstokes.log ${CMAKE_CURRENT_BINARY_DIR}/precice-FreeFlow-iterations.log
--case-name "flow-over-box-2d-si-navierstokes-first"
--relative 1e-6
--zeroThreshold {"velocity_liq \(m/s\)":1e-14,"p":1e-12}
)
# Adding DuMuX directory to Python search path such that we can use DuMuX'x fuzzy (inexact) testing of vtu files
set_tests_properties(test_ff_pm_coupling_parallel_implicit PROPERTIES
set_tests_properties(test_ff_pm_coupling_serial_implicit_navierstokes_first PROPERTIES
ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/../dumux/bin/testing:$ENV{PYTHONPATH})
dumux_add_test(NAME test_ff_pm_coupling_parallel_implicit_coupling_iterations
dumux_add_test(NAME test_ff_pm_coupling_serial_implicit_navierstokes_second
TARGET fvca-iterative-ff
TARGET fvca-iterative-pm
LABELS freeflow stokes precice darcy iterations
TIMEOUT 30
LABELS freeflow darcy precice darcy
TIMEOUT 60
CMAKE_GUARD HAVE_UMFPACK
COMMAND diff
CMD_ARGS ${CMAKE_SOURCE_DIR}/test/coupling-ff-pm/reference-solutions/iterative/parallel-implicit/precice-FreeFlow-iterations.log
${CMAKE_CURRENT_BINARY_DIR}/precice-FreeFlow-iterations.log
COMMAND ${CMAKE_SOURCE_DIR}/test/run-iterative-test.py
CMD_ARGS --files ${CMAKE_SOURCE_DIR}/test/reference-solutions/partitioned/flow-over-square-2d/test_navierstokes_second_si_navierstokes.vtu
${CMAKE_CURRENT_BINARY_DIR}/navierstokes-iterative-00007.vtu
${CMAKE_SOURCE_DIR}/test/reference-solutions/partitioned/flow-over-square-2d/test_navierstokes_second_si_darcy.vtu
${CMAKE_CURRENT_BINARY_DIR}/darcy-iterative-00007.vtu
--dumux-param-file ${CMAKE_SOURCE_DIR}/test/partitioned/flow-over-square-2d/params-navierstokesdarcy.input
--precice-config-file ${CMAKE_SOURCE_DIR}/test/partitioned/flow-over-square-2d/precice-config-si-free-flow-second.xml
--precice-iteration-files ${CMAKE_SOURCE_DIR}/test/reference-solutions/partitioned/flow-over-square-2d/test_navierstokes_second_si_coupliter_darcy.log ${CMAKE_CURRENT_BINARY_DIR}/precice-Darcy-iterations.log
--case-name "flow-over-box-2d-si-navierstokes-second"
--relative 1e-6
--zeroThreshold {"velocity_liq \(m/s\)":1e-14,"p":1e-12}
)
set_tests_properties(test_ff_pm_coupling_serial_implicit_navierstokes_second PROPERTIES
ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/../dumux/bin/testing:$ENV{PYTHONPATH})
dumux_add_test(NAME test_ff_pm_coupling_parallel_implicit_cleanup
TARGET fvca-iterative-ff
TARGET fvca-iterative-pm
LABELS freeflow stokes precice darcy cleanup
TIMEOUT 5
COMMAND ${CMAKE_SOURCE_DIR}/scripts/cleanup_directory.sh
CMD_ARGS ${CMAKE_CURRENT_BINARY_DIR}
dumux_add_test(NAME test_ff_pm_coupling_parallel_implicit_navierstokes
TARGET fvca-iterative-ff
TARGET fvca-iterative-pm
LABELS freeflow navierstokes precice darcy
TIMEOUT 60
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/test/run-iterative-test.py
CMD_ARGS --files ${CMAKE_SOURCE_DIR}/test/reference-solutions/partitioned/flow-over-square-2d/test_navierstokes_pi_navierstokes.vtu
${CMAKE_CURRENT_BINARY_DIR}/navierstokes-iterative-00011.vtu
${CMAKE_SOURCE_DIR}/test/reference-solutions/partitioned/flow-over-square-2d/test_navierstokes_pi_darcy.vtu
${CMAKE_CURRENT_BINARY_DIR}/darcy-iterative-00011.vtu
--dumux-param-file ${CMAKE_SOURCE_DIR}/test/partitioned/flow-over-square-2d/params-navierstokesdarcy.input
--precice-config-file ${CMAKE_SOURCE_DIR}/test/partitioned/flow-over-square-2d/precice-config-pi.xml
--precice-iteration-files ${CMAKE_SOURCE_DIR}/test/reference-solutions/partitioned/flow-over-square-2d/test_navierstokes_pi_coupliter_navierstokes.log
${CMAKE_CURRENT_BINARY_DIR}/precice-FreeFlow-iterations.log
--case-name "flow-over-box-2d-pi"
--relative 1e-6
--zeroThreshold {"velocity_liq \(m/s\)":1e-14,"p":1e-12}
)
# Adding DuMuX directory to Python search path such that we can use DuMuX'x fuzzy (inexact) testing of vtu files
set_tests_properties(test_ff_pm_coupling_parallel_implicit_navierstokes PROPERTIES
ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/../dumux/bin/testing:$ENV{PYTHONPATH})
#add_test(NAME test_ff_pm_coupling_parallel_implicit_cleanup COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/*.pvd ${CMAKE_CURRENT_BINARY_DIR}/*.vtu)
#dumux_add_test(NAME test_ff_pm_coupling_cleanup
# TARGET fvca-iterative-ff
# TARGET fvca-iterative-pm
# LABELS freeflow stokes precice darcy cleanup
# TIMEOUT 5
# CMAKE_GUARD HAVE_UMFPACK
# COMMAND rm
# CMD_ARGS -f ${CMAKE_CURRENT_BINARY_DIR}/*.pvd ${CMAKE_CURRENT_BINARY_DIR}/*.vtu
#)
# Setting test dependencies
# preCICE tests cannot be run in parallel as the preCICE initialization may be messed up.
set_property(TEST test_ff_pm_coupling_serial_implicit_stokes_first_coupling_iterations APPEND PROPERTY DEPENDS test_ff_pm_coupling_serial_implicit_stokes_first)
set_property(TEST test_ff_pm_coupling_serial_implicit_stokes_first_cleanup APPEND PROPERTY DEPENDS test_ff_pm_coupling_serial_implicit_stokes_first_coupling_iterations)
set_property(TEST test_ff_pm_coupling_serial_implicit_darcy_first APPEND PROPERTY DEPENDS test_ff_pm_coupling_serial_implicit_stokes_first)
set_property(TEST test_ff_pm_coupling_serial_implicit_darcy_first_coupling_iterations APPEND PROPERTY DEPENDS test_ff_pm_coupling_serial_implicit_darcy_first)
set_property(TEST test_ff_pm_coupling_serial_implicit_darcy_first_cleanup APPEND PROPERTY DEPENDS test_ff_pm_coupling_serial_implicit_darcy_first_coupling_iterations)
#set_property(TEST test_ff_pm_coupling_serial_implicit_darcy_first_cleanup APPEND PROPERTY DEPENDS test_ff_pm_coupling_serial_implicit_darcy_first_coupling_iterations)
set_property(TEST test_ff_pm_coupling_parallel_implicit APPEND PROPERTY DEPENDS test_ff_pm_coupling_serial_implicit_darcy_first_cleanup)
set_property(TEST test_ff_pm_coupling_parallel_implicit_coupling_iterations APPEND PROPERTY DEPENDS test_ff_pm_coupling_parallel_implicit)
set_property(TEST test_ff_pm_coupling_parallel_implicit_cleanup APPEND PROPERTY DEPENDS test_ff_pm_coupling_parallel_implicit_coupling_iterations)
#set_tests_properties(test_ff_pm_coupling_parallel_implicit_cleanup test_ff_pm_coupling_serial_implicit_darcy_first_coupling_iterations test_ff_pm_coupling_serial_implicit_stokes_first_coupling_iterations PROPERTIES FIXTURES_REQUIRED test_ff_pm)
#set_tests_properties(test_ff_pm_coupling_cleanup PROPERTIES FIXTURES_CLEANUP test_ff_pm)
#set_property(TEST test_ff_pm_coupling_parallel_implicit APPEND PROPERTY DEPENDS test_ff_pm_coupling_serial_implicit_darcy_first)
\ No newline at end of file
# Adding DuMuX directory to Python search path such that we can use DuMuX'x fuzzy (inexact) testing of vtu files
set_property(TEST test_ff_pm_coupling_serial_implicit_navierstokes_first APPEND PROPERTY DEPENDS test_ff_pm_coupling_parallel_implicit_stokes)
set_property(TEST test_ff_pm_coupling_serial_implicit_navierstokes_second APPEND PROPERTY DEPENDS test_ff_pm_coupling_serial_implicit_navierstokes_first)
set_property(TEST test_ff_pm_coupling_parallel_implicit_navierstokes APPEND PROPERTY DEPENDS test_ff_pm_coupling_serial_implicit_navierstokes_second)
\ No newline at end of file
appl/coupling-ff-pm/fvca-iterative/ffproblem-reversed.hh
View file @ ac4f38c9
......@@ -28,6 +28,9 @@
#endif
#include <dune/grid/yaspgrid.hh>
#if DUMUX_VERSION_MAJOR >= 3 & DUMUX_VERSION_MINOR >= 4
#include <dumux/common/numeqvector.hh>
#endif
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/1pliquid.hh>
......@@ -105,7 +108,8 @@ class StokesSubProblem : public NavierStokesProblem<TypeTag>
using Indices =
typename GetPropType<TypeTag, Properties::ModelTraits>::Indices;
using BoundaryTypes = GetPropType<TypeTag, Properties::BoundaryTypes>;
using BoundaryTypes = Dumux::NavierStokesBoundaryTypes<
GetPropType<TypeTag, Properties::ModelTraits>::numEq()>;