Commit 7dea3f49 authored by Ned Coltman's avatar Ned Coltman
Browse files

[test][ransnc] update compositional test problem to use general RANS set up

parent 8815cd33
add_input_file_links()
dune_add_test(NAME test_ff_rans2c_kepsilon
# isothermal tests
add_executable(test_ff_rans2c_kepsilon EXCLUDE_FROM_ALL main.cc)
target_compile_definitions(test_ff_rans2c_kepsilon PUBLIC "TYPETAG=FlatPlateNCKEpsilon")
dune_add_test(NAME test_ff_rans2c_kepsilon_twolayer
TARGET test_ff_rans2c_kepsilon
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans2c_kepsilon_twolayer-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_kepsilon_twolayer-00031.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_kepsilon params.input
-Problem.Name test_ff_rans2c_kepsilon_twolayer")
dune_add_test(NAME test_ff_rans2c_kepsilon_wallfunctions
TARGET test_ff_rans2c_kepsilon
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans2c_kepsilon_wallfunctions-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_kepsilon_wallfunctions-00028.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_kepsilon params_wallfunction.input
-Problem.Name test_ff_rans2c_kepsilon_wallfunctions")
dune_add_test(NAME test_ff_rans2c_komega
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=FlatPlateNCLowReKEpsilon
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans2c_komega-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_komega-00031.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_komega params.input
-Problem.Name test_ff_rans2c_komega")
dune_add_test(NAME test_ff_rans2c_lowrekepsilon
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=FlatPlateNCKOmega
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans2c_lowrekepsilon-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_lowrekepsilon-00036.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_lowrekepsilon params.input
-Problem.Name test_ff_rans2c_lowrekepsilon")
dune_add_test(NAME test_ff_rans2c_oneeq
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=FlatPlateNCOneEq
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans2c_oneeq-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_oneeq-00032.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_oneeq params.input
-Problem.Name test_ff_rans2c_oneeq")
dune_add_test(NAME test_ff_rans2c_zeroeq
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=FlatPlateNCZeroEq
LABELS freeflow rans
COMPILE_ONLY CMAKE_GUARD HAVE_UMFPACK)
target_compile_definitions(test_ff_rans2c_kepsilon PUBLIC "KEPSILON=1")
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans2c_zeroeq-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_zeroeq-00029.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_zeroeq params.input
-Problem.Name test_ff_rans2c_zeroeq")
#///////////////////////////
#/// Nonisothermal tests ///
#///////////////////////////
add_executable(test_ff_rans2cni_kepsilon EXCLUDE_FROM_ALL main.cc)
target_compile_definitions(test_ff_rans2cni_kepsilon PUBLIC "KEPSILON=1" "NONISOTHERMAL=1")
target_compile_definitions(test_ff_rans2cni_kepsilon PUBLIC "TYPETAG=FlatPlateNCNIKEpsilon" "NONISOTHERMAL")
dune_add_test(NAME test_ff_rans2cni_kepsilon_twolayer
TARGET test_ff_rans2cni_kepsilon
......@@ -28,17 +101,12 @@ dune_add_test(NAME test_ff_rans2cni_kepsilon_wallfunction
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans2cni_kepsilon_wallfunction-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_kepsilon_wallfunction-00024.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_kepsilon params_niwallfunction.input
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_kepsilon params_nonisothermal_wallfunction.input
-Problem.Name test_ff_rans2cni_kepsilon_wallfunction")
dune_add_test(NAME test_ff_rans2c_komega
SOURCES main.cc
LABELS freeflow rans
COMPILE_ONLY CMAKE_GUARD HAVE_UMFPACK)
target_compile_definitions(test_ff_rans2c_komega PUBLIC "KOMEGA=1")
dune_add_test(NAME test_ff_rans2cni_komega
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=FlatPlateNCNIKOmega
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
......@@ -48,16 +116,11 @@ dune_add_test(NAME test_ff_rans2cni_komega
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_komega params_nonisothermal.input
-Problem.Name test_ff_rans2cni_komega
-Newton.TargetSteps 12")
target_compile_definitions(test_ff_rans2cni_komega PUBLIC "KOMEGA=1" "NONISOTHERMAL=1")
dune_add_test(NAME test_ff_rans2c_lowrekepsilon
SOURCES main.cc
LABELS freeflow rans
COMPILE_ONLY CMAKE_GUARD HAVE_UMFPACK)
target_compile_definitions(test_ff_rans2c_lowrekepsilon PUBLIC "LOWREKEPSILON=1")
target_compile_definitions(test_ff_rans2cni_komega PUBLIC "NONISOTHERMAL")
dune_add_test(NAME test_ff_rans2cni_lowrekepsilon
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=FlatPlateNCNILowReKEpsilon
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
......@@ -66,16 +129,11 @@ dune_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 "LOWREKEPSILON=1" "NONISOTHERMAL=1")
dune_add_test(NAME test_ff_rans2c_oneeq
SOURCES main.cc
LABELS freeflow rans
COMPILE_ONLY CMAKE_GUARD HAVE_UMFPACK)
target_compile_definitions(test_ff_rans2c_oneeq PUBLIC "ONEEQ=1")
target_compile_definitions(test_ff_rans2cni_lowrekepsilon PUBLIC "NONISOTHERMAL")
dune_add_test(NAME test_ff_rans2cni_oneeq
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=FlatPlateNCNIOneEq
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
......@@ -84,21 +142,12 @@ dune_add_test(NAME test_ff_rans2cni_oneeq
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2cni_oneeq-00031.vtu
--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 "ONEEQ=1" "NONISOTHERMAL=1")
dune_add_test(NAME test_ff_rans2c_zeroeq
SOURCES main.cc
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans2c_zeroeq.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_zeroeq-00029.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans2c_zeroeq params.input
-Problem.Name test_ff_rans2c_zeroeq")
target_compile_definitions(test_ff_rans2cni_oneeq PUBLIC "NONISOTHERMAL")
dune_add_test(NAME test_ff_rans2cni_zeroeq
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=FlatPlateNCNIZeroEq
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
......@@ -107,4 +156,4 @@ dune_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=1")
target_compile_definitions(test_ff_rans2cni_zeroeq PUBLIC "NONISOTHERMAL")
......@@ -72,7 +72,7 @@ int main(int argc, char** argv) try
using namespace Dumux;
// define the type tag for this problem
using TypeTag = Properties::TTag::FlatPlateNCTest;
using TypeTag = Properties::TTag::TYPETAG;
// initialize MPI, finalize is done automatically on exit
const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
......
......@@ -13,7 +13,10 @@ Grading1 = 1.4
[Problem]
Name = test_ff_rans2c # name passed to the output routines
InletVelocity = 0.1 # [m/s]
WallTemperature = 313.15
InletTemperature = 283.15
EnableGravity = false
InletMoleFraction = 1e-3
[RANS]
EddyViscosityModel = "prandtl"
......@@ -24,6 +27,5 @@ NumericDifferenceMethod = 0
NumericEpsilon.BaseEpsilon = 1e-8
[Newton]
MaxSteps = 10
TargetSteps = 8
MaxRelativeShift = 1e-5
MaxSteps = 8
MaxRelativeShift = 1e-9
[TimeLoop]
DtInitial = 1e-3 # [s]
TEnd = 1000 # [s]
[Grid]
Verbosity = true
Positions0 = 0.0 6.0
Positions1 = 0.0 0.5
Cells0 = 10
Cells1 = 5
[Problem]
Name = test_ff_rans2c # name passed to the output routines
InletVelocity = 0.1 # [m/s]
WallTemperature = 313.15
InletTemperature = 283.15
EnableGravity = false
InletMoleFraction = 1e-3
[RANS]
TurbulentSchmidtNumber = 0.7
TurbulentPrandtlNumber = 0.85
[KEpsilon]
YPlusThreshold = 10. # should be small (10-30) for coarse grids
[Assembly]
NumericDifferenceMethod = 0
NumericEpsilon.BaseEpsilon = 1e-8
[Newton]
MaxSteps = 10
TargetSteps = 8
MaxRelativeShift = 1e-5
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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