diff --git a/dumux/freeflow/rans/twoeq/kepsilon/problem.hh b/dumux/freeflow/rans/twoeq/kepsilon/problem.hh index ee092ba00ddb66de34a57cd7ee48380596dcf70b..6bf7e2b1269d1bfdb0f168d367330a7875a03053 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 f799f1f653f1c1559d401680aa59e067ec107b07..d2b5364cb3d80a17fc05062f8a54e194a921f789 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 2442b49f04d2a9da74dee1862bdea650195050f9..d69ba41ddc91e8ba33077e13d7cd228d9b991b73 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 f736ffcedaf8869cd5001a1cacbfa2a4804acfa9..62e9d82f500fd18891a1cc1c09b37455734d157c 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 b142cf6af862cc807e779a0d9343da6ed5922a67..2c8475437366dfe733a87add53f573df536bd60e 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>