Commit 8815cd33 authored by Kilian Weishaupt's avatar Kilian Weishaupt Committed by Ned Coltman
Browse files

[test][rans] Use generalized RANS problem

parent 90725dd0
......@@ -2,10 +2,11 @@ add_input_file_links()
dune_symlink_to_source_files(FILES references scripts)
add_executable(test_ff_rans_lauferpipe_kepsilon EXCLUDE_FROM_ALL main.cc)
target_compile_definitions(test_ff_rans_lauferpipe_kepsilon PUBLIC "KEPSILON=1")
target_compile_definitions(test_ff_rans_lauferpipe_kepsilon PUBLIC "TYPETAG=PipeLauferKEpsilon")
dune_add_test(NAME test_ff_rans_lauferpipe_kepsilon_twolayers
TARGET test_ff_rans_lauferpipe_kepsilon
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
......@@ -16,8 +17,8 @@ dune_add_test(NAME test_ff_rans_lauferpipe_kepsilon_twolayers
dune_add_test(NAME test_ff_rans_lauferpipe_kepsilon_wallfunction
TARGET test_ff_rans_lauferpipe_kepsilon
CMAKE_GUARD HAVE_UMFPACK
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_rans_lauferpipe_kepsilon_wallfunction-reference.vtu
......@@ -27,6 +28,7 @@ dune_add_test(NAME test_ff_rans_lauferpipe_kepsilon_wallfunction
dune_add_test(NAME test_ff_rans_lauferpipe_lowrekepsilon
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=PipeLauferLowReKEpsilon
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
......@@ -35,10 +37,10 @@ dune_add_test(NAME test_ff_rans_lauferpipe_lowrekepsilon
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_lowrekepsilon-00053.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_lowrekepsilon params.input
-Problem.Name test_ff_rans_lauferpipe_lowrekepsilon")
target_compile_definitions(test_ff_rans_lauferpipe_lowrekepsilon PUBLIC "LOWREKEPSILON=1")
dune_add_test(NAME test_ff_rans_lauferpipe_komega
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=PipeLauferKOmega
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
......@@ -47,10 +49,10 @@ dune_add_test(NAME test_ff_rans_lauferpipe_komega
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_komega-00049.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_komega params.input
-Problem.Name test_ff_rans_lauferpipe_komega")
target_compile_definitions(test_ff_rans_lauferpipe_komega PUBLIC "KOMEGA=1")
dune_add_test(NAME test_ff_rans_lauferpipe_oneeq
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=PipeLauferOneEq
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
......@@ -59,10 +61,10 @@ dune_add_test(NAME test_ff_rans_lauferpipe_oneeq
${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_oneeq-00044.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_oneeq params.input
-Problem.Name test_ff_rans_lauferpipe_oneeq")
target_compile_definitions(test_ff_rans_lauferpipe_oneeq PUBLIC "ONEEQ=1")
dune_add_test(NAME test_ff_rans_lauferpipe_zeroeq
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=PipeLauferZeroEq
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
......@@ -72,14 +74,83 @@ dune_add_test(NAME test_ff_rans_lauferpipe_zeroeq
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_rans_lauferpipe_zeroeq params.input
-Problem.Name test_ff_rans_lauferpipe_zeroeq")
dune_add_test(NAME test_ff_ransni_zeroeq
#///////////////////////////////
#/// The nonisothermal tests ///
#///////////////////////////////
add_executable(test_ff_ransni_lauferpipe_kepsilon EXCLUDE_FROM_ALL main.cc)
target_compile_definitions(test_ff_ransni_lauferpipe_kepsilon PUBLIC "TYPETAG=PipeLauferNIKEpsilon" "NONISOTHERMAL=1")
dune_add_test(NAME test_ff_ransni_lauferpipe_kepsilon_twolayers
TARGET test_ff_ransni_lauferpipe_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_ransni_lauferpipe_kepsilon_twolayers-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_ransni_lauferpipe_kepsilon_twolayers-00034.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_ransni_lauferpipe_kepsilon params_nonisothermal.input
-Problem.Name test_ff_ransni_lauferpipe_kepsilon_twolayers")
dune_add_test(NAME test_ff_ransni_lauferpipe_kepsilon_wallfunction
TARGET test_ff_ransni_lauferpipe_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_ransni_lauferpipe_kepsilon_wallfunction-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_ransni_lauferpipe_kepsilon_wallfunction-00027.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_ransni_lauferpipe_kepsilon params_nonisothermal_wallfunction.input
-Problem.Name test_ff_ransni_lauferpipe_kepsilon_wallfunction")
dune_add_test(NAME test_ff_ransni_lauferpipe_lowrekepsilon
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=PipeLauferNILowReKEpsilon
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_ransni_lauferpipe_lowrekepsilon-reference.vtu
${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")
dune_add_test(NAME test_ff_ransni_lauferpipe_komega
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=PipeLauferNIKOmega
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_ransni_lauferpipe_komega-reference.vtu
${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")
dune_add_test(NAME test_ff_ransni_lauferpipe_oneeq
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=PipeLauferNIOneEq
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_ransni_lauferpipe_oneeq-reference.vtu
${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")
dune_add_test(NAME test_ff_ransni_lauferpipe_zeroeq
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=PipeLauferNIZeroEq
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_ransni_zeroeq-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_ransni_zeroeq-00031.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_ransni_zeroeq params_nonisothermal.input
-Problem.Name test_ff_ransni_zeroeq")
target_compile_definitions(test_ff_ransni_zeroeq PUBLIC "NONISOTHERMAL=1")
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_ransni_lauferpipe_zeroeq-reference.vtu
${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")
......@@ -24,7 +24,6 @@
* This test simulates is based on pipe flow experiments by
* John Laufers experiments in 1954 \cite Laufer1954a.
*/
#include <config.h>
#include <ctime>
......@@ -46,6 +45,7 @@
#include <dumux/io/staggeredvtkoutputmodule.hh>
#include <dumux/linear/seqsolverbackend.hh>
#include <dumux/nonlinear/newtonsolver.hh>
#include <dumux/discretization/method.hh>
#include "problem.hh"
......@@ -75,7 +75,7 @@ int main(int argc, char** argv) try
using namespace Dumux;
// define the type tag for this problem
using TypeTag = Properties::TTag::PipeLauferProblem;
using TypeTag = Properties::TTag::TYPETAG;
// initialize MPI, finalize is done automatically on exit
const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
......
[TimeLoop]
DtInitial = 10e-3 # [s]
TEnd = 43200 # [s]
DtInitial = 1e-3 # [s]
TEnd = 400 # [s]
MaxTimeStepSize = 50 # [s]
[Grid]
Verbosity = true
Positions0 = 0.0 10.0
Positions1 = 0.0 1.2345 2.469
Cells0 = 16
Cells1 = 8 8
Grading1 = 1.5 -1.5
Positions0 = 0.0 5.0
Positions1 = 0.0 0.12345 0.2469
Cells0 = 8
Cells1 = 14 14
Grading1 = 1.35 -1.35
[Problem]
Name = pipe_zeroeqni
......@@ -19,14 +20,16 @@ EnableGravity = false
[RANS]
EddyViscosityModel = "baldwinLomax"
TurbulentPrandtlNumber = 0.85
[Assembly]
NumericDifferenceMethod = 0
NumericDifference.BaseEpsilon = 1e-8
[Newton]
MaxSteps = 10
MaxRelativeShift = 1e-5
MaxSteps = 8
MaxRelativeShift = 1e-9
[Vtk]
WriteFaceData = false
[TimeLoop]
DtInitial = 10e-3 # [s]
TEnd = 1000 # [s]
[Grid]
Verbosity = true
Positions0 = 0.0 5.0
Positions1 = 0.0 0.12345 0.2469
Cells0 = 10
Cells1 = 10 10
[Problem]
Name = pipe_niwallfunciton
InletVelocity = 0.25 # [m/s]
InletTemperature = 283.15 # [K]
WallTemperature = 293.15 # [K]
EnableGravity = false
[KEpsilon]
YPlusThreshold = 10. # should be small (10-30) for coarse grids
[RANS]
TurbulentPrandtlNumber = 0.85
[Assembly]
NumericDifferenceMethod = 0
NumericDifference.BaseEpsilon = 1e-8
[Newton]
TargetSteps = 10
MaxRelativeShift = 1e-8
[Vtk]
WriteFaceData = true
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