diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options index 7bd2704fff..33c0f0a171 100644 --- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options +++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/Make/options @@ -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 diff --git a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C index 99d7de9b95..8e0c2ce7cf 100644 --- a/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C +++ b/applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C @@ -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 RASModel + autoPtr 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 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 RASModel + autoPtr 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 sgsModel - ( - compressible::LESModel::New(rho, U, phi, thermo()) - ); - - fol.execute(true); - } else { IOdictionary transportProperties