zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-12-28 03:37:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Corrected line lengths

Browse Source
This commit is contained in:
Henry
2012-02-29 16:39:53 +00:00
parent 3237340aa3
commit 2491f257b1
245 changed files with 1825 additions and 1868 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C
View File

@ -46,12 +46,12 @@ namespace Foam
Foam::Ergun::Ergun
(
const dictionary& interfaceDict,
const volScalarField& alpha,
const phaseModel& phasea,
const phaseModel& phaseb
const volScalarField& alpha1,
const phaseModel& phase1,
const phaseModel& phase2
)
:
dragModel(interfaceDict, alpha, phasea, phaseb)
dragModel(interfaceDict, alpha1, phase1, phase2)
{}
@ -68,12 +68,12 @@ Foam::tmp<Foam::volScalarField> Foam::Ergun::K
const volScalarField& Ur
) const
{
volScalarField beta(max(scalar(1) - alpha_, scalar(1.0e-6)));
volScalarField alpha2(max(scalar(1) - alpha1_, scalar(1.0e-6)));
return
150.0*alpha_*phaseb_.nu()*phaseb_.rho()
/sqr(beta*phasea_.d())
+ 1.75*phaseb_.rho()*Ur/(beta*phasea_.d());
150.0*alpha1_*phase2_.nu()*phase2_.rho()
/sqr(alpha2*phase1_.d())
+ 1.75*phase2_.rho()*Ur/(alpha2*phase1_.d());
}

6
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H
View File

@ -66,9 +66,9 @@ public:
Ergun
(
const dictionary& interfaceDict,
const volScalarField& alpha,
const phaseModel& phasea,
const phaseModel& phaseb
const volScalarField& alpha1,
const phaseModel& phase1,
const phaseModel& phase2
);

16
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C
View File

