Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dumux-repositories
dumux
Commits
f1a8c705
Commit
f1a8c705
authored
Mar 05, 2021
by
Timo Koch
Browse files
Merge branch 'fix/add_cmake_guards_pnm' into 'master'
[test] Add CMAKE_GUARDs for PNM tests See merge request
!2508
parents
e3b47865
01851e53
Changes
6
Hide whitespace changes
Inline
Side-by-side
test/io/gridmanager/CMakeLists.txt
View file @
f1a8c705
...
...
@@ -305,6 +305,7 @@ add_executable(test_pnm_gridmanager EXCLUDE_FROM_ALL test_pnm_gridmanager.cc)
dumux_add_test
(
NAME test_pnm_gridmanager_constant_params
LABELS unit io porenetwork
TARGET test_pnm_gridmanager
CMAKE_GUARD dune-foamgrid_FOUND
COMMAND
${
CMAKE_SOURCE_DIR
}
/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files
${
CMAKE_SOURCE_DIR
}
/test/references/pnm_gridmanager-3d-constant.vtp
...
...
@@ -383,4 +384,6 @@ dumux_add_test(NAME test_pnm_gridmanager_remove_throats_on_boundary_all
COMMAND
${
CMAKE_CURRENT_BINARY_DIR
}
/test_pnm_gridmanager
CMD_ARGS test_remove-troats-on-boundary.input -Grid.RemoveThroatsOnBoundary
"0 1 2 3"
)
dumux_add_test
(
SOURCES test_pnm_subgriddata.cc LABELS unit io porenetwork
)
dumux_add_test
(
SOURCES test_pnm_subgriddata.cc
LABELS unit io porenetwork
CMAKE_GUARD dune-foamgrid_FOUND
)
test/porenetwork/1p/CMakeLists.txt
View file @
f1a8c705
...
...
@@ -8,6 +8,7 @@ dumux_add_test(NAME test_pnm_1p
LABELS porenetwork
COMPILE_DEFINITIONS ISOTHERMAL=1
COMMAND
${
CMAKE_SOURCE_DIR
}
/bin/testing/runtest.py
CMAKE_GUARD
"( dune-foamgrid_FOUND AND HAVE_UMFPACK )"
CMD_ARGS --script fuzzy
--files
${
CMAKE_SOURCE_DIR
}
/test/references/test_pnm_1p-reference.vtp
${
CMAKE_CURRENT_BINARY_DIR
}
/test_pnm_1p-00000.vtp
...
...
@@ -18,6 +19,7 @@ dumux_add_test(NAME test_pnm_1p_gravity
LABELS porenetwork
COMPILE_DEFINITIONS ISOTHERMAL=1
COMMAND
${
CMAKE_SOURCE_DIR
}
/bin/testing/runtest.py
CMAKE_GUARD
"( dune-foamgrid_FOUND AND HAVE_UMFPACK )"
CMD_ARGS --script fuzzy --zeroThreshold {
"velocity_liq
\(
m/s
\)
"
:1e-15,
"volumeFlux"
:1e-25}
--files
${
CMAKE_SOURCE_DIR
}
/test/references/test_pnm_1p_gravity-reference.vtp
${
CMAKE_CURRENT_BINARY_DIR
}
/test_pnm_1p_gravity-00000.vtp
...
...
test/porenetwork/1p/nonisothermal/CMakeLists.txt
View file @
f1a8c705
...
...
@@ -5,6 +5,7 @@ dumux_add_test(NAME test_pnm_1pni
LABELS porenetwork
COMPILE_DEFINITIONS ISOTHERMAL=0
COMMAND
${
CMAKE_SOURCE_DIR
}
/bin/testing/runtest.py
CMAKE_GUARD
"( dune-foamgrid_FOUND AND HAVE_UMFPACK )"
CMD_ARGS --script fuzzy
--files
${
CMAKE_SOURCE_DIR
}
/test/references/test_pnm_1pni-reference.vtp
${
CMAKE_CURRENT_BINARY_DIR
}
/test_pnm_1pni-00014.vtp
...
...
test/porenetwork/1pnc/CMakeLists.txt
View file @
f1a8c705
...
...
@@ -7,6 +7,7 @@ dumux_add_test(NAME test_pnm_1p2c_advection
TARGET test_pnm_1p2c
LABELS porenetwork
COMMAND
${
CMAKE_SOURCE_DIR
}
/bin/testing/runtest.py
CMAKE_GUARD
"( dune-foamgrid_FOUND AND HAVE_UMFPACK )"
CMD_ARGS --script fuzzy
--files
${
CMAKE_SOURCE_DIR
}
/test/references/test_pnm_1p2c-reference.vtp
${
CMAKE_CURRENT_BINARY_DIR
}
/test_pnm_1p2c-00055.vtp
...
...
@@ -16,6 +17,7 @@ dumux_add_test(NAME test_pnm_1p2c_diffusion
TARGET test_pnm_1p2c
LABELS porenetwork
COMMAND
${
CMAKE_SOURCE_DIR
}
/bin/testing/runtest.py
CMAKE_GUARD
"( dune-foamgrid_FOUND AND HAVE_UMFPACK )"
CMD_ARGS --script fuzzy
--files
${
CMAKE_SOURCE_DIR
}
/test/references/test_pnm_1p2c_diffusion-reference.vtp
${
CMAKE_CURRENT_BINARY_DIR
}
/test_pnm_1p2c_diffusion-00054.vtp
...
...
@@ -26,6 +28,7 @@ dumux_add_test(NAME test_pnm_1p2cni
LABELS porenetwork
COMPILE_DEFINITIONS ISOTHERMAL=0
COMMAND
${
CMAKE_SOURCE_DIR
}
/bin/testing/runtest.py
CMAKE_GUARD
"( dune-foamgrid_FOUND AND HAVE_UMFPACK )"
CMD_ARGS --script fuzzy
--files
${
CMAKE_SOURCE_DIR
}
/test/references/test_pnm_1p2cni-reference.vtp
${
CMAKE_CURRENT_BINARY_DIR
}
/test_pnm_1p2cni-00056.vtp
...
...
test/porenetwork/2p/CMakeLists.txt
View file @
f1a8c705
...
...
@@ -7,6 +7,7 @@ dumux_add_test(NAME test_pnm_2p
LABELS porenetwork
COMPILE_DEFINITIONS ISOTHERMAL=1
COMMAND
${
CMAKE_SOURCE_DIR
}
/bin/testing/runtest.py
CMAKE_GUARD
"( dune-foamgrid_FOUND AND HAVE_UMFPACK )"
CMD_ARGS --script fuzzy
--files
${
CMAKE_SOURCE_DIR
}
/test/references/test_pnm_2p-reference.vtp
${
CMAKE_CURRENT_BINARY_DIR
}
/test_pnm_2p-00107.vtp
...
...
@@ -17,6 +18,7 @@ dumux_add_test(NAME test_pnm_2pni
LABELS porenetwork
COMPILE_DEFINITIONS ISOTHERMAL=0
COMMAND
${
CMAKE_SOURCE_DIR
}
/bin/testing/runtest.py
CMAKE_GUARD
"( dune-foamgrid_FOUND AND HAVE_UMFPACK )"
CMD_ARGS --script fuzzy
--files
${
CMAKE_SOURCE_DIR
}
/test/references/test_pnm_2pni-reference.vtp
${
CMAKE_CURRENT_BINARY_DIR
}
/test_pnm_2pni-00133.vtp
...
...
test/porenetwork/2p/static/CMakeLists.txt
View file @
f1a8c705
...
...
@@ -4,6 +4,7 @@ dumux_add_test(NAME test_pnm_2p_static
SOURCES main.cc
LABELS porenetwork
COMMAND
${
CMAKE_SOURCE_DIR
}
/bin/testing/runtest.py
CMAKE_GUARD
"( dune-foamgrid_FOUND AND HAVE_UMFPACK )"
CMD_ARGS --script fuzzyData
--files
${
CMAKE_SOURCE_DIR
}
/test/references/test_pnm_2p_static-reference.txt
${
CMAKE_CURRENT_BINARY_DIR
}
/test_pnm_2p_static_pc-s-curve.txt
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment