From ab059d5efd911b9e7af82aef486c3860a4273e44 Mon Sep 17 00:00:00 2001
From: melaniel <melanie.lipp@iws.uni-stuttgart.de>
Date: Wed, 26 Jun 2019 17:37:51 +0200
Subject: [PATCH] [test][freeflow][sincos] Reduce to one input file.
---
.../navierstokes/sincos/CMakeLists.txt | 19 +++++++----
...params_instationary.input => params.input} | 3 +-
.../sincos/params_stationary.input | 32 -------------------
3 files changed, 14 insertions(+), 40 deletions(-)
rename test/freeflow/navierstokes/sincos/{params_instationary.input => params.input} (86%)
delete mode 100644 test/freeflow/navierstokes/sincos/params_stationary.input
diff --git a/test/freeflow/navierstokes/sincos/CMakeLists.txt b/test/freeflow/navierstokes/sincos/CMakeLists.txt
index a9e52c26ec..b2cb92fb09 100644
--- a/test/freeflow/navierstokes/sincos/CMakeLists.txt
+++ b/test/freeflow/navierstokes/sincos/CMakeLists.txt
@@ -1,14 +1,17 @@
dune_symlink_to_source_files(FILES "convergencetest.py")
-dune_symlink_to_source_files(FILES "params_stationary.input")
-dune_symlink_to_source_files(FILES "params_instationary.input")
+dune_symlink_to_source_files(FILES "params.input")
dune_add_test(NAME test_ff_navierstokes_sincos
SOURCES main.cc
LABELS freeflow
CMAKE_GUARD HAVE_UMFPACK
COMMAND ./convergencetest.py
- CMD_ARGS test_ff_navierstokes_sincos params_stationary.input -Grid.Cells "150 150"
- -Problem.Name test_ff_navierstokes_sincos_stationary_convergence)
+ CMD_ARGS test_ff_navierstokes_sincos params.input
+ -Grid.UpperRight "6.28 6.28"
+ -Grid.Cells "150 150"
+ -Problem.Name test_ff_navierstokes_sincos_stationary_convergence
+ -Problem.IsStationary true
+ -Component.LiquidKinematicViscosity 0.001)
dune_add_test(NAME test_ff_navierstokes_sincos_instationary
TARGET test_ff_navierstokes_sincos
@@ -18,5 +21,9 @@ dune_add_test(NAME test_ff_navierstokes_sincos_instationary
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_navierstokes_sincos_instationary-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_ff_navierstokes_sincos_instationary-00017.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_navierstokes_sincos params_instationary.input
- -Problem.Name test_ff_navierstokes_sincos_instationary")
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_ff_navierstokes_sincos params.input
+ -Grid.UpperRight '1 1'
+ -Grid.Cells '50 50'
+ -Problem.Name test_ff_navierstokes_sincos_instationary
+ -Problem.IsStationary false
+ -Component.LiquidKinematicViscosity 0.1")
diff --git a/test/freeflow/navierstokes/sincos/params_instationary.input b/test/freeflow/navierstokes/sincos/params.input
similarity index 86%
rename from test/freeflow/navierstokes/sincos/params_instationary.input
rename to test/freeflow/navierstokes/sincos/params.input
index 8a5f8cfd08..80f5d2beca 100644
--- a/test/freeflow/navierstokes/sincos/params_instationary.input
+++ b/test/freeflow/navierstokes/sincos/params.input
@@ -5,10 +5,9 @@ TEnd = 1.0 # [s]
[Grid]
LowerLeft = 0 0
UpperRight = 1 1
-Cells = 50 50
[Problem]
-Name = test_sincos_instationary # name passed to the output routines
+Name = test_ff_sincos
EnableGravity = false
PrintL2Error = true
EnableInertiaTerms = true
diff --git a/test/freeflow/navierstokes/sincos/params_stationary.input b/test/freeflow/navierstokes/sincos/params_stationary.input
deleted file mode 100644
index d32af9f9ff..0000000000
--- a/test/freeflow/navierstokes/sincos/params_stationary.input
+++ /dev/null
@@ -1,32 +0,0 @@
-[TimeLoop]
-DtInitial = 0.01 # [s]
-TEnd = 1.0 # [s]
-
-[Grid]
-UpperRight = 6.28 6.28
-Cells = 50 50
-
-[Problem]
-Name = test_sincos_stationary # name passed to the output routines
-EnableGravity = false
-PrintL2Error = true
-EnableInertiaTerms = true
-IsStationary = true
-
-[Component]
-LiquidDensity = 1.0
-LiquidKinematicViscosity = 0.001
-
-[Newton]
-MaxSteps = 10
-MaxRelativeShift = 1e-5
-SatisfyResidualAndShiftCriterion = true
-EnableAbsoluteResidualCriterion = true
-MaxAbsoluteResidual = 1e-10
-
-[Vtk]
-WriteFaceData = false
-AddProcessRank = false
-
-[Flux]
-UpwindWeight = 0.5
--
GitLab