Skip to content
Snippets Groups Projects
Commit 61af8b82 authored by Ned Coltman's avatar Ned Coltman
Browse files

Merge branch 'cherry-pick-fb060f27' into 'releases/3.2'

Merge branch 'fix/co2-parallel-tests' into 'master'

See merge request !2048
parents 9d201c7c 51f4152a
No related branches found
No related tags found
2 merge requests!2152WIP add default fluxcache properties,!2048Merge branch 'fix/co2-parallel-tests' into 'master'
...@@ -42,9 +42,7 @@ dumux_add_test(NAME test_co2_box_parallel ...@@ -42,9 +42,7 @@ dumux_add_test(NAME test_co2_box_parallel
CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )" CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100,"porosity":1} CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100,"porosity":1}
--files ${CMAKE_SOURCE_DIR}/test/references/test_co2_box_parallel-reference.vtu --files ${CMAKE_SOURCE_DIR}/test/references/test_co2_box-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-p0000-test_co2_box_parallel-00028.vtu
${CMAKE_SOURCE_DIR}/test/references/test_co2_box-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-test_co2_box_parallel-00028.pvtu ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_co2_box_parallel-00028.pvtu
--command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_co2_box params.input -Problem.Name test_co2_box_parallel") --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_co2_box params.input -Problem.Name test_co2_box_parallel")
...@@ -108,8 +106,6 @@ dumux_add_test(NAME test_co2ni_tpfa_parallel ...@@ -108,8 +106,6 @@ dumux_add_test(NAME test_co2ni_tpfa_parallel
CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )" CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )"
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100} CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100}
--files ${CMAKE_SOURCE_DIR}/test/references/test_co2ni_tpfa_parallel-reference.vtu --files ${CMAKE_SOURCE_DIR}/test/references/test_co2ni_tpfa-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-p0000-test_co2ni_tpfa_parallel-00028.vtu
${CMAKE_SOURCE_DIR}/test/references/test_co2ni_tpfa-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/s0002-test_co2ni_tpfa_parallel-00028.pvtu ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_co2ni_tpfa_parallel-00028.pvtu
--command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_co2ni_tpfa paramsni.input -Problem.Name test_co2ni_tpfa_parallel") --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_co2ni_tpfa paramsni.input -Problem.Name test_co2ni_tpfa_parallel")
This diff is collapsed.
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment