From 0a263adf4b1c3f4b9a021637be207488b6757bb7 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Fri, 15 Oct 2010 19:55:32 +0100 Subject: [PATCH] Incorporating Swig interface: library changes. Origin: VulaSHAKA project --- .../HashTables/HashPtrTable/HashPtrTable.H | 18 +- .../polyPatches/polyPatch/polyPatch.H | 2 + .../sphericalTensor/sphericalTensor.H | 9 +- .../primitives/VectorSpace/VectorSpace.H | 2 + src/OpenFOAM/primitives/ops/ops.H | 346 +++++++++++++----- .../dynamicFvMesh/dynamicFvMesh.H | 2 + .../fvPatchFields/fvPatchField/fvPatchField.H | 5 +- .../fvsPatchField/fvsPatchField.H | 11 +- .../fvMatrices/fvMatrix/fvMatrix.H | 2 + .../fvMesh/fvPatches/fvPatch/fvPatch.H | 2 + .../psiThermo/basicPsiThermo/basicPsiThermo.H | 4 + .../radiationModel/radiationModel.H | 3 +- .../twoPhaseMixture.C | 10 +- .../viscosityModel/viscosityModel.H | 2 + .../compressible/LES/LESModel/LESModel.H | 2 +- .../compressible/RAS/RASModel/RASModel.H | 8 +- .../turbulenceModel/turbulenceModel.H | 4 +- .../incompressible/LES/LESModel/LESModel.H | 2 +- .../incompressible/RAS/RASModel/RASModel.H | 2 +- 19 files changed, 318 insertions(+), 118 deletions(-) diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H index d8d6b324d..09d906651 100644 --- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H +++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H @@ -65,10 +65,10 @@ template Ostream& operator<< /*---------------------------------------------------------------------------*\ - Class HashPtrTable Declaration + Class HashPtrTable Declaration \*---------------------------------------------------------------------------*/ -template +template class HashPtrTable : public HashTable @@ -89,7 +89,7 @@ public: // Constructors //- Construct given initial table size - HashPtrTable(label size = 100); + HashPtrTable(const label size = 128); //- Construct from Istream using given Istream constructor class template @@ -128,23 +128,19 @@ public: // IOstream Operators - friend Istream& operator>> - #ifndef __CINT__ - - #endif +#ifndef SWIG + friend Istream& operator>> ( Istream&, HashPtrTable& ); - friend Ostream& operator<< - #ifndef __CINT__ - - #endif + friend Ostream& operator<< ( Ostream&, const HashPtrTable& ); +#endif }; diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H index 2ebf7aac9..98b43c005 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H @@ -228,6 +228,7 @@ public: // Declare run-time constructor selection tables +#ifndef SWIG declareRunTimeSelectionTable ( autoPtr, @@ -256,6 +257,7 @@ public: ), (name, dict, index, bm) ); +#endif // Constructors diff --git a/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H b/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H index 1710a7e40..2cb62a151 100644 --- a/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H +++ b/src/OpenFOAM/primitives/SphericalTensor/sphericalTensor/sphericalTensor.H @@ -48,11 +48,12 @@ namespace Foam typedef SphericalTensor sphericalTensor; -// Identity tensor -static const sphericalTensor I(1); -static const sphericalTensor oneThirdI(1.0/3.0); -static const sphericalTensor twoThirdsI(2.0/3.0); +// Identity tensor +static const sphericalTensor I; + +static const sphericalTensor oneThirdI; +static const sphericalTensor twoThirdsI; //- Specify data associated with sphericalTensor type are contiguous diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H index 07272207c..560c8f502 100644 --- a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H +++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H @@ -136,6 +136,7 @@ public: // IOstream Operators +#ifndef SWIG friend Istream& operator>> ( Istream&, @@ -147,6 +148,7 @@ public: Ostream&, const VectorSpace& ); +#endif }; diff --git a/src/OpenFOAM/primitives/ops/ops.H b/src/OpenFOAM/primitives/ops/ops.H index a1375e296..4bbedc525 100644 --- a/src/OpenFOAM/primitives/ops/ops.H +++ b/src/OpenFOAM/primitives/ops/ops.H @@ -32,6 +32,11 @@ Description combined using the given combination function and the result is broadcast to all nodes +Note: + Format of this file has considerably changed to remove cpp pre-processor + definition in order to help Swig with parsing in. Implemented by + Alexey Petrov; merged by HJ, 14/Oct/2010 + \*---------------------------------------------------------------------------*/ #ifndef ops_H @@ -42,103 +47,272 @@ Description namespace Foam { -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +template +class eqOp2 +{ public: void operator()(T1& x, const T2& y) const { x = y; } }; -#define EqOp(opName, op) \ - \ -template \ -class opName##Op2 \ -{ \ -public: \ - \ - void operator()(T1& x, const T2& y) const \ - { \ - op; \ - } \ -}; \ - \ -template \ -class opName##Op \ -{ \ -public: \ - \ - void operator()(T& x, const T& y) const \ - { \ - op; \ - } \ -}; +template +class eqOp +{ public: void operator()(T& x, const T& y) const { x = y; } }; -EqOp(eq, x = y) -EqOp(plusEq, x += y) -EqOp(minusEq, x -= y) -EqOp(multiplyEq, x *= y) -EqOp(divideEq, x /= y) -EqOp(eqMag, x = mag(y)) -EqOp(plusEqMagSqr, x += magSqr(y)) -EqOp(maxEq, x = max(x, y)) -EqOp(minEq, x = min(x, y)) -EqOp(andEq, x = (x && y)) -EqOp(orEq, x = (x || y)) +template +class plusEqOp2 +{ public: void operator()(T1& x, const T2& y) const { x += y; } }; -EqOp(eqMinus, x = -y) +template + class plusEqOp +{ public: void operator()(T& x, const T& y) const { x += y; } }; -#undef EqOp +template + class minusEqOp2 +{ public: void operator()(T1& x, const T2& y) const { x -= y; } }; + +template +class minusEqOp +{ public: void operator()(T& x, const T& y) const { x -= y; } }; + +template +class multiplyEqOp2 +{ public: void operator()(T1& x, const T2& y) const { x *= y; } }; + +template +class multiplyEqOp +{ public: void operator()(T& x, const T& y) const { x *= y; } }; + +template +class divideEqOp2 +{ public: void operator()(T1& x, const T2& y) const { x /= y; } }; + +template +class divideEqOp +{ public: void operator()(T& x, const T& y) const { x /= y; } }; + +template +class eqMagOp2 +{ public: void operator()(T1& x, const T2& y) const { x = mag(y); } }; + +template +class eqMagOp +{ public: void operator()(T& x, const T& y) const { x = mag(y); } }; + +template +class plusEqMagSqrOp2 +{ public: void operator()(T1& x, const T2& y) const { x += magSqr(y); } }; + +template +class plusEqMagSqrOp +{ public: void operator()(T& x, const T& y) const { x += magSqr(y); } }; + +template +class maxEqOp2 +{ public: void operator()(T1& x, const T2& y) const { x = max(x, y); } }; + +template +class maxEqOp +{ public: void operator()(T& x, const T& y) const { x = max(x, y); } }; + +template +class minEqOp2 +{ public: void operator()(T1& x, const T2& y) const { x = min(x, y); } }; + +template +class minEqOp +{ public: void operator()(T& x, const T& y) const { x = min(x, y); } }; + +template +class andEqOp2 +{ public: void operator()(T1& x, const T2& y) const { x = (x && y); } }; + +template +class andEqOp +{ public: void operator()(T& x, const T& y) const { x = (x && y); } }; + +template +class orEqOp2 +{ public: void operator()(T1& x, const T2& y) const { x = (x || y); } }; + +template +class orEqOp +{ public: void operator()(T& x, const T& y) const { x = (x || y); } }; + +template +class eqMinusOp2 +{ public: void operator()(T1& x, const T2& y) const { x = -y; } }; + +template +class eqMinusOp +{ public: void operator()(T& x, const T& y) const { x = -y; } }; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#define Op(opName, op) \ - \ -template \ -class opName##Op3 \ -{ \ -public: \ - \ - T operator()(const T1& x, const T2& y) const \ - { \ - return op; \ - } \ -}; \ - \ -template \ -class opName##Op2 \ -{ \ -public: \ - \ - T1 operator()(const T1& x, const T2& y) const \ - { \ - return op; \ - } \ -}; \ - \ -template \ -class opName##Op \ -{ \ -public: \ - \ - T operator()(const T& x, const T& y) const \ - { \ - return op; \ - } \ -}; +template +class sumOp3 +{ public: T operator()(const T1& x, const T2& y) const { return x + y; } }; -Op(sum, x + y) +template +class sumOp2 +{ public: T1 operator()(const T1& x, const T2& y) const { return x + y; } }; -Op(plus, x + y) -Op(minus, x - y) -Op(multiply, x * y) -Op(divide, x / y) -Op(cmptMultiply, cmptMultiply(x, y)) -Op(cmptDivide, cmptDivide(x, y)) -Op(stabilise, stabilise(x, y)) -Op(max, max(x, y)) -Op(min, min(x, y)) -Op(minMod, minMod(x, y)) -Op(and, x && y) -Op(or, x || y) -Op(eqEq, x == y) +template +class sumOp +{ public: T operator()(const T& x, const T& y) const { return x + y; } }; -#undef Op +template +class plusOp3 +{ public: T operator()(const T1& x, const T2& y) const { return x + y; } }; + +template +class plusOp2 +{ public: T1 operator()(const T1& x, const T2& y) const { return x + y; } }; + +template +class plusOp +{ public: T operator()(const T& x, const T& y) const { return x + y; } }; + +template +class minusOp3 +{ public: T operator()(const T1& x, const T2& y) const { return x - y; } }; + +template +class minusOp2 +{ public: T1 operator()(const T1& x, const T2& y) const { return x - y; } }; + +template +class minusOp +{ public: T operator()(const T& x, const T& y) const { return x - y; } }; + +template +class multiplyOp3 +{ public: T operator()(const T1& x, const T2& y) const { return x * y; } }; + +template +class multiplyOp2 +{ public: T1 operator()(const T1& x, const T2& y) const { return x * y; } }; + +template +class multiplyOp +{ public: T operator()(const T& x, const T& y) const { return x * y; } }; + +template +class divideOp3 +{ public: T operator()(const T1& x, const T2& y) const { return x / y; } }; + +template +class divideOp2 +{ public: T1 operator()(const T1& x, const T2& y) const { return x / y; } }; + +template +class divideOp +{ public: T operator()(const T& x, const T& y) const { return x / y; } }; + +template +class cmptMultiplyOp3 +{ public: T operator()(const T1& x, const T2& y) const { return cmptMultiply(x, y); } }; + +template +class cmptMultiplyOp2 +{ public: T1 operator()(const T1& x, const T2& y) const { return cmptMultiply(x, y); } }; + +template +class cmptMultiplyOp +{ public: T operator()(const T& x, const T& y) const { return cmptMultiply(x, y); } }; + +template +class cmptDivideOp3 +{ public: T operator()(const T1& x, const T2& y) const { return cmptDivide(x, y); } }; + +template +class cmptDivideOp2 +{ public: T1 operator()(const T1& x, const T2& y) const { return cmptDivide(x, y); } }; + +template +class cmptDivideOp +{ public: T operator()(const T& x, const T& y) const { return cmptDivide(x, y); } }; + +template +class stabiliseOp3 +{ public: T operator()(const T1& x, const T2& y) const { return stabilise(x, y); } }; + +template +class stabiliseOp2 +{ public: T1 operator()(const T1& x, const T2& y) const { return stabilise(x, y); } }; + +template +class stabiliseOp +{ public: T operator()(const T& x, const T& y) const { return stabilise(x, y); } }; + +template +class maxOp3 +{ public: T operator()(const T1& x, const T2& y) const { return max(x, y); } }; + +template +class maxOp2 +{ public: T1 operator()(const T1& x, const T2& y) const { return max(x, y); } }; + +template +class maxOp +{ public: T operator()(const T& x, const T& y) const { return max(x, y); } }; + +template +class minOp3 +{ public: T operator()(const T1& x, const T2& y) const { return min(x, y); } }; + +template +class minOp2 +{ public: T1 operator()(const T1& x, const T2& y) const { return min(x, y); } }; + +template +class minOp +{ public: T operator()(const T& x, const T& y) const { return min(x, y); } }; + +template +class minModOp3 +{ public: T operator()(const T1& x, const T2& y) const { return minMod(x, y); } }; + +template +class minModOp2 +{ public: T1 operator()(const T1& x, const T2& y) const { return minMod(x, y); } }; + +template +class minModOp +{ public: T operator()(const T& x, const T& y) const { return minMod(x, y); } }; + +template +class andOp3 +{ public: T operator()(const T1& x, const T2& y) const { return x && y; } }; + +template +class andOp2 +{ public: T1 operator()(const T1& x, const T2& y) const { return x && y; } }; + +template +class andOp +{ public: T operator()(const T& x, const T& y) const { return x && y; } }; + +template +class orOp3 +{ public: T operator()(const T1& x, const T2& y) const { return x || y; } }; + +template +class orOp2 +{ public: T1 operator()(const T1& x, const T2& y) const { return x || y; } }; + +template +class orOp +{ public: T operator()(const T& x, const T& y) const { return x || y; } }; + +template +class eqEqOp3 +{ public: T operator()(const T1& x, const T2& y) const { return x == y; } }; + +template +class eqEqOp2 +{ public: T1 operator()(const T1& x, const T2& y) const { return x == y; } }; + +template +class eqEqOp +{ public: T operator()(const T& x, const T& y) const { return x == y; } }; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H index cdcde49c5..b6a607922 100644 --- a/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H +++ b/src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H @@ -71,6 +71,7 @@ public: // Declare run-time constructor selection table +#ifndef SWIG declareRunTimeSelectionTable ( autoPtr, @@ -79,6 +80,7 @@ public: (const IOobject& io), (io) ); +#endif // Constructors diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H index e9f8d27e9..8563e00f4 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H @@ -114,6 +114,7 @@ public: // Declare run-time constructor selection tables +#ifndef SWIG declareRunTimeSelectionTable ( tmp, @@ -152,7 +153,7 @@ public: ), (p, iF, dict) ); - +#endif // Constructors @@ -469,7 +470,9 @@ public: // Ostream operator +#ifndef SWIG friend Ostream& operator<< (Ostream&, const fvPatchField&); +#endif }; diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H index e3f6f7e97..cbe1ac818 100644 --- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H @@ -102,6 +102,7 @@ public: // Declare run-time constructor selection tables +#ifndef SWIG declareRunTimeSelectionTable ( tmp, @@ -140,7 +141,7 @@ public: ), (p, iF, dict) ); - +#endif // Constructors @@ -354,7 +355,13 @@ public: // Ostream operator - friend Ostream& operator<< (Ostream&, const fvsPatchField&); +#ifndef SWIG + friend Ostream& operator<< + ( + Ostream&, + const fvsPatchField& + ); +#endif }; diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H index c960e479c..5f9cda21f 100644 --- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H +++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H @@ -447,6 +447,7 @@ public: // Friend operators +#ifndef SWIG friend tmp > operator& ( @@ -483,6 +484,7 @@ public: Ostream&, const fvMatrix& ); +#endif }; diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H index 1bd35d5f2..16ed58608 100644 --- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H +++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H @@ -113,6 +113,7 @@ public: // Declare run-time constructor selection tables +#ifndef SWIG declareRunTimeSelectionTable ( autoPtr, @@ -121,6 +122,7 @@ public: (const polyPatch& patch, const fvBoundaryMesh& bm), (patch, bm) ); +#endif // Constructors diff --git a/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermo.H b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermo.H index e085cfcf8..f779ef58e 100644 --- a/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermo.H +++ b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermo.H @@ -69,6 +69,8 @@ public: //- Declare run-time constructor selection table + +#ifndef SWIG declareRunTimeSelectionTable ( autoPtr, @@ -77,6 +79,8 @@ public: (const fvMesh& mesh), (mesh) ); +#endif + // Constructors diff --git a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.H b/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.H index 806880810..e884a8123 100644 --- a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.H +++ b/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.H @@ -121,6 +121,7 @@ public: // Declare runtime constructor selection table +#ifndef SWIG declareRunTimeSelectionTable ( autoPtr, @@ -131,7 +132,7 @@ public: ), (T) ); - +#endif // Constructors diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.C b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.C index cb6e25b70..2773c6970 100644 --- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.C +++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.C @@ -131,11 +131,11 @@ tmp twoPhaseMixture::rho() const { volScalarField limitedAlpha1 = min(max(alpha1_, scalar(0)), scalar(1)); - return tmp + return tmp ( new volScalarField ( - "rho", + "rho_twoPhaseMixture", limitedAlpha1*rho1_ + (scalar(1) - limitedAlpha1)*rho2_ ) @@ -151,7 +151,7 @@ tmp twoPhaseMixture::mu() const ( new volScalarField ( - "mu", + "mu_twoPhaseMixture", limitedAlpha1*rho1_*nuModel1_->nu() + (scalar(1) - limitedAlpha1)*rho2_*nuModel2_->nu() ) @@ -168,7 +168,7 @@ tmp twoPhaseMixture::muf() const ( new surfaceScalarField ( - "muf", + "muf_twoPhaseMixture", alpha1f*rho1_*fvc::interpolate(nuModel1_->nu()) + (scalar(1) - alpha1f)*rho2_*fvc::interpolate(nuModel2_->nu()) ) @@ -185,7 +185,7 @@ tmp twoPhaseMixture::nuf() const ( new surfaceScalarField ( - "nuf", + "nuf_twoPhaseMixture", ( alpha1f*rho1_*fvc::interpolate(nuModel1_->nu()) + (scalar(1) - alpha1f)*rho2_*fvc::interpolate(nuModel2_->nu()) diff --git a/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.H b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.H index 6f5fcbce8..58a2dce00 100644 --- a/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.H +++ b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModel.H @@ -92,6 +92,7 @@ public: // Declare run-time constructor selection table +#ifndef SWIG declareRunTimeSelectionTable ( autoPtr, @@ -105,6 +106,7 @@ public: ), (name, viscosityProperties, U, phi) ); +#endif // Selectors diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H index b0d4f4ee3..a7d2b963a 100644 --- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H +++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H @@ -144,7 +144,7 @@ public: // Selectors //- Return a reference to the selected LES model - static autoPtr New + static autoPtr New ( const volScalarField& rho, const volVectorField& U, diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H index 341406ab1..f00a8f808 100644 --- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H +++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H @@ -136,6 +136,7 @@ public: // Declare run-time constructor selection table +#ifndef SWIG declareRunTimeSelectionTable ( autoPtr, @@ -149,7 +150,7 @@ public: ), (rho, U, phi, thermoPhysicalModel) ); - +#endif // Constructors @@ -167,7 +168,7 @@ public: // Selectors //- Return a reference to the selected turbulence model - static autoPtr New + static autoPtr New ( const volScalarField& rho, const volVectorField& U, @@ -176,8 +177,7 @@ public: ); - // Destructor - + //- Destructor virtual ~RASModel() {} diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H index d843a55bc..4f90bf391 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H +++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H @@ -104,6 +104,7 @@ public: // Declare run-time constructor selection table +#ifndef SWIG declareRunTimeNewSelectionTable ( autoPtr, @@ -117,6 +118,7 @@ public: ), (rho, U, phi, thermoPhysicalModel) ); +#endif // Constructors @@ -134,7 +136,7 @@ public: // Selectors //- Return a reference to the selected turbulence model - static autoPtr New + static autoPtr New ( const volScalarField& rho, const volVectorField& U, diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H index 1f22db2dc..4682a9cc2 100644 --- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H +++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H @@ -142,7 +142,7 @@ public: // Selectors //- Return a reference to the selected LES model - static autoPtr New + static autoPtr New ( const volVectorField& U, const surfaceScalarField& phi, diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H index 37ab64e76..d1a196327 100644 --- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H +++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H @@ -159,7 +159,7 @@ public: // Selectors //- Return a reference to the selected RAS model - static autoPtr New + static autoPtr New ( const volVectorField& U, const surfaceScalarField& phi,