From 2cbe3d4443505214c7b85e2100e62815f19d72c0 Mon Sep 17 00:00:00 2001
From: Thomas Fetzer <thomas.fetzer@iws.uni-stuttgart.de>
Date: Mon, 28 May 2018 14:04:35 +0200
Subject: [PATCH] [freeflow][rans] Clean-up and small improvements
---
dumux/freeflow/rans/twoeq/kepsilon/problem.hh | 4 ++--
.../rans/twoeq/kepsilon/staggered/fluxvariables.hh | 2 +-
test/freeflow/rans/pipelauferproblem.hh | 12 ++++++++----
test/freeflow/rans/test_pipe_laufer.cc | 2 --
test/freeflow/ransnc/test_flatplate.cc | 2 --
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dumux/freeflow/rans/twoeq/kepsilon/problem.hh b/dumux/freeflow/rans/twoeq/kepsilon/problem.hh
index ee092ba00d..6bf7e2b126 100644
--- a/dumux/freeflow/rans/twoeq/kepsilon/problem.hh
+++ b/dumux/freeflow/rans/twoeq/kepsilon/problem.hh
@@ -21,8 +21,8 @@
* \ingroup KEpsilonModel
* \copydoc Dumux::KEpsilonProblem
*/
-#ifndef DUMUX_REKEPSILON_PROBLEM_HH
-#define DUMUX_REKEPSILON_PROBLEM_HH
+#ifndef DUMUX_KEPSILON_PROBLEM_HH
+#define DUMUX_KEPSILON_PROBLEM_HH
#include <dumux/common/properties.hh>
#include <dumux/common/staggeredfvproblem.hh>
diff --git a/dumux/freeflow/rans/twoeq/kepsilon/staggered/fluxvariables.hh b/dumux/freeflow/rans/twoeq/kepsilon/staggered/fluxvariables.hh
index f799f1f653..d2b5364cb3 100644
--- a/dumux/freeflow/rans/twoeq/kepsilon/staggered/fluxvariables.hh
+++ b/dumux/freeflow/rans/twoeq/kepsilon/staggered/fluxvariables.hh
@@ -117,7 +117,7 @@ public:
Scalar insideCoeff_e = insideVolVars.kinematicEddyViscosity() / insideVolVars.sigmaEpsilon();
Scalar outsideCoeff_e = outsideVolVars.kinematicEddyViscosity() / outsideVolVars.sigmaEpsilon();
static const auto kEpsilonEnableKinematicViscosity_
- = getParamFromGroup<bool>(problem.paramGroup(), "KEpsilon.EnableKinematicViscosity_", true);
+ = getParamFromGroup<bool>(problem.paramGroup(), "KEpsilon.EnableKinematicViscosity", true);
if (kEpsilonEnableKinematicViscosity_)
{
insideCoeff_k += insideVolVars.kinematicViscosity();
diff --git a/test/freeflow/rans/pipelauferproblem.hh b/test/freeflow/rans/pipelauferproblem.hh
index 2442b49f04..d69ba41ddc 100644
--- a/test/freeflow/rans/pipelauferproblem.hh
+++ b/test/freeflow/rans/pipelauferproblem.hh
@@ -151,12 +151,16 @@ public:
Scalar density = FluidSystem::density(fluidState, phaseIdx);
Scalar kinematicViscosity = FluidSystem::viscosity(fluidState, phaseIdx) / density;
Scalar diameter = this->fvGridGeometry().bBoxMax()[1] - this->fvGridGeometry().bBoxMin()[1];
- viscosityTilde_ = turbulenceProperties.viscosityTilde(inletVelocity_, diameter, kinematicViscosity);
- turbulentKineticEnergy_ = turbulenceProperties.turbulentKineticEnergy(inletVelocity_, diameter, kinematicViscosity);
+ viscosityTilde_ = getParam<Scalar>("Problem.InletViscosityTilde",
+ turbulenceProperties.viscosityTilde(inletVelocity_, diameter, kinematicViscosity));
+ turbulentKineticEnergy_ = getParam<Scalar>("Problem.InletTurbulentKineticEnergy",
+ turbulenceProperties.turbulentKineticEnergy(inletVelocity_, diameter, kinematicViscosity));
#if KOMEGA
- dissipation_ = turbulenceProperties.dissipationRate(inletVelocity_, diameter, kinematicViscosity);
+ dissipation_ = getParam<Scalar>("Problem.InletDissipationRate",
+ turbulenceProperties.dissipationRate(inletVelocity_, diameter, kinematicViscosity));
#else
- dissipation_ = turbulenceProperties.dissipation(inletVelocity_, diameter, kinematicViscosity);
+ dissipation_ = getParam<Scalar>("Problem.InletDissipation",
+ turbulenceProperties.dissipation(inletVelocity_, diameter, kinematicViscosity));
#endif
std::cout << std::endl;
}
diff --git a/test/freeflow/rans/test_pipe_laufer.cc b/test/freeflow/rans/test_pipe_laufer.cc
index f736ffceda..62e9d82f50 100644
--- a/test/freeflow/rans/test_pipe_laufer.cc
+++ b/test/freeflow/rans/test_pipe_laufer.cc
@@ -26,8 +26,6 @@
*/
#include <config.h>
-#define IS_TURBULENT 1
-
#include <ctime>
#include <iostream>
diff --git a/test/freeflow/ransnc/test_flatplate.cc b/test/freeflow/ransnc/test_flatplate.cc
index b142cf6af8..2c84754373 100644
--- a/test/freeflow/ransnc/test_flatplate.cc
+++ b/test/freeflow/ransnc/test_flatplate.cc
@@ -23,8 +23,6 @@
*/
#include <config.h>
-#define IS_TURBULENT 1
-
#include <ctime>
#include <iostream>
--
GitLab