INT: Additional integration updates

This commit is contained in:
Andrew Heather
2018-05-11 12:04:33 +01:00
parent 2f888d1684
commit 889791060c
10 changed files with 53 additions and 34 deletions

View File

@ -87,10 +87,13 @@ int main(int argc, char *argv[])
autoPtr<volScalarField> divrhoU;
if (correctPhi)
{
divrhoU = new volScalarField
divrhoU.reset
(
"divrhoU",
fvc::div(fvc::absolute(phi, rho, U))
new volScalarField
(
"divrhoU",
fvc::div(fvc::absolute(phi, rho, U))
)
);
}
@ -112,7 +115,7 @@ int main(int argc, char *argv[])
autoPtr<volVectorField> rhoU;
if (rhoUf.valid())
{
rhoU = new volVectorField("rhoU", rho*U);
rhoU.reset(new volVectorField("rhoU", rho*U));
}
// Do any mesh changes

View File

@ -56,7 +56,6 @@ int main(int argc, char *argv[])
#include "readEngineTimeControls.H"
#include "createFields.H"
#include "createFieldRefs.H"
#include "createFvOptions.H"
#include "createRhoUf.H"
#include "compressibleCourantNo.H"
#include "setInitialDeltaT.H"

View File

@ -396,7 +396,7 @@ Foam::tmp<Foam::volScalarField> Foam::twoPhaseMixtureEThermo::gamma() const
{
return tmp<volScalarField>
(
(alpha1_*Cp1() + alpha2_*Cp2()) / (alpha1_*Cv1() + alpha2_*Cv2())
(alpha1_*Cp1() + alpha2_*Cp2())/(alpha1_*Cv1() + alpha2_*Cv2())
);
}
@ -429,7 +429,7 @@ Foam::tmp<Foam::scalarField> Foam::twoPhaseMixtureEThermo::Cpv
const label patchi
) const
{
// This is a e thermo (Cpv = Cv)
// This is an e thermo (Cpv = Cv)
return Cv(p, T, patchi);
}
@ -441,6 +441,13 @@ Foam::tmp<Foam::volScalarField> Foam::twoPhaseMixtureEThermo::CpByCpv() const
}
Foam::tmp<Foam::volScalarField> Foam::twoPhaseMixtureEThermo::W() const
{
NotImplemented;
return nullptr;
}
Foam::tmp<Foam::scalarField> Foam::twoPhaseMixtureEThermo::CpByCpv
(
const scalarField& p,

View File

@ -233,6 +233,9 @@ public:
const label patchi
) const;
//- Molecular weight [kg/kmol]
virtual tmp<volScalarField> W() const;
//- Thermal diffusivity for temperature of mixture [J/m/s/K]
virtual tmp<volScalarField> kappa() const;