MRFZone: rationalize to allow support for general frame acceleration

This commit is contained in:
Henry
2015-05-29 15:31:53 +01:00
parent 38177526ff
commit 38171e0c7a
17 changed files with 82 additions and 75 deletions

View File

@ -126,20 +126,20 @@ bool Foam::MRFZoneList::writeData(Ostream& os) const
}
void Foam::MRFZoneList::addCoriolis
void Foam::MRFZoneList::addAcceleration
(
const volVectorField& U,
volVectorField& ddtU
) const
{
forAll(*this, i)
{
{
operator[](i).addCoriolis(U, ddtU);
}
}
void Foam::MRFZoneList::addCoriolis(fvVectorMatrix& UEqn) const
void Foam::MRFZoneList::addAcceleration(fvVectorMatrix& UEqn) const
{
forAll(*this, i)
{
@ -148,7 +148,7 @@ void Foam::MRFZoneList::addCoriolis(fvVectorMatrix& UEqn) const
}
void Foam::MRFZoneList::addCoriolis
void Foam::MRFZoneList::addAcceleration
(
const volScalarField& rho,
fvVectorMatrix& UEqn
@ -161,7 +161,7 @@ void Foam::MRFZoneList::addCoriolis
}
Foam::tmp<Foam::volVectorField> Foam::MRFZoneList::operator()
Foam::tmp<Foam::volVectorField> Foam::MRFZoneList::DDt
(
const volVectorField& U
)
@ -191,13 +191,13 @@ Foam::tmp<Foam::volVectorField> Foam::MRFZoneList::operator()
}
Foam::tmp<Foam::volVectorField> Foam::MRFZoneList::operator()
Foam::tmp<Foam::volVectorField> Foam::MRFZoneList::DDt
(
const volScalarField& rho,
const volVectorField& U
)
{
return rho*operator()(U);
return rho*DDt(U);
}

View File

@ -93,23 +93,31 @@ public:
//- Reset the source list
void reset(const dictionary& dict);
//- Add the Coriolis force contribution to the acceleration field
void addCoriolis(const volVectorField& U, volVectorField& ddtU) const;
//- Add the frame acceleration
void addAcceleration
(
const volVectorField& U,
volVectorField& ddtU
) const;
//- Add the Coriolis force contribution to the momentum equation
void addCoriolis(fvVectorMatrix& UEqn) const;
//- Add the frame acceleration contribution to the momentum equation
void addAcceleration(fvVectorMatrix& UEqn) const;
//- Add the Coriolis force contribution to the momentum equation
void addCoriolis(const volScalarField& rho, fvVectorMatrix& UEqn) const;
//- Add the frame acceleration contribution to the momentum equation
void addAcceleration
(
const volScalarField& rho,
fvVectorMatrix& UEqn
) const;
//- Return the frame acceleration
tmp<volVectorField> operator()
tmp<volVectorField> DDt
(
const volVectorField& U
);
//- Return the frame acceleration force
tmp<volVectorField> operator()
//- Return the frame acceleration
tmp<volVectorField> DDt
(
const volScalarField& rho,
const volVectorField& U