@ -46,12 +46,12 @@ namespace Foam
Foam::Gibilaro::Gibilaro
(
const dictionary& interfaceDict,
const volScalarField& alpha,
const phaseModel& phasea,
const phaseModel& phaseb
const volScalarField& alpha1,
const phaseModel& phase1,
const phaseModel& phase2
)
:
dragModel(interfaceDict, alpha, phasea, phaseb)
dragModel(interfaceDict, alpha1, phase1, phase2)
{}
@ -68,11 +68,11 @@ Foam::tmp<Foam::volScalarField> Foam::Gibilaro::K
const volScalarField& Ur
) const
{
volScalarField beta(max(scalar(1) - alpha_, scalar(1.0e-6)));
volScalarField bp(pow(beta, -2.8));
volScalarField Re(max(beta*Ur*phasea_.d()/phaseb_.nu(), scalar(1.0e-3)));
volScalarField alpha2(max(scalar(1) - alpha1_, scalar(1.0e-6)));
volScalarField bp(pow(alpha2, -2.8));
volScalarField Re(max(alpha2*Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
return (17.3/Re + scalar(0.336))*phaseb_.rho()*Ur*bp/phasea_.d();
return (17.3/Re + scalar(0.336))*phase2_.rho()*Ur*bp/phase1_.d();
}

6
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H
View File

@ -66,9 +66,9 @@ public:
Gibilaro
(
const dictionary& interfaceDict,
const volScalarField& alpha,
const phaseModel& phasea,
const phaseModel& phaseb
const volScalarField& alpha1,
const phaseModel& phase1,
const phaseModel& phase2
);

24
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
View File

@ -46,12 +46,12 @@ namespace Foam
Foam::GidaspowErgunWenYu::GidaspowErgunWenYu
(
const dictionary& interfaceDict,
const volScalarField& alpha,
const phaseModel& phasea,
const phaseModel& phaseb
const volScalarField& alpha1,
const phaseModel& phase1,
const phaseModel& phase2
)
:
dragModel(interfaceDict, alpha, phasea, phaseb)
dragModel(interfaceDict, alpha1, phase1, phase2)
{}
@ -68,10 +68,10 @@ Foam::tmp<Foam::volScalarField> Foam::GidaspowErgunWenYu::K
const volScalarField& Ur
) const
{
volScalarField beta(max(scalar(1) - alpha_, scalar(1.0e-6)));
volScalarField alpha2(max(scalar(1) - alpha1_, scalar(1.0e-6)));
volScalarField bp(pow(beta, -2.65));
volScalarField Re(max(Ur*phasea_.d()/phaseb_.nu(), scalar(1.0e-3)));
volScalarField bp(pow(alpha2, -2.65));
volScalarField Re(max(Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
volScalarField Cds
(
@ -82,12 +82,12 @@ Foam::tmp<Foam::volScalarField> Foam::GidaspowErgunWenYu::K
// Wen and Yu (1966)
return
(
pos(beta - 0.8)
*(0.75*Cds*phaseb_.rho()*Ur*bp/phasea_.d())
+ neg(beta - 0.8)
pos(alpha2 - 0.8)
*(0.75*Cds*phase2_.rho()*Ur*bp/phase1_.d())
+ neg(alpha2 - 0.8)
*(
150.0*alpha_*phaseb_.nu()*phaseb_.rho()/(sqr(beta*phasea_.d()))
+ 1.75*phaseb_.rho()*Ur/(beta*phasea_.d())
150.0*alpha1_*phase2_.nu()*phase2_.rho()/(sqr(alpha2*phase1_.d()))
+ 1.75*phase2_.rho()*Ur/(alpha2*phase1_.d())
)
);
}

6
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H
View File

@ -64,9 +64,9 @@ public:
GidaspowErgunWenYu
(
const dictionary& interfaceDict,
const volScalarField& alpha,
const phaseModel& phasea,
const phaseModel& phaseb
const volScalarField& alpha1,
const phaseModel& phase1,
const phaseModel& phase2
);

16
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
View File

@ -46,12 +46,12 @@ namespace Foam
Foam::GidaspowSchillerNaumann::GidaspowSchillerNaumann
(
const dictionary& interfaceDict,
const volScalarField& alpha,
const phaseModel& phasea,
const phaseModel& phaseb
const volScalarField& alpha1,
const phaseModel& phase1,
const phaseModel& phase2
)
:
dragModel(interfaceDict, alpha, phasea, phaseb)
dragModel(interfaceDict, alpha1, phase1, phase2)
{}
@ -68,10 +68,10 @@ Foam::tmp<Foam::volScalarField> Foam::GidaspowSchillerNaumann::K
const volScalarField& Ur
) const
{
volScalarField beta(max(scalar(1) - alpha_, scalar(1e-6)));
volScalarField bp(pow(beta, -2.65));
volScalarField alpha2(max(scalar(1) - alpha1_, scalar(1e-6)));
volScalarField bp(pow(alpha2, -2.65));
volScalarField Re(max(beta*Ur*phasea_.d()/phaseb_.nu(), scalar(1.0e-3)));
volScalarField Re(max(alpha2*Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
volScalarField Cds
(
@ -79,7 +79,7 @@ Foam::tmp<Foam::volScalarField> Foam::GidaspowSchillerNaumann::K
+ pos(Re - 1000)*0.44
);
return 0.75*Cds*phaseb_.rho()*Ur*bp/phasea_.d();
return 0.75*Cds*phase2_.rho()*Ur*bp/phase1_.d();
}

6
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H
View File

@ -73,9 +73,9 @@ public:
GidaspowSchillerNaumann
(
const dictionary& interfaceDict,
const volScalarField& alpha,
const phaseModel& phasea,
const phaseModel& phaseb
const volScalarField& alpha1,
const phaseModel& phase1,
const phaseModel& phase2
);

12
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
View File

@ -46,12 +46,12 @@ namespace Foam
Foam::SchillerNaumann::SchillerNaumann
(
const dictionary& interfaceDict,
const volScalarField& alpha,
const phaseModel& phasea,
const phaseModel& phaseb
const volScalarField& alpha1,
const phaseModel& phase1,
const phaseModel& phase2
)
:
dragModel(interfaceDict, alpha, phasea, phaseb)
dragModel(interfaceDict, alpha1, phase1, phase2)
{}
@ -68,7 +68,7 @@ Foam::tmp<Foam::volScalarField> Foam::SchillerNaumann::K
const volScalarField& Ur
) const
{
volScalarField Re(max(Ur*phasea_.d()/phaseb_.nu(), scalar(1.0e-3)));
volScalarField Re(max(Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
volScalarField Cds
(
@ -76,7 +76,7 @@ Foam::tmp<Foam::volScalarField> Foam::SchillerNaumann::K
+ pos(Re - 1000)*0.44
);
return 0.75*Cds*phaseb_.rho()*Ur/phasea_.d();
return 0.75*Cds*phase2_.rho()*Ur/phase1_.d();
}

6
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H
View File

@ -62,9 +62,9 @@ public:
SchillerNaumann
(
const dictionary& interfaceDict,
const volScalarField& alpha,
const phaseModel& phasea,
const phaseModel& phaseb
const volScalarField& alpha1,
const phaseModel& phase1,
const phaseModel& phase2
);

20
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
View File

@ -46,12 +46,12 @@ namespace Foam
Foam::SyamlalOBrien::SyamlalOBrien
(
const dictionary& interfaceDict,
const volScalarField& alpha,
const phaseModel& phasea,
const phaseModel& phaseb
const volScalarField& alpha1,
const phaseModel& phase1,
const phaseModel& phase2
)
:
dragModel(interfaceDict, alpha, phasea, phaseb)
dragModel(interfaceDict, alpha1, phase1, phase2)
{}
@ -68,15 +68,15 @@ Foam::tmp<Foam::volScalarField> Foam::SyamlalOBrien::K
const volScalarField& Ur
) const
{
volScalarField beta(max(scalar(1) - alpha_, scalar(1.0e-6)));
volScalarField A(pow(beta, 4.14));
volScalarField alpha2(max(scalar(1) - alpha1_, scalar(1.0e-6)));
volScalarField A(pow(alpha2, 4.14));
volScalarField B
(
neg(beta - 0.85)*(0.8*pow(beta, 1.28))
+ pos(beta - 0.85)*(pow(beta, 2.65))
neg(alpha2 - 0.85)*(0.8*pow(alpha2, 1.28))
+ pos(alpha2 - 0.85)*(pow(alpha2, 2.65))
);
volScalarField Re(max(Ur*phasea_.d()/phaseb_.nu(), scalar(1.0e-3)));
volScalarField Re(max(Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
volScalarField Vr
(
@ -88,7 +88,7 @@ Foam::tmp<Foam::volScalarField> Foam::SyamlalOBrien::K
volScalarField Cds(sqr(0.63 + 4.8*sqrt(Vr/Re)));
return 0.75*Cds*phaseb_.rho()*Ur/(phasea_.d()*sqr(Vr));
return 0.75*Cds*phase2_.rho()*Ur/(phase1_.d()*sqr(Vr));
}

6
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H
View File

@ -65,9 +65,9 @@ public:
SyamlalOBrien
(
const dictionary& interfaceDict,
const volScalarField& alpha,
const phaseModel& phasea,
const phaseModel& phaseb
const volScalarField& alpha1,
const phaseModel& phase1,
const phaseModel& phase2
);

14
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
View File

@ -46,12 +46,12 @@ namespace Foam
Foam::WenYu::WenYu
(
const dictionary& interfaceDict,
const volScalarField& alpha,
const phaseModel& phasea,
const phaseModel& phaseb
const volScalarField& alpha1,
const phaseModel& phase1,
const phaseModel& phase2
)
:
dragModel(interfaceDict, alpha, phasea, phaseb)
dragModel(interfaceDict, alpha1, phase1, phase2)
{}
@ -68,16 +68,16 @@ Foam::tmp<Foam::volScalarField> Foam::WenYu::K
const volScalarField& Ur
) const
{
volScalarField beta(max(scalar(1) - alpha_, scalar(1.0e-6)));
volScalarField alpha2(max(scalar(1) - alpha1_, scalar(1.0e-6)));
volScalarField Re(max(Ur*phasea_.d()/phaseb_.nu(), scalar(1.0e-3)));
volScalarField Re(max(Ur*phase1_.d()/phase2_.nu(), scalar(1.0e-3)));
volScalarField Cds
(
neg(Re - 1000)*(24.0*(1.0 + 0.15*pow(Re, 0.687))/Re)
+ pos(Re - 1000)*0.44
);
return 0.75*Cds*phaseb_.rho()*Ur*pow(beta, -2.65)/phasea_.d();
return 0.75*Cds*phase2_.rho()*Ur*pow(alpha2, -2.65)/phase1_.d();
}

6
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H
View File

@ -76,9 +76,9 @@ public:
WenYu
(
const dictionary& interfaceDict,
const volScalarField& alpha,
const phaseModel& phasea,
const phaseModel& phaseb
const volScalarField& alpha1,
const phaseModel& phase1,
const phaseModel& phase2
);

12
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C
View File

@ -39,15 +39,15 @@ namespace Foam
Foam::dragModel::dragModel
(
const dictionary& interfaceDict,
const volScalarField& alpha,
const phaseModel& phasea,
const phaseModel& phaseb
const volScalarField& alpha1,
const phaseModel& phase1,
const phaseModel& phase2
)
:
interfaceDict_(interfaceDict),
alpha_(alpha),
phasea_(phasea),
phaseb_(phaseb)
alpha1_(alpha1),
phase1_(phase1),
phase2_(phase2)
{}

35
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
View File

@ -55,9 +55,9 @@ protected:
// Protected data
const dictionary& interfaceDict_;
const volScalarField& alpha_;
const phaseModel& phasea_;
const phaseModel& phaseb_;
const volScalarField& alpha1_;
const phaseModel& phase1_;
const phaseModel& phase2_;
public:
@ -75,11 +75,11 @@ public:
dictionary,
(
const dictionary& interfaceDict,
const volScalarField& alpha,
const phaseModel& phasea,
const phaseModel& phaseb
const volScalarField& alpha1,
const phaseModel& phase1,
const phaseModel& phase2
),
(interfaceDict, alpha, phasea, phaseb)
(interfaceDict, alpha1, phase1, phase2)
);
@ -88,9 +88,9 @@ public:
dragModel
(
const dictionary& interfaceDict,
const volScalarField& alpha,
const phaseModel& phasea,
const phaseModel& phaseb
const volScalarField& alpha1,
const phaseModel& phase1,
const phaseModel& phase2
);
@ -103,21 +103,22 @@ public:
static autoPtr<dragModel> New
(
const dictionary& interfaceDict,
const volScalarField& alpha,
const phaseModel& phasea,
const phaseModel& phaseb
const volScalarField& alpha1,
const phaseModel& phase1,
const phaseModel& phase2
);
// Member Functions
//- the dragfunction K used in the momentum eq.
// ddt(alpha*rhoa*Ua) + ... = ... alpha*beta*K*(Ua-Ub)
// ddt(beta*rhob*Ub) + ... = ... alpha*beta*K*(Ub-Ua)
// ddt(alpha1*rho1*U1) + ... = ... alpha1*alpha2*K*(U1-U2)
// ddt(alpha2*rho2*U2) + ... = ... alpha1*alpha2*K*(U2-U1)
// ********************************** NB ! *****************************
// for numerical reasons alpha and beta has been
// for numerical reasons alpha1 and alpha2 has been
// extracted from the dragFunction K,
// so you MUST divide K by alpha*beta when implemnting the drag function
// so you MUST divide K by alpha1*alpha2 when implemnting the drag
// function
// ********************************** NB ! *****************************
virtual tmp<volScalarField> K(const volScalarField& Ur) const = 0;
};

12
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
View File

@ -30,18 +30,18 @@ License
Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
(
const dictionary& interfaceDict,
const volScalarField& alpha,
const phaseModel& phasea,
const phaseModel& phaseb
const volScalarField& alpha1,
const phaseModel& phase1,
const phaseModel& phase2
)
{
word dragModelType
(
interfaceDict.lookup("dragModel" + phasea.name())
interfaceDict.lookup("dragModel" + phase1.name())
);
Info << "Selecting dragModel for phase "
<< phasea.name()
<< phase1.name()
<< ": "
<< dragModelType << endl;
@ -60,7 +60,7 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
<< abort(FatalError);
}
return cstrIter()(interfaceDict, alpha, phasea, phaseb);
return cstrIter()(interfaceDict, alpha1, phase1, phase2);
}