From 05a34f3dfae535a3a12cc98a62d1d8edd3fa5626 Mon Sep 17 00:00:00 2001
From: william <william>
Date: Mon, 3 Feb 2014 12:51:59 +0000
Subject: [PATCH] ENH: twoPhaseEulerFoam: changed Cd function to CdRe and
removed some residual constants
---
.../dragModels/Ergun/Ergun.C | 12 ++++-------
.../dragModels/Ergun/Ergun.H | 2 +-
.../dragModels/Gibilaro/Gibilaro.C | 7 +++----
.../dragModels/Gibilaro/Gibilaro.H | 10 +--------
.../GidaspowErgunWenYu/GidaspowErgunWenYu.C | 9 ++++----
.../GidaspowErgunWenYu/GidaspowErgunWenYu.H | 5 +----
.../GidaspowSchillerNaumann.C | 12 +++++------
.../GidaspowSchillerNaumann.H | 4 ++--
.../SchillerNaumann/SchillerNaumann.C | 8 +++----
.../SchillerNaumann/SchillerNaumann.H | 4 ++--
.../dragModels/SyamlalOBrien/SyamlalOBrien.C | 12 +++++------
.../dragModels/SyamlalOBrien/SyamlalOBrien.H | 10 +--------
.../TomiyamaAnalytic/TomiyamaAnalytic.C | 10 ++++++---
.../TomiyamaAnalytic/TomiyamaAnalytic.H | 5 ++++-
.../TomiyamaCorrelated/TomiyamaCorrelated.C | 9 ++++----
.../TomiyamaCorrelated/TomiyamaCorrelated.H | 5 +----
.../dragModels/WenYu/WenYu.C | 12 +++++------
.../dragModels/WenYu/WenYu.H | 4 ++--
.../dragModels/dragModel/dragModel.C | 11 +++++-----
.../dragModels/dragModel/dragModel.H | 5 +----
.../dragModels/noDrag/noDrag.C | 4 ++--
.../dragModels/noDrag/noDrag.H | 2 +-
.../dragModels/segregated/segregated.C | 21 +++++++------------
.../dragModels/segregated/segregated.H | 5 +----
.../RanzMarshall/RanzMarshall.C | 6 ++----
.../RanzMarshall/RanzMarshall.H | 8 -------
.../turbulentDispersionModels/Gosman/Gosman.C | 6 +++---
.../LES/bubbleColumn/constant/phaseProperties | 6 ------
.../RAS/bubbleColumn/constant/phaseProperties | 6 ------
.../RAS/fluidisedBed/constant/phaseProperties | 2 --
.../bubbleColumn/constant/phaseProperties | 6 ------
.../bubbleColumnIATE/constant/phaseProperties | 6 ------
.../fluidisedBed/constant/phaseProperties | 2 --
.../mixerVessel2D/constant/phaseProperties | 6 ------
34 files changed, 81 insertions(+), 161 deletions(-)
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C
index 6c0fcbecece..2e7d9716790 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C
@@ -60,20 +60,16 @@ Foam::dragModels::Ergun::~Ergun()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::tmp<Foam::volScalarField> Foam::dragModels::Ergun::Cd() const
+Foam::tmp<Foam::volScalarField> Foam::dragModels::Ergun::CdRe() const
{
return
(4/3)
*(
150
- *max(pair_.dispersed(), residualAlpha_)
- *pair_.continuous().nu()
- /(
- max(scalar(1) - pair_.dispersed(), residualAlpha_)
- *pair_.dispersed().d()
- *max(pair_.magUr(), residualSlip_)
- )
+ *max(scalar(1) - pair_.continuous(), residualAlpha_)
+ /max(pair_.continuous(), residualAlpha_)
+ 1.75
+ *pair_.Re()
);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H
index f8f29a84820..89e47dbb63c 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H
@@ -82,7 +82,7 @@ public:
// Member Functions
//- Drag coefficient
- virtual tmp<volScalarField> Cd() const;
+ virtual tmp<volScalarField> CdRe() const;
};
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C
index daaaf0bdc42..51e28ffdfb7 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C
@@ -48,8 +48,7 @@ Foam::dragModels::Gibilaro::Gibilaro
const bool registerObject
)
:
- dragModel(dict, pair, registerObject),
- residualRe_("residualRe", dimless, dict.lookup("residualRe"))
+ dragModel(dict, pair, registerObject)
{}
@@ -61,13 +60,13 @@ Foam::dragModels::Gibilaro::~Gibilaro()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::tmp<Foam::volScalarField> Foam::dragModels::Gibilaro::Cd() const
+Foam::tmp<Foam::volScalarField> Foam::dragModels::Gibilaro::CdRe() const
{
volScalarField alpha2(max(scalar(1) - pair_.dispersed(), residualAlpha_));
return
(4/3)
- *(17.3/(alpha2*max(pair_.Re(), residualRe_)) + scalar(0.336))
+ *(17.3/alpha2 + 0.336*pair_.Re())
*max(pair_.continuous(), residualAlpha_)
*pow(alpha2, -2.8);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H
index c2e103e9116..6b1d3ede032 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H
@@ -58,14 +58,6 @@ class Gibilaro
:
public dragModel
{
-private:
-
- // Private data
-
- //- Residual Reynolds number
- const dimensionedScalar residualRe_;
-
-
public:
//- Runtime type information
@@ -90,7 +82,7 @@ public:
// Member Functions
//- Drag coefficient
- virtual tmp<volScalarField> Cd() const;
+ virtual tmp<volScalarField> CdRe() const;
};
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
index 9eb46e50608..ed8a8714167 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
@@ -68,8 +68,7 @@ Foam::dragModels::GidaspowErgunWenYu::GidaspowErgunWenYu
pair,
false
)
- ),
- residualRe_("residualRe", dimless, dict.lookup("residualRe"))
+ )
{}
@@ -82,11 +81,11 @@ Foam::dragModels::GidaspowErgunWenYu::~GidaspowErgunWenYu()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::tmp<Foam::volScalarField>
-Foam::dragModels::GidaspowErgunWenYu::Cd() const
+Foam::dragModels::GidaspowErgunWenYu::CdRe() const
{
return
- pos(pair_.continuous() - 0.8)*WenYu_->Cd()
- + neg(pair_.continuous() - 0.8)*Ergun_->Cd();
+ pos(pair_.continuous() - 0.8)*WenYu_->CdRe()
+ + neg(pair_.continuous() - 0.8)*Ergun_->CdRe();
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H
index e29bc28dcb5..4bc2666d9d3 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H
@@ -69,9 +69,6 @@ private:
//- Wen Yu drag model
autoPtr<WenYu> WenYu_;
- //- Residual Reynolds number
- const dimensionedScalar residualRe_;
-
public:
@@ -97,7 +94,7 @@ public:
// Member Functions
//- Drag coefficient
- virtual tmp<volScalarField> Cd() const;
+ virtual tmp<volScalarField> CdRe() const;
};
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
index ce35a4ac255..b918d9ac5d4 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
@@ -62,18 +62,18 @@ Foam::dragModels::GidaspowSchillerNaumann::~GidaspowSchillerNaumann()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::tmp<Foam::volScalarField>
-Foam::dragModels::GidaspowSchillerNaumann::Cd() const
+Foam::dragModels::GidaspowSchillerNaumann::CdRe() const
{
volScalarField alpha2(max(scalar(1) - pair_.dispersed(), residualAlpha_));
- volScalarField Re(max(alpha2*pair_.Re(), residualRe_));
- volScalarField Cds
+ volScalarField Re(alpha2*pair_.Re());
+ volScalarField CdsRe
(
- neg(Re - 1000)*(24.0*(1.0 + 0.15*pow(Re, 0.687))/Re)
- + pos(Re - 1000)*0.44
+ neg(Re - 1000)*24.0*(1.0 + 0.15*pow(Re, 0.687))
+ + pos(Re - 1000)*0.44*max(Re, residualRe_)
);
return
- Cds
+ CdsRe
*pow(alpha2, -2.65)
*max(pair_.continuous(), residualAlpha_);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H
index b14ccf06b6d..f89d15d076d 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H
@@ -69,7 +69,7 @@ private:
// Private data
- //- Residual Reynolds number
+ //- Residual Reynolds Number
const dimensionedScalar residualRe_;
@@ -97,7 +97,7 @@ public:
// Member Functions
//- Drag coefficient
- virtual tmp<volScalarField> Cd() const;
+ virtual tmp<volScalarField> CdRe() const;
};
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
index 5504d1a5235..2d4a6540304 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
@@ -61,13 +61,13 @@ Foam::dragModels::SchillerNaumann::~SchillerNaumann()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::tmp<Foam::volScalarField> Foam::dragModels::SchillerNaumann::Cd() const
+Foam::tmp<Foam::volScalarField> Foam::dragModels::SchillerNaumann::CdRe() const
{
- volScalarField Re(pair_.Re() + residualRe_);
+ volScalarField Re(pair_.Re());
return
- neg(Re - 1000)*(24.0*(1.0 + 0.15*pow(Re, 0.687))/Re)
- + pos(Re - 1000)*0.44;
+ neg(Re - 1000)*24.0*(1.0 + 0.15*pow(Re, 0.687))
+ + pos(Re - 1000)*0.44*max(Re, residualRe_);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H
index 21d13358cad..e3c6175b63e 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H
@@ -58,7 +58,7 @@ private:
// Private data
- //- Residual Reynolds number
+ //- Residual Reynolds Number
const dimensionedScalar residualRe_;
@@ -86,7 +86,7 @@ public:
// Member Functions
//- Drag coefficient
- virtual tmp<volScalarField> Cd() const;
+ virtual tmp<volScalarField> CdRe() const;
};
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
index fbf839178f0..86f38db1552 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
@@ -48,8 +48,7 @@ Foam::dragModels::SyamlalOBrien::SyamlalOBrien
const bool registerObject
)
:
- dragModel(dict, pair, registerObject),
- residualRe_("residualRe", dimless, dict.lookup("residualRe"))
+ dragModel(dict, pair, registerObject)
{}
@@ -61,17 +60,16 @@ Foam::dragModels::SyamlalOBrien::~SyamlalOBrien()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::tmp<Foam::volScalarField> Foam::dragModels::SyamlalOBrien::Cd() const
+Foam::tmp<Foam::volScalarField> Foam::dragModels::SyamlalOBrien::CdRe() const
{
volScalarField alpha2(max(scalar(1) - pair_.dispersed(), residualAlpha_));
- volScalarField magUr(max(pair_.magUr(), residualSlip_));
volScalarField A(pow(alpha2, 4.14));
volScalarField B
(
neg(alpha2 - 0.85)*(0.8*pow(alpha2, 1.28))
+ pos(alpha2 - 0.85)*(pow(alpha2, 2.65))
);
- volScalarField Re(max(pair_.Re(), residualRe_));
+ volScalarField Re(pair_.Re());
volScalarField Vr
(
0.5
@@ -79,10 +77,10 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::SyamlalOBrien::Cd() const
A - 0.06*Re + sqrt(sqr(0.06*Re) + 0.12*Re*(2.0*B - A) + sqr(A))
)
);
- volScalarField Cds(sqr(0.63 + 4.8*sqrt(Vr/Re)));
+ volScalarField CdsRe(sqr(0.63*sqrt(Re) + 4.8*sqrt(Vr)));
return
- Cds
+ CdsRe
*max(pair_.continuous(), residualAlpha_)
/sqr(Vr);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H
index 49029972453..0b45dc94213 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H
@@ -57,14 +57,6 @@ class SyamlalOBrien
:
public dragModel
{
-private:
-
- // Private data
-
- //- Residual Reynolds number
- const dimensionedScalar residualRe_;
-
-
public:
//- Runtime type information
@@ -89,7 +81,7 @@ public:
// Member Functions
//- Drag coefficient
- virtual tmp<volScalarField> Cd() const;
+ virtual tmp<volScalarField> CdRe() const;
};
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
index 21a48c66731..0531e30bf07 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
@@ -49,6 +49,7 @@ Foam::dragModels::TomiyamaAnalytic::TomiyamaAnalytic
)
:
dragModel(dict, pair, registerObject),
+ residualRe_("residualRe", dimless, dict.lookup("residualRe")),
residualEo_("residualEo", dimless, dict.lookup("residualEo")),
residualE_("residualE", dimless, dict.lookup("residualE"))
{}
@@ -62,7 +63,8 @@ Foam::dragModels::TomiyamaAnalytic::~TomiyamaAnalytic()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::tmp<Foam::volScalarField> Foam::dragModels::TomiyamaAnalytic::Cd() const
+Foam::tmp<Foam::volScalarField>
+Foam::dragModels::TomiyamaAnalytic::CdRe() const
{
volScalarField Eo(max(pair_.Eo(), residualEo_));
volScalarField E(max(pair_.E(), residualE_));
@@ -73,12 +75,14 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::TomiyamaAnalytic::Cd() const
volScalarField F((asin(rtOmEsq) - E*rtOmEsq)/OmEsq);
return
- (8.0/3.0)*Eo
+ (8.0/3.0)
+ *Eo
/(
Eo*pow(E, 2.0/3.0)/OmEsq
+ 16*pow(E, 0.75)
)
- /sqr(F);
+ /sqr(F)
+ *max(pair_.Re(), residualRe_);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H
index 6c5b72fdcaa..237f6e94470 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H
@@ -68,6 +68,9 @@ private:
// Private data
+ //- Residual Reynolds Number
+ const dimensionedScalar residualRe_;
+
//- Residual Eotvos number
const dimensionedScalar residualEo_;
@@ -99,7 +102,7 @@ public:
// Member Functions
// Drag coefficient
- virtual tmp<volScalarField> Cd() const;
+ virtual tmp<volScalarField> CdRe() const;
};
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
index d01af7ac9da..50fdc667f08 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
@@ -49,7 +49,6 @@ Foam::dragModels::TomiyamaCorrelated::TomiyamaCorrelated
)
:
dragModel(dict, pair, registerObject),
- residualRe_("residualRe", dimless, dict.lookup("residualRe")),
A_("A", dimless, dict.lookup("A"))
{}
@@ -63,21 +62,21 @@ Foam::dragModels::TomiyamaCorrelated::~TomiyamaCorrelated()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::tmp<Foam::volScalarField>
-Foam::dragModels::TomiyamaCorrelated::Cd() const
+Foam::dragModels::TomiyamaCorrelated::CdRe() const
{
- volScalarField Re(pair_.Re() + residualRe_);
+ volScalarField Re(pair_.Re());
volScalarField Eo(pair_.Eo());
return
max
(
- A_/Re
+ A_
*min
(
(1 + 0.15*pow(Re, 0.687)),
scalar(3)
),
- 8*Eo/(3*Eo + 12)
+ 8*Eo*Re/(3*Eo + 12)
);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H
index c779d3262e7..f3b37e121df 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H
@@ -68,9 +68,6 @@ private:
// Private data
- //- Residual Reynolds number
- const dimensionedScalar residualRe_;
-
//- Coefficient
const dimensionedScalar A_;
@@ -99,7 +96,7 @@ public:
// Member Functions
//- Drag coefficient
- virtual tmp<volScalarField> Cd() const;
+ virtual tmp<volScalarField> CdRe() const;
};
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
index 41aeb231d63..34eab7db37e 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
@@ -61,18 +61,18 @@ Foam::dragModels::WenYu::~WenYu()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::tmp<Foam::volScalarField> Foam::dragModels::WenYu::Cd() const
+Foam::tmp<Foam::volScalarField> Foam::dragModels::WenYu::CdRe() const
{
volScalarField alpha2(max(scalar(1) - pair_.dispersed(), residualAlpha_));
- volScalarField Re(max(pair_.Re(), residualRe_));
- volScalarField Cds
+ volScalarField Re(pair_.Re());
+ volScalarField CdsRe
(
- neg(Re - 1000)*(24.0*(1.0 + 0.15*pow(Re, 0.687))/Re)
- + pos(Re - 1000)*0.44
+ neg(Re - 1000)*24.0*(1.0 + 0.15*pow(Re, 0.687))
+ + pos(Re - 1000)*0.44*max(Re, residualRe_)
);
return
- Cds
+ CdsRe
*pow(alpha2, -2.65)
*max(pair_.continuous(), residualAlpha_);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H
index 48df2ae526e..da3cac2cfce 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H
@@ -72,7 +72,7 @@ private:
// Private data
- //- Residual Reynolds number
+ //- Residual Reynolds Number
const dimensionedScalar residualRe_;
@@ -100,7 +100,7 @@ public:
// Member Functions
//- Drag coefficient
- virtual tmp<volScalarField> Cd() const;
+ virtual tmp<volScalarField> CdRe() const;
};
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C
index 754931df127..ce2a53a0bfb 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C
@@ -90,8 +90,7 @@ Foam::dragModel::dragModel
pair
)
),
- residualAlpha_("residualAlpha", dimless, dict.lookup("residualAlpha")),
- residualSlip_("residualSlip", dimVelocity, dict.lookup("residualSlip"))
+ residualAlpha_("residualAlpha", dimless, dict.lookup("residualAlpha"))
{}
@@ -107,14 +106,14 @@ Foam::tmp<Foam::volScalarField> Foam::dragModel::K() const
{
return
0.75
- *Cd()
+ *CdRe()
*swarmCorrection_->Cs()
*pair_.continuous().rho()
+ *pair_.continuous().nu()
/(
max(pair_.continuous(), residualAlpha_)
- *pair_.dispersed().d()
- )
- *max(pair_.magUr(), residualSlip_);
+ *sqr(pair_.dispersed().d())
+ );
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
index ef0462e7353..954d60c396d 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
@@ -68,9 +68,6 @@ protected:
//- Residual phase fraction
const dimensionedScalar residualAlpha_;
- //- Residual slip velocity
- const dimensionedScalar residualSlip_;
-
public:
@@ -134,7 +131,7 @@ public:
// Member Functions
//- Drag coefficient
- virtual tmp<volScalarField> Cd() const = 0;
+ virtual tmp<volScalarField> CdRe() const = 0;
//- The drag function K used in the momentum equation
// ddt(alpha1*rho1*U1) + ... = ... alpha1*alpha2*K*(U1-U2)
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.C
index f57979c3492..d955c9e7966 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.C
@@ -60,7 +60,7 @@ Foam::dragModels::noDrag::~noDrag()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::tmp<Foam::volScalarField> Foam::dragModels::noDrag::Cd() const
+Foam::tmp<Foam::volScalarField> Foam::dragModels::noDrag::CdRe() const
{
const fvMesh& mesh(this->pair_.phase1().mesh());
@@ -84,7 +84,7 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::noDrag::Cd() const
Foam::tmp<Foam::volScalarField> Foam::dragModels::noDrag::K() const
{
- return Cd()*dimensionedScalar("zero", dimensionSet(1, -3, -1, 0, 0), 0);
+ return CdRe()*dimensionedScalar("zero", dimensionSet(1, -3, -1, 0, 0), 0);
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.H
index 74c30e67454..b24267ee1b4 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.H
@@ -78,7 +78,7 @@ public:
// Member Functions
//- Drag coefficient
- virtual tmp<volScalarField> Cd() const;
+ virtual tmp<volScalarField> CdRe() const;
//- The drag function used in the momentum equation
virtual tmp<volScalarField> K() const;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C
index 08b59fbf6b1..92b82e537d2 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C
@@ -50,7 +50,6 @@ Foam::dragModels::segregated::segregated
)
:
dragModel(dict, pair, registerObject),
- residualRe_("residualRe", dimless, dict.lookup("residualRe")),
m_("m", dimless, dict.lookup("m")),
n_("n", dimless, dict.lookup("n"))
{}
@@ -64,9 +63,9 @@ Foam::dragModels::segregated::~segregated()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-Foam::tmp<Foam::volScalarField> Foam::dragModels::segregated::Cd() const
+Foam::tmp<Foam::volScalarField> Foam::dragModels::segregated::CdRe() const
{
- FatalErrorIn("Foam::dragModels::segregated::Cd() const")
+ FatalErrorIn("Foam::dragModels::segregated::CdRe() const")
<< "Not implemented."
<< "Drag coefficient not defined for the segregated model."
<< exit(FatalError);
@@ -137,16 +136,12 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::segregated::K() const
volScalarField ReI
(
- max
- (
- pair_.rho()
- *pair_.magUr()
- /(
- magGradI
- *max(alpha1*alpha2, sqr(residualAlpha_))
- *muI
- ),
- residualRe_
+ pair_.rho()
+ *pair_.magUr()
+ /(
+ magGradI
+ *max(alpha1*alpha2, sqr(residualAlpha_))
+ *muI
)
);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.H
index 1b68d94d251..13bf2a4d10b 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.H
@@ -66,9 +66,6 @@ private:
// Private data
- //- Residual reynolds number
- const dimensionedScalar residualRe_;
-
//- M coefficient
const dimensionedScalar m_;
@@ -100,7 +97,7 @@ public:
// Member Functions
//- Drag coefficient
- virtual tmp<volScalarField> Cd() const;
+ virtual tmp<volScalarField> CdRe() const;
//- The drag function used in the momentum equation
virtual tmp<volScalarField> K() const;
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
index 019926b34be..1dd21273385 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
@@ -47,8 +47,7 @@ Foam::heatTransferModels::RanzMarshall::RanzMarshall
const phasePair& pair
)
:
- heatTransferModel(dict, pair),
- residualRe_("residualRe", dimless, dict.lookup("residualRe"))
+ heatTransferModel(dict, pair)
{}
@@ -63,8 +62,7 @@ Foam::heatTransferModels::RanzMarshall::~RanzMarshall()
Foam::tmp<Foam::volScalarField>
Foam::heatTransferModels::RanzMarshall::K() const
{
- volScalarField Re(pair_.Re() + residualRe_);
- volScalarField Nu(scalar(2) + 0.6*sqrt(Re)*cbrt(pair_.Pr()));
+ volScalarField Nu(scalar(2) + 0.6*pair_.Re()*cbrt(pair_.Pr()));
return 6.0*pair_.continuous().kappa()*Nu/sqr(pair_.dispersed().d());
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H
index 0188d2e2103..a52ff75b790 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H
@@ -54,14 +54,6 @@ class RanzMarshall
:
public heatTransferModel
{
-private:
-
- // Private data
-
- //- Residual Reynolds number
- const dimensionedScalar residualRe_;
-
-
public:
//- Runtime type information
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
index 33a144df680..eccbf4e3f00 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
@@ -84,12 +84,12 @@ Foam::turbulentDispersionModels::Gosman::F() const
return
- 0.75
- *drag.Cd()
+ *drag.CdRe()
+ *pair_.continuous().nu()
*pair_.continuous().turbulence().nut()
- *pair_.magUr()
/(
sigma_
- *pair_.dispersed().d()
+ *sqr(pair_.dispersed().d())
)
*pair_.continuous().rho()
*fvc::grad(pair_.dispersed());
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
index 48d8185c6ae..ce92781035f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
@@ -75,7 +75,6 @@ drag
{
type SchillerNaumann;
residualAlpha 1e-6;
- residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@@ -87,7 +86,6 @@ drag
{
type SchillerNaumann;
residualAlpha 1e-6;
- residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@@ -99,8 +97,6 @@ drag
{
type segregated;
residualAlpha 1e-6;
- residualSlip 1e-3;
- residualRe 1e-3;
m 0.5;
n 8;
swarmCorrection
@@ -130,13 +126,11 @@ heatTransfer
(air in water)
{
type RanzMarshall;
- residualRe 1e-3;
}
(water in air)
{
type RanzMarshall;
- residualRe 1e-3;
}
);
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
index 48d8185c6ae..ce92781035f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
@@ -75,7 +75,6 @@ drag
{
type SchillerNaumann;
residualAlpha 1e-6;
- residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@@ -87,7 +86,6 @@ drag
{
type SchillerNaumann;
residualAlpha 1e-6;
- residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@@ -99,8 +97,6 @@ drag
{
type segregated;
residualAlpha 1e-6;
- residualSlip 1e-3;
- residualRe 1e-3;
m 0.5;
n 8;
swarmCorrection
@@ -130,13 +126,11 @@ heatTransfer
(air in water)
{
type RanzMarshall;
- residualRe 1e-3;
}
(water in air)
{
type RanzMarshall;
- residualRe 1e-3;
}
);
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
index d79bf8cefa5..111a730d931 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
@@ -60,7 +60,6 @@ drag
{
type GidaspowErgunWenYu;
residualAlpha 1e-6;
- residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@@ -83,7 +82,6 @@ heatTransfer
(particles in air)
{
type RanzMarshall;
- residualRe 1e-3;
}
);
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
index 48d8185c6ae..ce92781035f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
@@ -75,7 +75,6 @@ drag
{
type SchillerNaumann;
residualAlpha 1e-6;
- residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@@ -87,7 +86,6 @@ drag
{
type SchillerNaumann;
residualAlpha 1e-6;
- residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@@ -99,8 +97,6 @@ drag
{
type segregated;
residualAlpha 1e-6;
- residualSlip 1e-3;
- residualRe 1e-3;
m 0.5;
n 8;
swarmCorrection
@@ -130,13 +126,11 @@ heatTransfer
(air in water)
{
type RanzMarshall;
- residualRe 1e-3;
}
(water in air)
{
type RanzMarshall;
- residualRe 1e-3;
}
);
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
index 48d8185c6ae..ce92781035f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
@@ -75,7 +75,6 @@ drag
{
type SchillerNaumann;
residualAlpha 1e-6;
- residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@@ -87,7 +86,6 @@ drag
{
type SchillerNaumann;
residualAlpha 1e-6;
- residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@@ -99,8 +97,6 @@ drag
{
type segregated;
residualAlpha 1e-6;
- residualSlip 1e-3;
- residualRe 1e-3;
m 0.5;
n 8;
swarmCorrection
@@ -130,13 +126,11 @@ heatTransfer
(air in water)
{
type RanzMarshall;
- residualRe 1e-3;
}
(water in air)
{
type RanzMarshall;
- residualRe 1e-3;
}
);
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
index d79bf8cefa5..111a730d931 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
@@ -60,7 +60,6 @@ drag
{
type GidaspowErgunWenYu;
residualAlpha 1e-6;
- residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@@ -83,7 +82,6 @@ heatTransfer
(particles in air)
{
type RanzMarshall;
- residualRe 1e-3;
}
);
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
index 48d8185c6ae..ce92781035f 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
@@ -75,7 +75,6 @@ drag
{
type SchillerNaumann;
residualAlpha 1e-6;
- residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@@ -87,7 +86,6 @@ drag
{
type SchillerNaumann;
residualAlpha 1e-6;
- residualSlip 1e-3;
residualRe 1e-3;
swarmCorrection
{
@@ -99,8 +97,6 @@ drag
{
type segregated;
residualAlpha 1e-6;
- residualSlip 1e-3;
- residualRe 1e-3;
m 0.5;
n 8;
swarmCorrection
@@ -130,13 +126,11 @@ heatTransfer
(air in water)
{
type RanzMarshall;
- residualRe 1e-3;
}
(water in air)
{
type RanzMarshall;
- residualRe 1e-3;
}
);
--
GitLab