From 4c00b8b9495f4e3d8fde0c1ad2a4975964d6c46e Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Fri, 30 Nov 2012 14:13:56 +0000 Subject: [PATCH] Revert error in selection of laminar --- .../turbulenceModel/laminar/laminar.C | 23 +++++++++++++++---- .../turbulenceModel/laminar/laminar.H | 11 +++++++++ 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C index d14d92218..915adbc7b 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C +++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C @@ -58,6 +58,19 @@ laminar::laminar {} +// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * // + +autoPtr laminar::New +( + const volVectorField& U, + const surfaceScalarField& phi, + transportModel& lamTransportModel +) +{ + return autoPtr(new laminar(U, phi, lamTransportModel)); +} + + // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // tmp laminar::nut() const @@ -70,7 +83,7 @@ tmp laminar::nut() const ( "nut", runTime_.timeName(), - U_.db(), + mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), @@ -97,7 +110,7 @@ tmp laminar::k() const ( "k", runTime_.timeName(), - U_.db(), + mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), @@ -118,7 +131,7 @@ tmp laminar::epsilon() const ( "epsilon", runTime_.timeName(), - U_.db(), + mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), @@ -142,7 +155,7 @@ tmp laminar::R() const ( "R", runTime_.timeName(), - U_.db(), + mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), @@ -166,7 +179,7 @@ tmp laminar::devReff() const ( "devRhoReff", runTime_.timeName(), - U_.db(), + mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H index 3c6f36120..a52f7bfbe 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H +++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H @@ -70,6 +70,17 @@ public: ); + // Selectors + + //- Return a reference to the selected turbulence model + static autoPtr New + ( + const volVectorField& U, + const surfaceScalarField& phi, + transportModel& lamTransportModel + ); + + //- Destructor virtual ~laminar() {}