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

execFlowFunctionObjects: Update handling of turbulence models

Browse Source
This commit is contained in:
Henry
2015-04-25 16:31:09 +01:00
parent 48155ba517
commit 0795ebed1f
2 changed files with 15 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options
View File

@ -1,5 +1,7 @@
EXE_INC = \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
@ -20,6 +22,6 @@ EXE_LIBS = \
-lspecie \
-lfiniteVolume \
-lfvOptions \
-lgenericPatchFields \
-lmeshTools \
-lsampling \
-lgenericPatchFields
-lsampling

70
applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C
View File

@ -45,7 +45,7 @@ Description
#include "ReadFields.H"
#include "fvIOoptionList.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
#include "singlePhaseTransportModel.H"
#include "turbulentTransportModel.H"
#include "turbulentFluidThermoModel.H"
@ -298,9 +298,9 @@ void calc
if (phi.dimensions() == dimVolume/dimTime)
{
IOobject RASPropertiesHeader
IOobject turbulencePropertiesHeader
(
"RASProperties",
"turbulenceProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ_IF_MODIFIED,
@ -308,25 +308,13 @@ void calc
false
);
IOobject LESPropertiesHeader
(
"LESProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
);
if (RASPropertiesHeader.headerOk())
if (turbulencePropertiesHeader.headerOk())
{
IOdictionary RASProperties(RASPropertiesHeader);
singlePhaseTransportModel laminarTransport(U, phi);
autoPtr<incompressible::RASModel> RASModel
autoPtr<incompressible::turbulenceModel> turbulenceModel
(
incompressible::RASModel::New
incompressible::turbulenceModel::New
(
U,
phi,
@ -336,19 +324,6 @@ void calc
fol.execute(true);
}
else if (LESPropertiesHeader.headerOk())
{
IOdictionary LESProperties(LESPropertiesHeader);
singlePhaseTransportModel laminarTransport(U, phi);
autoPtr<incompressible::LESModel> sgsModel
(
incompressible::LESModel::New(U, phi, laminarTransport)
);
fol.execute(true);
}
else
{
IOdictionary transportProperties
@ -381,9 +356,9 @@ void calc
thermo->rho()
);
IOobject RASPropertiesHeader
IOobject turbulencePropertiesHeader
(
"RASProperties",
"turbulenceProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ_IF_MODIFIED,
@ -391,23 +366,11 @@ void calc
false
);
IOobject LESPropertiesHeader
(
"LESProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
);
if (RASPropertiesHeader.headerOk())
if (turbulencePropertiesHeader.headerOk())
{
IOdictionary RASProperties(RASPropertiesHeader);
autoPtr<compressible::RASModel> RASModel
autoPtr<compressible::turbulenceModel> turbulenceModel
(
compressible::RASModel::New
compressible::turbulenceModel::New
(
rho,
U,
@ -418,17 +381,6 @@ void calc
fol.execute(true);
}
else if (LESPropertiesHeader.headerOk())
{
IOdictionary LESProperties(LESPropertiesHeader);
autoPtr<compressible::LESModel> sgsModel
(
compressible::LESModel::New(rho, U, phi, thermo())
);
fol.execute(true);
}
else
{
IOdictionary transportProperties