From 8b7b4bbe13193f58789905edd03d1bd79e0d0b0f Mon Sep 17 00:00:00 2001
From: Thomas Fetzer <thomas.fetzer@iws.uni-stuttgart.de>
Date: Thu, 21 Jun 2018 10:54:39 +0200
Subject: [PATCH] [freeflow][komega] Clean-up
---
dumux/freeflow/rans/twoeq/komega/problem.hh | 4 ++--
dumux/freeflow/rans/twoeq/komega/staggered/localresidual.hh | 5 ++---
dumux/freeflow/rans/twoeq/komega/volumevariables.hh | 6 +-----
test/freeflow/rans/pipelauferproblem.hh | 2 +-
4 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/dumux/freeflow/rans/twoeq/komega/problem.hh b/dumux/freeflow/rans/twoeq/komega/problem.hh
index 5573ae9fe1..fac8fd1a52 100644
--- a/dumux/freeflow/rans/twoeq/komega/problem.hh
+++ b/dumux/freeflow/rans/twoeq/komega/problem.hh
@@ -84,8 +84,8 @@ public:
// update size and initial values of the global vectors
storedDissipation_.resize(this->fvGridGeometry().elementMapper().size(), 0.0);
- storedDynamicEddyViscosity_.resize(this->fvGridGeometry().elementMapper().size(), 0.0);
storedTurbulentKineticEnergy_.resize(this->fvGridGeometry().elementMapper().size(), 0.0);
+ storedDynamicEddyViscosity_.resize(this->fvGridGeometry().elementMapper().size(), 0.0);
}
/*!
@@ -128,8 +128,8 @@ public:
public:
std::vector<Scalar> storedDissipation_;
- std::vector<Scalar> storedDynamicEddyViscosity_;
std::vector<Scalar> storedTurbulentKineticEnergy_;
+ std::vector<Scalar> storedDynamicEddyViscosity_;
bool useStoredEddyViscosity_;
private:
diff --git a/dumux/freeflow/rans/twoeq/komega/staggered/localresidual.hh b/dumux/freeflow/rans/twoeq/komega/staggered/localresidual.hh
index 1f9aee5950..ec38ab0a82 100644
--- a/dumux/freeflow/rans/twoeq/komega/staggered/localresidual.hh
+++ b/dumux/freeflow/rans/twoeq/komega/staggered/localresidual.hh
@@ -70,7 +70,6 @@ class KOmegaResidualImpl<TypeTag, DiscretizationMethod::staggered>
using Indices = typename GET_PROP_TYPE(TypeTag, ModelTraits)::Indices;
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using ModelTraits = typename GET_PROP_TYPE(TypeTag, ModelTraits);
- using CellCenterResidual = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
public:
using ParentType::ParentType;
@@ -105,7 +104,7 @@ public:
static constexpr int turbulentKineticEnergyEqIdx = Indices::turbulentKineticEnergyEqIdx - ModelTraits::dim();
static constexpr int dissipationEqIdx = Indices::dissipationEqIdx - ModelTraits::dim();
- // production
+ // production
Scalar productionTerm = 2.0 * volVars.kinematicEddyViscosity()* volVars.stressTensorScalarProduct();
if (ModelTraits::enableKOmegaProductionLimiter())
{
@@ -115,7 +114,7 @@ public:
source[turbulentKineticEnergyEqIdx] += productionTerm;
source[dissipationEqIdx] += volVars.alpha() * ( volVars.dissipation() / volVars.turbulentKineticEnergy() ) * productionTerm;
- // destruction
+ // destruction
source[turbulentKineticEnergyEqIdx] -= volVars.betaK() * volVars.turbulentKineticEnergy() * volVars.dissipation();
source[dissipationEqIdx] -= problem.betaOmega() * volVars.dissipation() * volVars.dissipation();
diff --git a/dumux/freeflow/rans/twoeq/komega/volumevariables.hh b/dumux/freeflow/rans/twoeq/komega/volumevariables.hh
index 0d37e69231..ba1411a6a4 100644
--- a/dumux/freeflow/rans/twoeq/komega/volumevariables.hh
+++ b/dumux/freeflow/rans/twoeq/komega/volumevariables.hh
@@ -198,10 +198,6 @@ public:
return stressTensorScalarProduct_;
}
- /**
- * \brief Here is a list of the background coefficients that are called in the Komega Model
- */
-
//! \brief Returns the \$f \alpha \$f value
const Scalar alpha() const
{
@@ -250,8 +246,8 @@ public:
protected:
Dune::FieldVector<Scalar,2> dofPosition_;
Scalar betaOmega_;
- Scalar dynamicEddyViscosity_;
Scalar eddyDiffusivity_;
+ Scalar dynamicEddyViscosity_;
Scalar dissipation_;
Scalar turbulentKineticEnergy_;
Scalar storedDissipation_;
diff --git a/test/freeflow/rans/pipelauferproblem.hh b/test/freeflow/rans/pipelauferproblem.hh
index ccf33929be..e2c9f2ead6 100644
--- a/test/freeflow/rans/pipelauferproblem.hh
+++ b/test/freeflow/rans/pipelauferproblem.hh
@@ -124,10 +124,10 @@ class PipeLauferProblem : public ZeroEqProblem<TypeTag>
using Element = typename FVGridGeometry::GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
-
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using SubControlVolumeFace = typename FVElementGeometry::SubControlVolumeFace;
+
using TimeLoopPtr = std::shared_ptr<CheckPointTimeLoop<Scalar>>;
static const unsigned int phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIdx);
--
GitLab