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 remote branch 'OpenCFD/master' into olesenm

Browse Source
This commit is contained in:
Mark Olesen
2010-11-08 08:07:29 +01:00
parent d5acd22a63 9c350ab501
commit 8b59f1d0d5
674 changed files with 19530 additions and 5336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/surfaceFilmModels/submodels/kinematic/injectionModel/cloudInjection/cloudInjection.C
View File

@ -28,7 +28,6 @@ License
#include "fvMesh.H"
#include "Time.H"
#include "mathematicalConstants.H"
#include "Random.H"
#include "volFields.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -53,7 +52,7 @@ Foam::surfaceFilmModels::cloudInjection::cloudInjection
:
injectionModel(type(), owner, dict),
particlesPerParcel_(readScalar(coeffs_.lookup("particlesPerParcel"))),
rndGen_(label(0)),
rndGen_(label(0), -1),
parcelPDF_(pdfs::pdf::New(coeffs_.subDict("parcelPDF"), rndGen_)),
diameter_(owner.film().nCells(), 0.0)
{

3
src/surfaceFilmModels/submodels/kinematic/injectionModel/cloudInjection/cloudInjection.H
View File

@ -37,6 +37,7 @@ SourceFiles
#include "injectionModel.H"
#include "pdf.H"
#include "cachedRandom.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -72,7 +73,7 @@ protected:
scalar particlesPerParcel_;
//- Random number generator
Random rndGen_;
cachedRandom rndGen_;
//- Parcel size PDF model
const autoPtr<pdfs::pdf> parcelPDF_;

4
src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C
View File

@ -148,8 +148,8 @@ void Foam::surfaceFilmModels::standardPhaseChange::correct
const scalar qDotInf = hInf[cellI]*(TInf[cellI] - T[cellI]);
const scalar qDotFilm = hFilm[cellI]*(T[cellI] - Tw[cellI]);
const scalar cp = liq.cp(pc, Tloc);
const scalar qCorr = availableMass[cellI]*cp*(T[cellI] - Tb_);
const scalar Cp = liq.Cp(pc, Tloc);
const scalar qCorr = availableMass[cellI]*Cp*(T[cellI] - Tb_);
dMass[cellI] =
dt*magSf[cellI]/hVap*(qDotInf + qDotFilm)
+ qCorr/hVap;

6
src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.C
View File

@ -1116,12 +1116,12 @@ Foam::surfaceFilmModels::kinematicSingleLayer::Tw() const
const Foam::volScalarField&
Foam::surfaceFilmModels::kinematicSingleLayer::cp() const
Foam::surfaceFilmModels::kinematicSingleLayer::Cp() const
{
FatalErrorIn
(
"const volScalarField& kinematicSingleLayer::cp() const"
) << "cp field not available for " << type() << abort(FatalError);
"const volScalarField& kinematicSingleLayer::Cp() const"
) << "Cp field not available for " << type() << abort(FatalError);
return volScalarField::null();
}

2
src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.H
View File

@ -401,7 +401,7 @@ public:
virtual const volScalarField& Tw() const;
//- Return the film specific heat capacity [J/kg/K]
virtual const volScalarField& cp() const;
virtual const volScalarField& Cp() const;
//- Return the film thermal conductivity [W/m/K]
virtual const volScalarField& kappa() const;

6
src/surfaceFilmModels/surfaceFilmModel/noFilm/noFilm.C
View File

@ -199,10 +199,10 @@ const Foam::volScalarField& Foam::surfaceFilmModels::noFilm::Tw() const
}
const Foam::volScalarField& Foam::surfaceFilmModels::noFilm::cp() const
const Foam::volScalarField& Foam::surfaceFilmModels::noFilm::Cp() const
{
FatalErrorIn("const volScalarField& noFilm::cp() const")
<< "cp field not available for " << type() << abort(FatalError);
FatalErrorIn("const volScalarField& noFilm::Cp() const")
<< "Cp field not available for " << type() << abort(FatalError);
return volScalarField::null();
}

2
src/surfaceFilmModels/surfaceFilmModel/noFilm/noFilm.H
View File

@ -148,7 +148,7 @@ public:
virtual const volScalarField& Tw() const;
//- Return the film specific heat capacity [J/kg/K]
virtual const volScalarField& cp() const;
virtual const volScalarField& Cp() const;
//- Return the film thermal conductivity [W/m/K]
virtual const volScalarField& kappa() const;

2
src/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel/surfaceFilmModel.H
View File

@ -242,7 +242,7 @@ public:
virtual const volScalarField& Tw() const = 0;
//- Return the film specific heat capacity [J/kg/K]
virtual const volScalarField& cp() const = 0;
virtual const volScalarField& Cp() const = 0;
//- Return the film thermal conductivity [W/m/K]
virtual const volScalarField& kappa() const = 0;

