mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
updates for new thermo and general code tidying
This commit is contained in:
@ -42,7 +42,7 @@ Description
|
||||
#include "incompressible/RAS/RASModel/RASModel.H"
|
||||
#include "incompressible/LES/LESModel/LESModel.H"
|
||||
|
||||
#include "basicThermo.H"
|
||||
#include "basicPsiThermo.H"
|
||||
#include "compressible/RAS/RASModel/RASModel.H"
|
||||
#include "compressible/LES/LESModel/LESModel.H"
|
||||
|
||||
@ -194,7 +194,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
|
||||
}
|
||||
else if (phi.dimensions() == dimensionSet(1, 0, -1, 0, 0))
|
||||
{
|
||||
autoPtr<basicThermo> thermo(basicThermo::New(mesh));
|
||||
autoPtr<basicPsiThermo> thermo(basicPsiThermo::New(mesh));
|
||||
|
||||
volScalarField rho
|
||||
(
|
||||
|
||||
@ -33,7 +33,7 @@ Description
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "calc.H"
|
||||
#include "basicThermo.H"
|
||||
#include "basicPsiThermo.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
|
||||
@ -66,9 +66,9 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
|
||||
if (isFile(runTime.constantPath()/"thermophysicalProperties"))
|
||||
{
|
||||
// thermophysical Mach
|
||||
autoPtr<basicThermo> thermo
|
||||
autoPtr<basicPsiThermo> thermo
|
||||
(
|
||||
basicThermo::New(mesh)
|
||||
basicPsiThermo::New(mesh)
|
||||
);
|
||||
|
||||
volScalarField Cp = thermo->Cp();
|
||||
|
||||
@ -18,9 +18,9 @@
|
||||
{
|
||||
volVectorField U(Uheader, mesh);
|
||||
|
||||
autoPtr<basicThermo> thermo
|
||||
autoPtr<basicPsiThermo> thermo
|
||||
(
|
||||
basicThermo::New(mesh)
|
||||
basicPsiThermo::New(mesh)
|
||||
);
|
||||
|
||||
volScalarField Cp = thermo->Cp();
|
||||
|
||||
@ -39,7 +39,7 @@ Description
|
||||
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
|
||||
#include "incompressible/RAS/RASModel/RASModel.H"
|
||||
#include "incompressible/LES/LESModel/LESModel.H"
|
||||
#include "basicThermo.H"
|
||||
#include "basicPsiThermo.H"
|
||||
#include "compressible/RAS/RASModel/RASModel.H"
|
||||
#include "compressible/LES/LESModel/LESModel.H"
|
||||
|
||||
@ -204,7 +204,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
|
||||
{
|
||||
IOdictionary RASProperties(RASPropertiesHeader);
|
||||
|
||||
autoPtr<basicThermo> thermo(basicThermo::New(mesh));
|
||||
autoPtr<basicPsiThermo> thermo(basicPsiThermo::New(mesh));
|
||||
|
||||
volScalarField rho
|
||||
(
|
||||
@ -252,7 +252,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
|
||||
{
|
||||
IOdictionary LESProperties(LESPropertiesHeader);
|
||||
|
||||
autoPtr<basicThermo> thermo(basicThermo::New(mesh));
|
||||
autoPtr<basicPsiThermo> thermo(basicPsiThermo::New(mesh));
|
||||
|
||||
volScalarField rho
|
||||
(
|
||||
|
||||
Reference in New Issue
Block a user