Skip to content
Snippets Groups Projects
Commit 11867497 authored by Andrew Heather's avatar Andrew Heather
Browse files

updated to reflect changes in turbulence models

parent 80499b9c
Branches
Tags
No related merge requests found
Showing
with 35 additions and 40 deletions
...@@ -5,6 +5,6 @@ EXE_INC = \ ...@@ -5,6 +5,6 @@ EXE_INC = \
EXE_LIBS = \ EXE_LIBS = \
-lfiniteVolume \ -lfiniteVolume \
-lincompressibleRASmodels \ -lincompressibleRASModels \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-lfiniteVolume -lfiniteVolume
...@@ -23,7 +23,7 @@ License ...@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Application Application
R R
Description Description
Calculates and writes the Reynolds stress R for the current time step. Calculates and writes the Reynolds stress R for the current time step.
...@@ -32,7 +32,7 @@ Description ...@@ -32,7 +32,7 @@ Description
#include "fvCFD.H" #include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H" #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
#include "incompressible/RASmodel/RASmodel.H" #include "incompressible/RASModel/RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...@@ -60,7 +60,7 @@ int main(int argc, char *argv[]) ...@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
IOobject::NO_READ, IOobject::NO_READ,
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
turbulence->R() RASModel->R()
); );
R.write(); R.write();
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
singlePhaseTransportModel laminarTransport(U, phi); singlePhaseTransportModel laminarTransport(U, phi);
autoPtr<incompressible::RASmodel> turbulence autoPtr<incompressible::RASModel> RASModel
( (
incompressible::RASmodel::New(U, phi, laminarTransport) incompressible::RASModel::New(U, phi, laminarTransport)
); );
...@@ -5,5 +5,5 @@ EXE_INC = \ ...@@ -5,5 +5,5 @@ EXE_INC = \
EXE_LIBS = \ EXE_LIBS = \
-lfiniteVolume \ -lfiniteVolume \
-lincompressibleRASmodels \ -lincompressibleRASModels \
-lincompressibleTransportModels -lincompressibleTransportModels
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
singlePhaseTransportModel laminarTransport(U, phi); singlePhaseTransportModel laminarTransport(U, phi);
autoPtr<incompressible::RASmodel> turbulence autoPtr<incompressible::RASModel> RASModel
( (
incompressible::RASmodel::New(U, phi, laminarTransport) incompressible::RASModel::New(U, phi, laminarTransport)
); );
...@@ -36,7 +36,7 @@ Source files: ...@@ -36,7 +36,7 @@ Source files:
#include "fvCFD.H" #include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H" #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
#include "incompressible/RASmodel/RASmodel.H" #include "incompressible/RASModel/RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...@@ -68,13 +68,13 @@ int main(int argc, char *argv[]) ...@@ -68,13 +68,13 @@ int main(int argc, char *argv[])
// Cache the turbulence fields // Cache the turbulence fields
Info<< "\nRetrieving field k from turbulence model" << endl; Info<< "\nRetrieving field k from turbulence model" << endl;
const volScalarField k = turbulence->k(); const volScalarField k = RASModel->k();
Info<< "\nRetrieving field epsilon from turbulence model" << endl; Info<< "\nRetrieving field epsilon from turbulence model" << endl;
const volScalarField epsilon = turbulence->epsilon(); const volScalarField epsilon = RASModel->epsilon();
Info<< "\nRetrieving field R from turbulence model" << endl; Info<< "\nRetrieving field R from turbulence model" << endl;
const volSymmTensorField R = turbulence->R(); const volSymmTensorField R = RASModel->R();
// Check availability of tubulence fields // Check availability of tubulence fields
......
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude
-I$(LIB_SRC)/turbulenceModels/RAS \
-I$(LIB_SRC)/transportModels
EXE_LIBS = \ EXE_LIBS = \
-lincompressibleRASmodels \
-lincompressibleTransportModels \
-lfiniteVolume -lfiniteVolume
...@@ -31,7 +31,6 @@ Description ...@@ -31,7 +31,6 @@ Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "fvCFD.H" #include "fvCFD.H"
#include "incompressible/RASmodel/RASmodel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
...@@ -6,7 +6,7 @@ EXE_INC = \ ...@@ -6,7 +6,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lcompressibleRASmodels \ -lcompressibleRASModels \
-lcombustionThermophysicalModels \ -lcombustionThermophysicalModels \
-lfiniteVolume \ -lfiniteVolume \
-lspecie \ -lspecie \
......
...@@ -31,9 +31,9 @@ volVectorField U ...@@ -31,9 +31,9 @@ volVectorField U
#include "compressibleCreatePhi.H" #include "compressibleCreatePhi.H"
autoPtr<compressible::RASmodel> turbulence autoPtr<compressible::RASModel> RASModel
( (
compressible::RASmodel::New compressible::RASModel::New
( (
rho, rho,
U, U,
......
...@@ -34,7 +34,7 @@ Description ...@@ -34,7 +34,7 @@ Description
#include "fvCFD.H" #include "fvCFD.H"
#include "hCombustionThermo.H" #include "hCombustionThermo.H"
#include "compressible/RASmodel/RASmodel.H" #include "compressible/RASModel/RASModel.H"
#include "wallFvPatch.H" #include "wallFvPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...@@ -56,7 +56,7 @@ int main(int argc, char *argv[]) ...@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
# include "createFields.H" # include "createFields.H"
surfaceScalarField heatFlux = surfaceScalarField heatFlux =
fvc::interpolate(turbulence->alphaEff())*fvc::snGrad(h); fvc::interpolate(RASModel->alphaEff())*fvc::snGrad(h);
const surfaceScalarField::GeometricBoundaryField& patchHeatFlux = const surfaceScalarField::GeometricBoundaryField& patchHeatFlux =
heatFlux.boundaryField(); heatFlux.boundaryField();
......
...@@ -4,6 +4,6 @@ EXE_INC = \ ...@@ -4,6 +4,6 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels -I$(LIB_SRC)/transportModels
EXE_LIBS = \ EXE_LIBS = \
-lincompressibleRASmodels \ -lincompressibleRASModels \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-lfiniteVolume -lfiniteVolume
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
singlePhaseTransportModel laminarTransport(U, phi); singlePhaseTransportModel laminarTransport(U, phi);
autoPtr<incompressible::RASmodel> turbulence autoPtr<incompressible::RASModel> RASModel
( (
incompressible::RASmodel::New(U, phi, laminarTransport) incompressible::RASModel::New(U, phi, laminarTransport)
); );
...@@ -32,7 +32,7 @@ Description ...@@ -32,7 +32,7 @@ Description
#include "fvCFD.H" #include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H" #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
#include "incompressible/RASmodel/RASmodel.H" #include "incompressible/RASModel/RASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...@@ -52,7 +52,7 @@ int main(int argc, char *argv[]) ...@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
# include "createFields.H" # include "createFields.H"
volSymmTensorField Reff(turbulence->devReff()); volSymmTensorField Reff(RASModel->devReff());
volVectorField wallShearStress volVectorField wallShearStress
( (
......
...@@ -5,6 +5,6 @@ EXE_INC = \ ...@@ -5,6 +5,6 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude -I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lincompressibleLESmodels \ -lincompressibleLESModels \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-lfiniteVolume -lfiniteVolume
...@@ -16,9 +16,9 @@ volVectorField U ...@@ -16,9 +16,9 @@ volVectorField U
singlePhaseTransportModel laminarTransport(U, phi); singlePhaseTransportModel laminarTransport(U, phi);
autoPtr<incompressible::LESmodel> sgsModel autoPtr<incompressible::LESModel> sgsModel
( (
incompressible::LESmodel::New(U, phi, laminarTransport) incompressible::LESModel::New(U, phi, laminarTransport)
); );
volScalarField::GeometricBoundaryField d = nearWallDist(mesh).y(); volScalarField::GeometricBoundaryField d = nearWallDist(mesh).y();
...@@ -32,7 +32,7 @@ Description ...@@ -32,7 +32,7 @@ Description
#include "fvCFD.H" #include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H" #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
#include "incompressible/LESmodel/LESmodel.H" #include "incompressible/LESModel/LESModel.H"
#include "nearWallDist.H" #include "nearWallDist.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...@@ -83,9 +83,9 @@ int main(int argc, char *argv[]) ...@@ -83,9 +83,9 @@ int main(int argc, char *argv[])
singlePhaseTransportModel laminarTransport(U, phi); singlePhaseTransportModel laminarTransport(U, phi);
autoPtr<incompressible::LESmodel> sgsModel autoPtr<incompressible::LESModel> sgsModel
( (
incompressible::LESmodel::New(U, phi, laminarTransport) incompressible::LESModel::New(U, phi, laminarTransport)
); );
volScalarField::GeometricBoundaryField d = nearWallDist(mesh).y(); volScalarField::GeometricBoundaryField d = nearWallDist(mesh).y();
......
...@@ -4,6 +4,6 @@ EXE_INC = \ ...@@ -4,6 +4,6 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels -I$(LIB_SRC)/transportModels
EXE_LIBS = \ EXE_LIBS = \
-lincompressibleRASmodels \ -lincompressibleRASModels \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-lfiniteVolume -lfiniteVolume
...@@ -32,7 +32,7 @@ Description ...@@ -32,7 +32,7 @@ Description
#include "fvCFD.H" #include "fvCFD.H"
#include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H" #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
#include "incompressible/RASmodel/RASmodel.H" #include "incompressible/RASModel/RASModel.H"
#include "wallFvPatch.H" #include "wallFvPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...@@ -83,9 +83,9 @@ int main(int argc, char *argv[]) ...@@ -83,9 +83,9 @@ int main(int argc, char *argv[])
singlePhaseTransportModel laminarTransport(U, phi); singlePhaseTransportModel laminarTransport(U, phi);
autoPtr<incompressible::RASmodel> turbulence autoPtr<incompressible::RASModel> RASModel
( (
incompressible::RASmodel::New(U, phi, laminarTransport) incompressible::RASModel::New(U, phi, laminarTransport)
); );
const fvPatchList& patches = mesh.boundary(); const fvPatchList& patches = mesh.boundary();
...@@ -96,7 +96,7 @@ int main(int argc, char *argv[]) ...@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
if (typeid(currPatch) == typeid(wallFvPatch)) if (typeid(currPatch) == typeid(wallFvPatch))
{ {
yPlus.boundaryField()[patchi] = turbulence->yPlus(patchi); yPlus.boundaryField()[patchi] = RASModel->yPlus(patchi);
const scalarField& Yp = yPlus.boundaryField()[patchi]; const scalarField& Yp = yPlus.boundaryField()[patchi];
Info<< "Patch " << patchi Info<< "Patch " << patchi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment