Commit 281081e3 authored by Ned Coltman's avatar Ned Coltman
Browse files

[test][rans] cleanup compiler macros

parent dd97cc2a
Pipeline #10827 waiting for manual action with stages
......@@ -143,7 +143,7 @@ dumux_add_test(NAME test_ff_ransni_lauferpipe_kepsilon_wallfunction
dumux_add_test(NAME test_ff_ransni_lauferpipe_lowrekepsilon
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=PipeLauferNILowReKEpsilon
COMPILE_DEFINITIONS TYPETAG=PipeLauferNILowReKEpsilon NONISOTHERMAL=1
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
......@@ -152,11 +152,10 @@ dumux_add_test(NAME test_ff_ransni_lauferpipe_lowrekepsilon
${CMAKE_CURRENT_BINARY_DIR}/./test_ff_ransni_lauferpipe_lowrekepsilon-00034.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_ransni_lauferpipe_lowrekepsilon params_nonisothermal.input
-Problem.Name ./test_ff_ransni_lauferpipe_lowrekepsilon")
target_compile_definitions(test_ff_ransni_lauferpipe_lowrekepsilon PUBLIC "NONISOTHERMAL=1")
dumux_add_test(NAME test_ff_ransni_lauferpipe_sst
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=PipeLauferNIKOmegaSST
COMPILE_DEFINITIONS TYPETAG=PipeLauferNIKOmegaSST NONISOTHERMAL=1
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
......@@ -166,12 +165,10 @@ dumux_add_test(NAME test_ff_ransni_lauferpipe_sst
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_ransni_lauferpipe_sst params_nonisothermal.input
-Problem.Name test_ff_ransni_lauferpipe_sst
-RANS.IsFlatWallBounded False")
target_compile_definitions(test_ff_ransni_lauferpipe_sst PUBLIC "NONISOTHERMAL=1")
dumux_add_test(NAME test_ff_ransni_lauferpipe_komega
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=PipeLauferNIKOmega
COMPILE_DEFINITIONS TYPETAG=PipeLauferNIKOmega NONISOTHERMAL=1
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
......@@ -180,11 +177,10 @@ dumux_add_test(NAME test_ff_ransni_lauferpipe_komega
${CMAKE_CURRENT_BINARY_DIR}/test_ff_ransni_lauferpipe_komega-00040.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_ransni_lauferpipe_komega params_nonisothermal.input
-Problem.Name test_ff_ransni_lauferpipe_komega")
target_compile_definitions(test_ff_ransni_lauferpipe_komega PUBLIC "NONISOTHERMAL=1")
dumux_add_test(NAME test_ff_ransni_lauferpipe_oneeq
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=PipeLauferNIOneEq
COMPILE_DEFINITIONS TYPETAG=PipeLauferNIOneEq NONISOTHERMAL=1
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
......@@ -193,11 +189,10 @@ dumux_add_test(NAME test_ff_ransni_lauferpipe_oneeq
${CMAKE_CURRENT_BINARY_DIR}/test_ff_ransni_lauferpipe_oneeq-00037.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_ransni_lauferpipe_oneeq params_nonisothermal.input
-Problem.Name test_ff_ransni_lauferpipe_oneeq")
target_compile_definitions(test_ff_ransni_lauferpipe_oneeq PUBLIC "NONISOTHERMAL=1")
dumux_add_test(NAME test_ff_ransni_lauferpipe_zeroeq
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=PipeLauferNIZeroEq
COMPILE_DEFINITIONS TYPETAG=PipeLauferNIZeroEq NONISOTHERMAL=1
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
......@@ -206,4 +201,3 @@ dumux_add_test(NAME test_ff_ransni_lauferpipe_zeroeq
${CMAKE_CURRENT_BINARY_DIR}/test_ff_ransni_lauferpipe_zeroeq-00033.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_ransni_lauferpipe_zeroeq params_nonisothermal.input
-Problem.Name test_ff_ransni_lauferpipe_zeroeq")
target_compile_definitions(test_ff_ransni_lauferpipe_zeroeq PUBLIC "NONISOTHERMAL=1")
......@@ -95,7 +95,7 @@ dumux_add_test(NAME test_ff_rans2c_zeroeq
#///////////////////////////
add_executable(test_ff_rans2cni_kepsilon EXCLUDE_FROM_ALL main.cc)
target_compile_definitions(test_ff_rans2cni_kepsilon PUBLIC "TYPETAG=FlatPlateNCNIKEpsilon" "NONISOTHERMAL")
target_compile_definitions(test_ff_rans2cni_kepsilon PUBLIC "TYPETAG=FlatPlateNCNIKEpsilon" "NONISOTHERMAL=1")
dumux_add_test(NAME test_ff_rans2cni_kepsilon_twolayer
TARGET test_ff_rans2cni_kepsilon
......@@ -123,8 +123,7 @@ dumux_add_test(NAME test_ff_rans2cni_kepsilon_wallfunction
dumux_add_test(NAME test_ff_rans2cni_komega
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=FlatPlateNCNIKOmega
COMPILE_DEFINITIONS NONISOTHERMAL
COMPILE_DEFINITIONS TYPETAG=FlatPlateNCNIKOmega NONISOTHERMAL=1
LABELS freeflow rans
TIMEOUT 3600
CMAKE_GUARD HAVE_UMFPACK
......@@ -168,7 +167,7 @@ dumux_add_test(NAME test_ff_rans2cni_sst
dumux_add_test(NAME test_ff_rans2cni_lowrekepsilon
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=FlatPlateNCNILowReKEpsilon
COMPILE_DEFINITIONS TYPETAG=FlatPlateNCNILowReKEpsilon NONISOTHERMAL=1
LABELS freeflow rans
TIMEOUT 3600
CMAKE_GUARD HAVE_UMFPACK
......@@ -178,11 +177,10 @@ dumux_add_test(NAME test_ff_rans2cni_lowrekepsilon
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_lowrekepsilon-00030.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_lowrekepsilon params_nonisothermal.input
-Problem.Name test_ff_rans2cni_lowrekepsilon")
target_compile_definitions(test_ff_rans2cni_lowrekepsilon PUBLIC "NONISOTHERMAL")
dumux_add_test(NAME test_ff_rans2cni_oneeq
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=FlatPlateNCNIOneEq
COMPILE_DEFINITIONS TYPETAG=FlatPlateNCNIOneEq NONISOTHERMAL=1
LABELS freeflow rans
TIMEOUT 3600
CMAKE_GUARD HAVE_UMFPACK
......@@ -193,11 +191,9 @@ dumux_add_test(NAME test_ff_rans2cni_oneeq
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_oneeq params_nonisothermal.input
-Problem.Name test_ff_rans2cni_oneeq")
target_compile_definitions(test_ff_rans2cni_oneeq PUBLIC "NONISOTHERMAL")
dumux_add_test(NAME test_ff_rans2cni_zeroeq
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=FlatPlateNCNIZeroEq
COMPILE_DEFINITIONS TYPETAG=FlatPlateNCNIZeroEq NONISOTHERMAL=1
LABELS freeflow rans
TIMEOUT 3600
CMAKE_GUARD HAVE_UMFPACK
......@@ -207,4 +203,3 @@ dumux_add_test(NAME test_ff_rans2cni_zeroeq
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_zeroeq-00030.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_zeroeq params_nonisothermal.input
-Problem.Name test_ff_rans2cni_zeroeq")
target_compile_definitions(test_ff_rans2cni_zeroeq PUBLIC "NONISOTHERMAL")
Markdown is supported
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