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

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
mattijs
2011-12-21 11:22:31 +00:00
parent 0504c7a4f6 29d4f2ff33
commit c037d24848
5 changed files with 136 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
View File

@ -629,8 +629,9 @@ Foam::multiphaseSystem::dragCoeffs() const
( (
max max
( (
fvc::average(dm.phase1())*fvc::average(dm.phase2()), //fvc::average(dm.phase1()*dm.phase2()),
//dm.phase1()*dm.phase2(), //fvc::average(dm.phase1())*fvc::average(dm.phase2()),
dm.phase1()*dm.phase2(),
dm.residualPhaseFraction() dm.residualPhaseFraction()
) )
*dm.K *dm.K

8
applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/phaseModel/phaseModel.C
View File

@ -212,10 +212,10 @@ bool Foam::phaseModel::read(const dictionary& phaseDict)
//if (nuModel_->read(phaseDict_)) //if (nuModel_->read(phaseDict_))
{ {
phaseDict_.lookup("nu") >> nu_; phaseDict_.lookup("nu") >> nu_.value();
phaseDict_.lookup("kappa") >> kappa_; phaseDict_.lookup("kappa") >> kappa_.value();
phaseDict_.lookup("Cp") >> Cp_; phaseDict_.lookup("Cp") >> Cp_.value();
phaseDict_.lookup("rho") >> rho_; phaseDict_.lookup("rho") >> rho_.value();
return true; return true;
} }

12
src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C
View File

@ -44,11 +44,15 @@ void Foam::MRFZone::relativeRhoFlux
const vector& origin = origin_.value(); const vector& origin = origin_.value();
const vector& Omega = Omega_.value(); const vector& Omega = Omega_.value();
const vectorField& Cfi = Cf.internalField();
const vectorField& Sfi = Sf.internalField();
scalarField& phii = phi.internalField();
// Internal faces // Internal faces
forAll(internalFaces_, i) forAll(internalFaces_, i)
{ {
label facei = internalFaces_[i]; label facei = internalFaces_[i];
phi[facei] -= rho[facei]*(Omega ^ (Cf[facei] - origin)) & Sf[facei]; phii[facei] -= rho[facei]*(Omega ^ (Cfi[facei] - origin)) & Sfi[facei];
} }
// Included patches // Included patches
@ -91,11 +95,15 @@ void Foam::MRFZone::absoluteRhoFlux
const vector& origin = origin_.value(); const vector& origin = origin_.value();
const vector& Omega = Omega_.value(); const vector& Omega = Omega_.value();
const vectorField& Cfi = Cf.internalField();
const vectorField& Sfi = Sf.internalField();
scalarField& phii = phi.internalField();
// Internal faces // Internal faces
forAll(internalFaces_, i) forAll(internalFaces_, i)
{ {
label facei = internalFaces_[i]; label facei = internalFaces_[i];
phi[facei] += rho[facei]*(Omega ^ (Cf[facei] - origin)) & Sf[facei]; phii[facei] += rho[facei]*(Omega ^ (Cfi[facei] - origin)) & Sfi[facei];
} }
// Included patches // Included patches

125
tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/transportProperties
View File

@ -69,7 +69,7 @@ phases
diameterModel constant; diameterModel constant;
constantCoeffs constantCoeffs
{ {
d 1e-3; d 3e-3;
} }
} }
); );
@ -96,9 +96,9 @@ interfaceCompression
virtualMass virtualMass
( (
(air water) 0.5 (air water) 0
(air oil) 0.5 (air oil) 0
(air mercury) 0.5 (air mercury) 0
(water oil) 0.5 (water oil) 0.5
(water mercury) 0.5 (water mercury) 0.5
(oil mercury) 0.5 (oil mercury) 0.5
@ -108,21 +108,132 @@ drag
( (
(air water) (air water)
{ {
type SchillerNaumann; type blended;
air
{
type SchillerNaumann;
residualPhaseFraction 0;
residualSlip 0;
}
water
{
type SchillerNaumann;
residualPhaseFraction 0;
residualSlip 0;
}
residualPhaseFraction 1e-3; residualPhaseFraction 1e-3;
residualSlip 1e-3; residualSlip 1e-3;
} }
(air oil) (air oil)
{ {
type SchillerNaumann; type blended;
air
{
type SchillerNaumann;
residualPhaseFraction 0;
residualSlip 0;
}
oil
{
type SchillerNaumann;
residualPhaseFraction 0;
residualSlip 0;
}
residualPhaseFraction 1e-3; residualPhaseFraction 1e-3;
residualSlip 1e-3; residualSlip 1e-3;
} }
(air mercury) (air mercury)
{ {
type SchillerNaumann; type blended;
air
{
type SchillerNaumann;
residualPhaseFraction 0;
residualSlip 0;
}
mercury
{
type SchillerNaumann;
residualPhaseFraction 0;
residualSlip 0;
}
residualPhaseFraction 1e-3;
residualSlip 1e-3;
}
(water oil)
{
type blended;
water
{
type SchillerNaumann;
residualPhaseFraction 0;
residualSlip 0;
}
oil
{
type SchillerNaumann;
residualPhaseFraction 0;
residualSlip 0;
}
residualPhaseFraction 1e-3;
residualSlip 1e-3;
}
(water mercury)
{
type blended;
water
{
type SchillerNaumann;
residualPhaseFraction 0;
residualSlip 0;
}
mercury
{
type SchillerNaumann;
residualPhaseFraction 0;
residualSlip 0;
}
residualPhaseFraction 1e-3;
residualSlip 1e-3;
}
(oil mercury)
{
type blended;
oil
{
type SchillerNaumann;
residualPhaseFraction 0;
residualSlip 0;
}
mercury
{
type SchillerNaumann;
residualPhaseFraction 0;
residualSlip 0;
}
residualPhaseFraction 1e-3; residualPhaseFraction 1e-3;
residualSlip 1e-3; residualSlip 1e-3;
} }

2
tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict
View File

@ -17,7 +17,7 @@ FoamFile
application multiphaseInterFoam; application multiphaseInterFoam;
startFrom latestTime; startFrom startTime;
startTime 0; startTime 0;