Commit 0d0c22f6 authored by Alexander Jaust's avatar Alexander Jaust
Browse files

Change Docker images used in CI

We use prebuilt Docker images on the `ajaust` namespace and push them to DockerHub. This commit makes sure that the CI is using these new container images. These changes have been done while moving the CI to a new VM.

Related changes:

* Tolerance of partitioned tests was increased to `5e-5` as the results changed slightly using the new Docker images on the new VM.
* Added a copy of `fuzzycomparevtu.py` from the DuMuX repository into this repository. This allows us to be more independent of the location of the DuMuX repository.
parent a4861cc8
Pipeline #13650 failed with stages
in 3 minutes and 33 seconds
#image: dumux-precice:3.3git-iterative-pr-2.2.0 #image: dumux-precice:3.3git-iterative-pr-2.2.0
#image: dumux-precice:3.3-2.2.1 #image: dumux-precice:3.3-2.2.1
image: ub2004-style-check:clang-10 #image: ajaust/style-check:clang-10
image: ajaust/style-check:0.1
stages: stages:
- check - check
...@@ -52,17 +52,17 @@ check-style-black: ...@@ -52,17 +52,17 @@ check-style-black:
- build-cmake/ - build-cmake/
build-tests:3.3-2.2.1: build-tests:3.3-2.2.1:
image: ub2004-dumux-precice:3.3-2.2.1 image: ajaust/dumux-precice:3.3-2.2.1
<<: *build-tests <<: *build-tests
rules: rules:
- if: '$CI_NIGHTLY_BUILD == "TRUE"' - if: '$CI_NIGHTLY_BUILD == "TRUE"'
build-tests:3.4-2.2.1: build-tests:3.4-2.2.1:
image: ub2004-dumux-precice:3.4-2.2.1 image: ajaust/dumux-precice:3.4-2.2.1
<<: *build-tests <<: *build-tests
build-tests:3.4-2.3.0: build-tests:3.4-2.3.0:
image: ub2004-dumux-precice:3.4-2.3.0 image: ajaust/dumux-precice:3.4-2.3.0
<<: *build-tests <<: *build-tests
build-tests:master-2.2.1: build-tests:master-2.2.1:
...@@ -84,7 +84,7 @@ build-tests:master-2.2.1: ...@@ -84,7 +84,7 @@ build-tests:master-2.2.1:
- build-cmake/ - build-cmake/
test-partitioned:3.3-2.2.1: test-partitioned:3.3-2.2.1:
image: ub2004-dumux-precice:3.3-2.2.1 image: ajaust/dumux-precice:3.3-2.2.1
<<: *test-partitioned-cases <<: *test-partitioned-cases
rules: rules:
- if: '$CI_NIGHTLY_BUILD == "TRUE"' - if: '$CI_NIGHTLY_BUILD == "TRUE"'
...@@ -92,19 +92,19 @@ test-partitioned:3.3-2.2.1: ...@@ -92,19 +92,19 @@ test-partitioned:3.3-2.2.1:
- build-tests:3.3-2.2.1 - build-tests:3.3-2.2.1
test-partitioned:3.4-2.2.1: test-partitioned:3.4-2.2.1:
image: ub2004-dumux-precice:3.4-2.2.1 image: ajaust/dumux-precice:3.4-2.2.1
<<: *test-partitioned-cases <<: *test-partitioned-cases
needs: needs:
- build-tests:3.4-2.2.1 - build-tests:3.4-2.2.1
test-partitioned:3.4-2.3.0: test-partitioned:3.4-2.3.0:
image: ub2004-dumux-precice:3.4-2.3.0 image: ajaust/dumux-precice:3.4-2.3.0
<<: *test-partitioned-cases <<: *test-partitioned-cases
needs: needs:
- build-tests:3.4-2.3.0 - build-tests:3.4-2.3.0
test-partitioned:master-2.2.1: test-partitioned:master-2.2.1:
image: ub2004-dumux-precice:master-2.2.1 image: ajaust/dumux-precice:master-2.2.1
<<: *test-partitioned-cases <<: *test-partitioned-cases
rules: rules:
- if: '$CI_NIGHTLY_BUILD == "TRUE"' - if: '$CI_NIGHTLY_BUILD == "TRUE"'
...@@ -116,6 +116,7 @@ test-partitioned:master-2.2.1: ...@@ -116,6 +116,7 @@ test-partitioned:master-2.2.1:
stage: test stage: test
script: script:
- cd build-cmake - cd build-cmake
- echo $PYTHONPATH
- CTEST_OUTPUT_ON_FAILURE=1 ctest -j2 -L ^monolithic$ - CTEST_OUTPUT_ON_FAILURE=1 ctest -j2 -L ^monolithic$
artifacts: artifacts:
expire_in: 2 days expire_in: 2 days
...@@ -124,7 +125,7 @@ test-partitioned:master-2.2.1: ...@@ -124,7 +125,7 @@ test-partitioned:master-2.2.1:
- build-cmake/ - build-cmake/
test-monolithic:3.3-2.2.1: test-monolithic:3.3-2.2.1:
image: ub2004-dumux-precice:3.3-2.2.1 image: ajaust/dumux-precice:3.3-2.2.1
<<: *test-monolithic-cases <<: *test-monolithic-cases
needs: needs:
- build-tests:3.3-2.2.1 - build-tests:3.3-2.2.1
...@@ -132,19 +133,19 @@ test-monolithic:3.3-2.2.1: ...@@ -132,19 +133,19 @@ test-monolithic:3.3-2.2.1:
- if: '$CI_NIGHTLY_BUILD == "TRUE"' - if: '$CI_NIGHTLY_BUILD == "TRUE"'
test-monolithic:3.4-2.2.1: test-monolithic:3.4-2.2.1:
image: ub2004-dumux-precice:3.4-2.2.1 image: ajaust/dumux-precice:3.4-2.2.1
<<: *test-monolithic-cases <<: *test-monolithic-cases
needs: needs:
- build-tests:3.4-2.2.1 - build-tests:3.4-2.2.1
test-monolithic:3.4-2.3.0: test-monolithic:3.4-2.3.0:
image: ub2004-dumux-precice:3.4-2.3.0 image: ajaust/dumux-precice:3.4-2.3.0
<<: *test-monolithic-cases <<: *test-monolithic-cases
needs: needs:
- build-tests:3.4-2.3.0 - build-tests:3.4-2.3.0
test-monolithic:master-2.2.1: test-monolithic:master-2.2.1:
image: ub2004-dumux-precice:master-2.2.1 image: ajaust/dumux-precice:master-2.2.1
<<: *test-monolithic-cases <<: *test-monolithic-cases
rules: rules:
- if: '$CI_NIGHTLY_BUILD == "TRUE"' - if: '$CI_NIGHTLY_BUILD == "TRUE"'
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
## Not released yet ## Not released yet
- 2022-02-18: Updated CI to use images from account `ajaust` from Dockerhub. Changed tolerance for partitioned tests to 5e-5 due to minimal changes in the solution with the new images on a new VM.
- 2022-02-09: Made sure all private member of the adapter are suffixed with an underscore. - 2022-02-09: Made sure all private member of the adapter are suffixed with an underscore.
- 2022-02-01: Add some extra information on the documentation in the `README.md`. Removed old/out-of-date mkdocs documentation from `doc/mkdocs`. - 2022-02-01: Add some extra information on the documentation in the `README.md`. Removed old/out-of-date mkdocs documentation from `doc/mkdocs`.
- 2022-01-31: Increased robustness of test scripts. - 2022-01-31: Increased robustness of test scripts.
...@@ -27,4 +28,4 @@ ...@@ -27,4 +28,4 @@
This marks the initial release of the DuMuX-preCICE adapter. This marks the initial release of the DuMuX-preCICE adapter.
- Should represent the state of adapter used in publication [Jaust2020a](https://git.iws.uni-stuttgart.de/dumux-pub/jaust2020a). - Should represent the state of adapter used in publication [Jaust2020a](https://git.iws.uni-stuttgart.de/dumux-pub/jaust2020a).
- Requires preCICE 1.6 - Requires preCICE 1.6
\ No newline at end of file
#!/usr/bin/env bash #!/usr/bin/env sh
set -e set -e
# Runs clang-format on all *.cc and *.hh files # Runs clang-format on all *.cc and *.hh files
find dumux-precice/ -regex '.*\.\(cc\|hh\)' -exec clang-format-10 -style=file -i {} \; find dumux-precice/ -regex '.*\.\(cc\|hh\)' -exec clang-format-10 -style=file -i {} \;
find examples/ -regex '.*\.\(cc\|hh\)' -exec clang-format-10 -style=file -i {} \; find examples/ -regex '.*\.\(cc\|hh\)' -exec clang-format-10 -style=file -i {} \;
find postprocessing/ -regex '.*\.\(cc\|hh\|hpp\|cpp\)' -exec clang-format-10 -style=file -i {} \; find postprocessing/ -regex '.*\.\(cc\|hh\|hpp\|cpp\)' -exec clang-format-10 -style=file -i {} \;
\ No newline at end of file
This diff is collapsed.
...@@ -19,7 +19,7 @@ dumux_add_test(NAME test_ff-pm-3d-stokes ...@@ -19,7 +19,7 @@ dumux_add_test(NAME test_ff-pm-3d-stokes
--zeroThreshold {"velocity_liq \(m/s\)":1e-8,"p":1e-8} --zeroThreshold {"velocity_liq \(m/s\)":1e-8,"p":1e-8}
) )
set_tests_properties(test_ff-pm-3d-stokes PROPERTIES set_tests_properties(test_ff-pm-3d-stokes PROPERTIES
ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/../dumux/bin/testing:$ENV{PYTHONPATH}) ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/test:$ENV{PYTHONPATH})
dumux_add_test(NAME test_ff-pm-3d-navier-stokes dumux_add_test(NAME test_ff-pm-3d-navier-stokes
...@@ -38,4 +38,4 @@ dumux_add_test(NAME test_ff-pm-3d-navier-stokes ...@@ -38,4 +38,4 @@ dumux_add_test(NAME test_ff-pm-3d-navier-stokes
--zeroThreshold {"velocity_liq \(m/s\)":1e-8,"p":1e-8} --zeroThreshold {"velocity_liq \(m/s\)":1e-8,"p":1e-8}
) )
set_tests_properties(test_ff-pm-3d-navier-stokes PROPERTIES set_tests_properties(test_ff-pm-3d-navier-stokes PROPERTIES
ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/../dumux/bin/testing:$ENV{PYTHONPATH}) ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/test:$ENV{PYTHONPATH})
\ No newline at end of file
...@@ -19,4 +19,4 @@ dune_add_test(NAME test_ff_pm_mono_flow_over_square_2d ...@@ -19,4 +19,4 @@ dune_add_test(NAME test_ff_pm_mono_flow_over_square_2d
--zeroThreshold {"velocity_liq \(m/s\)":1e-14,"p":1e-12} --zeroThreshold {"velocity_liq \(m/s\)":1e-14,"p":1e-12}
) )
set_tests_properties(test_ff_pm_mono_flow_over_square_2d PROPERTIES set_tests_properties(test_ff_pm_mono_flow_over_square_2d PROPERTIES
ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/../dumux/bin/testing:$ENV{PYTHONPATH}) ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/test:$ENV{PYTHONPATH})
\ No newline at end of file
...@@ -19,4 +19,4 @@ dumux_add_test(NAME test_flow-over-step-2d ...@@ -19,4 +19,4 @@ dumux_add_test(NAME test_flow-over-step-2d
--zeroThreshold {"velocity_liq \(m/s\)":1e-6,"p":1e-8} --zeroThreshold {"velocity_liq \(m/s\)":1e-6,"p":1e-8}
) )
set_tests_properties(test_flow-over-step-2d PROPERTIES set_tests_properties(test_flow-over-step-2d PROPERTIES
ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/../dumux/bin/testing:$ENV{PYTHONPATH}) ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/test:$ENV{PYTHONPATH})
...@@ -44,11 +44,11 @@ dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_si_st_first ...@@ -44,11 +44,11 @@ dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_si_st_first
--precice-config-file ${CMAKE_SOURCE_DIR}/test/partitioned/flow-over-square-2d/precice-config-si-free-flow-first.xml --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 --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" --case-name "flow-over-box-2d-si-stokes-first"
--relative 1e-6 --relative 5e-6
--zeroThreshold {"velocity_liq \(m/s\)":1e-14,"p":1e-12} --zeroThreshold {"velocity_liq \(m/s\)":1e-14,"p":1e-12}
) )
set_tests_properties(test_ff_pm_part_flow_over_square_2d_si_st_first PROPERTIES set_tests_properties(test_ff_pm_part_flow_over_square_2d_si_st_first PROPERTIES
ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/../dumux/bin/testing:$ENV{PYTHONPATH}) ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/test:$ENV{PYTHONPATH})
dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_si_st_second dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_si_st_second
TARGET test_pm_flow_over_square_2d TARGET test_pm_flow_over_square_2d
...@@ -66,11 +66,11 @@ dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_si_st_second ...@@ -66,11 +66,11 @@ dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_si_st_second
--precice-config-file ${CMAKE_SOURCE_DIR}/test/partitioned/flow-over-square-2d/precice-config-si-free-flow-second.xml --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 --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" --case-name "flow-over-box-2d-si-stokes-second"
--relative 1e-6 --relative 5e-6
--zeroThreshold {"velocity_liq \(m/s\)":1e-14,"p":1e-12} --zeroThreshold {"velocity_liq \(m/s\)":1e-14,"p":1e-12}
) )
set_tests_properties(test_ff_pm_part_flow_over_square_2d_si_st_second PROPERTIES set_tests_properties(test_ff_pm_part_flow_over_square_2d_si_st_second PROPERTIES
ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/../dumux/bin/testing:$ENV{PYTHONPATH}) ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/test:$ENV{PYTHONPATH})
dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_pi_st dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_pi_st
TARGET test_ff_flow_over_square_2d test_pm_flow_over_square_2d TARGET test_ff_flow_over_square_2d test_pm_flow_over_square_2d
...@@ -88,12 +88,12 @@ dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_pi_st ...@@ -88,12 +88,12 @@ dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_pi_st
--precice-iteration-files ${CMAKE_SOURCE_DIR}/test/reference-solutions/partitioned/flow-over-square-2d/test_stokes_pi_coupliter_stokes.log --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 ${CMAKE_CURRENT_BINARY_DIR}/precice-FreeFlow-iterations.log
--case-name "flow-over-box-2d-pi" --case-name "flow-over-box-2d-pi"
--relative 1e-6 --relative 5e-6
--zeroThreshold {"velocity_liq \(m/s\)":1e-14,"p":1e-12} --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 # 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_part_flow_over_square_2d_pi_st PROPERTIES set_tests_properties(test_ff_pm_part_flow_over_square_2d_pi_st PROPERTIES
ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/../dumux/bin/testing:$ENV{PYTHONPATH}) ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/test:$ENV{PYTHONPATH})
### Setting test dependencies ### Setting test dependencies
set_property(TEST test_ff_pm_part_flow_over_square_2d_si_st_second APPEND PROPERTY DEPENDS test_ff_pm_part_flow_over_square_2d_si_st_first) set_property(TEST test_ff_pm_part_flow_over_square_2d_si_st_second APPEND PROPERTY DEPENDS test_ff_pm_part_flow_over_square_2d_si_st_first)
...@@ -118,11 +118,11 @@ dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_si_ns_first ...@@ -118,11 +118,11 @@ dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_si_ns_first
--precice-config-file ${CMAKE_SOURCE_DIR}/test/partitioned/flow-over-square-2d/precice-config-si-free-flow-first.xml --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 --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" --case-name "flow-over-box-2d-si-navierstokes-first"
--relative 1e-6 --relative 5e-6
--zeroThreshold {"velocity_liq \(m/s\)":1e-14,"p":1e-12} --zeroThreshold {"velocity_liq \(m/s\)":1e-14,"p":1e-12}
) )
set_tests_properties(test_ff_pm_part_flow_over_square_2d_si_ns_first PROPERTIES set_tests_properties(test_ff_pm_part_flow_over_square_2d_si_ns_first PROPERTIES
ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/../dumux/bin/testing:$ENV{PYTHONPATH}) ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/test:$ENV{PYTHONPATH})
dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_si_ns_second dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_si_ns_second
TARGET test_ff_flow_over_square_2d test_pm_flow_over_square_2d TARGET test_ff_flow_over_square_2d test_pm_flow_over_square_2d
...@@ -139,11 +139,11 @@ dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_si_ns_second ...@@ -139,11 +139,11 @@ dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_si_ns_second
--precice-config-file ${CMAKE_SOURCE_DIR}/test/partitioned/flow-over-square-2d/precice-config-si-free-flow-second.xml --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 --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" --case-name "flow-over-box-2d-si-navierstokes-second"
--relative 1e-6 --relative 5e-6
--zeroThreshold {"velocity_liq \(m/s\)":1e-14,"p":1e-12} --zeroThreshold {"velocity_liq \(m/s\)":1e-14,"p":1e-12}
) )
set_tests_properties(test_ff_pm_part_flow_over_square_2d_si_ns_second PROPERTIES set_tests_properties(test_ff_pm_part_flow_over_square_2d_si_ns_second PROPERTIES
ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/../dumux/bin/testing:$ENV{PYTHONPATH}) ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/test:$ENV{PYTHONPATH})
dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_pi_ns dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_pi_ns
TARGET test_ff_flow_over_square_2d test_pm_flow_over_square_2d TARGET test_ff_flow_over_square_2d test_pm_flow_over_square_2d
...@@ -161,14 +161,14 @@ dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_pi_ns ...@@ -161,14 +161,14 @@ dumux_add_test(NAME test_ff_pm_part_flow_over_square_2d_pi_ns
--precice-iteration-files ${CMAKE_SOURCE_DIR}/test/reference-solutions/partitioned/flow-over-square-2d/test_navierstokes_pi_coupliter_navierstokes.log --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 ${CMAKE_CURRENT_BINARY_DIR}/precice-FreeFlow-iterations.log
--case-name "flow-over-box-2d-pi" --case-name "flow-over-box-2d-pi"
--relative 1e-6 --relative 5e-6
--zeroThreshold {"velocity_liq \(m/s\)":1e-14,"p":1e-12} --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 # 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_part_flow_over_square_2d_pi_ns PROPERTIES set_tests_properties(test_ff_pm_part_flow_over_square_2d_pi_ns PROPERTIES
ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/../dumux/bin/testing:$ENV{PYTHONPATH}) ENVIRONMENT PYTHONPATH=${CMAKE_SOURCE_DIR}/test:$ENV{PYTHONPATH})
# Adding DuMuX directory to Python search path such that we can use DuMuX'x fuzzy (inexact) testing of vtu files # 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_part_flow_over_square_2d_si_ns_first APPEND PROPERTY DEPENDS test_ff_pm_part_flow_over_square_2d_pi_st) set_property(TEST test_ff_pm_part_flow_over_square_2d_si_ns_first APPEND PROPERTY DEPENDS test_ff_pm_part_flow_over_square_2d_pi_st)
set_property(TEST test_ff_pm_part_flow_over_square_2d_si_ns_second APPEND PROPERTY DEPENDS test_ff_pm_part_flow_over_square_2d_si_ns_first) set_property(TEST test_ff_pm_part_flow_over_square_2d_si_ns_second APPEND PROPERTY DEPENDS test_ff_pm_part_flow_over_square_2d_si_ns_first)
set_property(TEST test_ff_pm_part_flow_over_square_2d_pi_ns APPEND PROPERTY DEPENDS test_ff_pm_part_flow_over_square_2d_si_ns_second) set_property(TEST test_ff_pm_part_flow_over_square_2d_pi_ns APPEND PROPERTY DEPENDS test_ff_pm_part_flow_over_square_2d_si_ns_second)
\ No newline at end of file
...@@ -9,12 +9,10 @@ import json ...@@ -9,12 +9,10 @@ import json
try: try:
# Dumux <=3.4 # Dumux <=3.4
from fuzzycomparevtu import compare_vtk from fuzzycomparevtu import compare_vtk
from fuzzycomparedata import compare_data
except ImportError as e: except ImportError as e:
try: try:
# Dumux >3.4 # Dumux >3.4
from fuzzycomparevtu import compareVTK as compare_vtk from fuzzycomparevtu import compareVTK as compare_vtk
from fuzzycomparedata import compareData as compare_data
except ImportError as e: except ImportError as e:
raise e raise e
......
Supports Markdown
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