Corrected for the changes to the name and location of the turbulance models.

This commit is contained in:
henry
2008-06-17 18:54:46 +01:00
parent 79b0d0ca2b
commit e17c195c96
2 changed files with 22 additions and 25 deletions

View File

@ -1,22 +1,20 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude \
-I$(LIB_SRC)/LESmodels \
-I$(LIB_SRC)/turbulenceModels \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/turbulenceModels/RAS \
-I$(LIB_SRC)/turbulenceModels/LES \
-I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-lbasicThermophysicalModels \
-lspecie \
-lcompressibleLESmodels \
-lincompressibleLESmodels \
-lcompressibleTurbulenceModels \
-lincompressibleTurbulenceModels \
-lincompressibleTransportModels \
-lfiniteVolume \ -lfiniteVolume \
-lmeshTools \ -lmeshTools \
-lsampling -lincompressibleTransportModels \
-lincompressibleTurbulenceModels \
-lincompressibleLESmodels \
-lbasicThermophysicalModels \
-lspecie \
-lcompressibleTurbulenceModels \
-lcompressibleLESmodels

View File

@ -30,12 +30,10 @@ License
#include "Time.H" #include "Time.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H" #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
#include "incompressible/RASmodel/RASmodel.H"
#include "incompressible/turbulenceModel/turbulenceModel.H"
#include "incompressible/LESmodel/LESmodel.H" #include "incompressible/LESmodel/LESmodel.H"
#include "basicThermo.H" #include "basicThermo.H"
#include "compressible/turbulenceModel/turbulenceModel.H" #include "compressible/RASmodel/RASmodel.H"
#include "compressible/LESmodel/LESmodel.H" #include "compressible/LESmodel/LESmodel.H"
@ -52,19 +50,20 @@ Foam::tmp<Foam::volSymmTensorField> Foam::forces::devRhoReff() const
{ {
if if
( (
obr_.foundObject<compressible::turbulenceModel>("turbulenceProperties") obr_.foundObject<compressible::RASmodel>("turbulenceProperties")
) )
{ {
const compressible::turbulenceModel& ras const compressible::RASmodel& ras
= obr_.lookupObject<compressible::turbulenceModel> = obr_.lookupObject<compressible::RASmodel>
("turbulenceProperties"); ("turbulenceProperties");
return ras.devRhoReff(); return ras.devRhoReff();
} }
else if (obr_.foundObject<turbulenceModel>("turbulenceProperties")) else if (obr_.foundObject<incompressible::RASmodel>("turbulenceProperties"))
{ {
const turbulenceModel& ras const incompressible::RASmodel& ras
= obr_.lookupObject<turbulenceModel>("turbulenceProperties"); = obr_.lookupObject<incompressible::RASmodel>
("turbulenceProperties");
return rhoRef_*ras.devReff(); return rhoRef_*ras.devReff();
} }