20
src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C
View File

@ -74,7 +74,7 @@ void Foam::surfaceFilmModels::thermoSingleLayer::correctThermoFields()
rho_ == dimensionedScalar(coeffs_.lookup("rho0"));
mu_ == dimensionedScalar(coeffs_.lookup("mu0"));
sigma_ == dimensionedScalar(coeffs_.lookup("sigma0"));
cp_ == dimensionedScalar(coeffs_.lookup("cp0"));
Cp_ == dimensionedScalar(coeffs_.lookup("Cp0"));
kappa_ == dimensionedScalar(coeffs_.lookup("kappa0"));
break;
@ -89,14 +89,14 @@ void Foam::surfaceFilmModels::thermoSingleLayer::correctThermoFields()
rho_[cellI] = liq.rho(p, T);
mu_[cellI] = liq.mu(p, T);
sigma_[cellI] = liq.sigma(p, T);
cp_[cellI] = liq.cp(p, T);
Cp_[cellI] = liq.Cp(p, T);
kappa_[cellI] = liq.K(p, T);
}
rho_.correctBoundaryConditions();
mu_.correctBoundaryConditions();
sigma_.correctBoundaryConditions();
cp_.correctBoundaryConditions();
Cp_.correctBoundaryConditions();
kappa_.correctBoundaryConditions();
break;
@ -188,8 +188,8 @@ Foam::tmp<Foam::fvScalarMatrix> Foam::surfaceFilmModels::thermoSingleLayer::q
return
(
- fvm::Sp(htcs_->h()/cp_, hs) - htcs_->h()*(Tstd - TPrimary_)
- fvm::Sp(htcw_->h()/cp_, hs) - htcw_->h()*(Tstd - Tw_)
- fvm::Sp(htcs_->h()/Cp_, hs) - htcs_->h()*(Tstd - TPrimary_)
- fvm::Sp(htcw_->h()/Cp_, hs) - htcw_->h()*(Tstd - Tw_)
);
}
@ -236,18 +236,18 @@ Foam::surfaceFilmModels::thermoSingleLayer::thermoSingleLayer
kinematicSingleLayer(modelType, mesh, g),
thermo_(mesh.lookupObject<SLGThermo>("SLGThermo")),
liquidId_(thermo_.liquidId(coeffs_.lookup("liquid"))),
cp_
Cp_
(
IOobject
(
"cp",
"Cp",
time_.timeName(),
filmRegion_,
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
filmRegion_,
dimensionedScalar("cp", dimEnergy/dimMass/dimTemperature, 0.0),
dimensionedScalar("Cp", dimEnergy/dimMass/dimTemperature, 0.0),
zeroGradientFvPatchScalarField::typeName
),
kappa_
@ -526,9 +526,9 @@ void Foam::surfaceFilmModels::thermoSingleLayer::evolveFilm()
const Foam::volScalarField&
Foam::surfaceFilmModels::thermoSingleLayer::cp() const
Foam::surfaceFilmModels::thermoSingleLayer::Cp() const
{
return cp_;
return Cp_;
}

6
src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.H
View File

@ -27,7 +27,7 @@ Class
Description
Thermodynamic form of single-cell layer surface film model
Note: defining enthalpy as cp(T - Tstd) - when using liquids from the
Note: defining enthalpy as Cp(T - Tstd) - when using liquids from the
thermophysical library, their enthalpies are calculated similarly, where
Tstd = 298.15 K
@ -90,7 +90,7 @@ protected:
// Fields
//- Specific heat capacity / [J/kg/K]
volScalarField cp_;
volScalarField Cp_;
//- Thermal conductivity / [W/m/K]
volScalarField kappa_;
@ -218,7 +218,7 @@ public:
// Fields
//- Return the film specific heat capacity [J/kg/K]
virtual const volScalarField& cp() const;
virtual const volScalarField& Cp() const;
//- Return the film thermal conductivity [W/m/K]
virtual const volScalarField& kappa() const;

4
src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayerI.H
View File

@ -61,7 +61,7 @@ Foam::surfaceFilmModels::thermoSingleLayer::hs
IOobject::NO_READ,
IOobject::NO_WRITE
),
cp_*(T - Tstd),
Cp_*(T - Tstd),
zeroGradientFvPatchScalarField::typeName
)
);
@ -88,7 +88,7 @@ Foam::surfaceFilmModels::thermoSingleLayer::T
IOobject::NO_READ,
IOobject::NO_WRITE
),
hs/cp_ + Tstd,
hs/Cp_ + Tstd,
zeroGradientFvPatchScalarField::typeName
)
);