zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TurbulenceModels: Removed the redundant propertiesName constructor and selector argument

Browse Source 
The ability to specify the file name of the turbulenceProperties dictionary
during construction was added to support multi-phases but now that the handling
of the phase name extension has been completely rationalised and standardised
this complexity and code clutter is no longer used, needed or appropriate.
This commit is contained in:
Henry Weller
2020-04-07 11:07:31 +01:00
parent 57e685b8de
commit d98c83e62b
134 changed files with 321 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
View File

@ -70,7 +70,6 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& phase, const transportModel& phase,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -85,8 +84,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
phase, phase
propertiesName
), ),
phase_(phase), phase_(phase),

1
applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
View File

@ -173,7 +173,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const phaseModel& transport, const phaseModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

4
applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
View File

@ -35,7 +35,6 @@ Foam::RASModels::phasePressureModel::phasePressureModel
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& phase, const transportModel& phase,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -50,8 +49,7 @@ Foam::RASModels::phasePressureModel::phasePressureModel
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
phase, phase
propertiesName
), ),
alphaMax_(coeffDict_.lookup<scalar>("alphaMax")), alphaMax_(coeffDict_.lookup<scalar>("alphaMax")),

1
applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
View File

@ -115,7 +115,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const phaseModel& transport, const phaseModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -38,7 +38,6 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& phase, const transportModel& phase,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -53,8 +52,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
phase, phase
propertiesName
), ),
phase_(phase), phase_(phase),

3
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -165,7 +165,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const phaseModel& transport, const phaseModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -36,7 +36,6 @@ Foam::RASModels::phasePressureModel::phasePressureModel
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& phase, const transportModel& phase,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -54,8 +53,7 @@ Foam::RASModels::phasePressureModel::phasePressureModel
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
phase, phase
propertiesName
), ),
alphaMax_(coeffDict_.lookup<scalar>("alphaMax")), alphaMax_(coeffDict_.lookup<scalar>("alphaMax")),

3
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -119,7 +119,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const phaseModel& transport, const phaseModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

14
src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -37,8 +37,7 @@ CompressibleTurbulenceModel
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName
) )
: :
TurbulenceModel TurbulenceModel
@ -54,8 +53,7 @@ CompressibleTurbulenceModel
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
) )
{} {}
@ -69,8 +67,7 @@ Foam::CompressibleTurbulenceModel<TransportModel>::New
const volScalarField& rho, const volScalarField& rho,
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName
) )
{ {
return autoPtr<CompressibleTurbulenceModel> return autoPtr<CompressibleTurbulenceModel>
@ -89,8 +86,7 @@ Foam::CompressibleTurbulenceModel<TransportModel>::New
U, U,
phi, phi,
phi, phi,
transport, transport
propertiesName
).ptr()) ).ptr())
); );
} }

8
src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -78,8 +78,7 @@ public:
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName
); );
@ -91,8 +90,7 @@ public:
const volScalarField& rho, const volScalarField& rho,
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transportModel, const transportModel& transportModel
const word& propertiesName = turbulenceModel::propertiesName
); );

8
src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -54,8 +54,7 @@ Foam::EddyDiffusivity<BasicTurbulenceModel>::EddyDiffusivity
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName
) )
: :
BasicTurbulenceModel BasicTurbulenceModel
@ -66,8 +65,7 @@ Foam::EddyDiffusivity<BasicTurbulenceModel>::EddyDiffusivity
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
// Cannot read Prt yet // Cannot read Prt yet

5
src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2015-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -87,8 +87,7 @@ public:
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName
); );

4
src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -46,7 +46,6 @@ buoyantKEpsilon<BasicTurbulenceModel>::buoyantKEpsilon
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -58,7 +57,6 @@ buoyantKEpsilon<BasicTurbulenceModel>::buoyantKEpsilon
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport,
propertiesName,
type type
), ),

3
src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2014-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -118,7 +118,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

20
src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -36,8 +36,7 @@ Foam::ThermalDiffusivity<BasicTurbulenceModel>::ThermalDiffusivity
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName
) )
: :
BasicTurbulenceModel BasicTurbulenceModel
@ -48,8 +47,7 @@ Foam::ThermalDiffusivity<BasicTurbulenceModel>::ThermalDiffusivity
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
) )
{} {}
@ -65,8 +63,7 @@ Foam::ThermalDiffusivity<BasicTurbulenceModel>::New
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName
) )
{ {
return autoPtr<ThermalDiffusivity> return autoPtr<ThermalDiffusivity>
@ -79,8 +76,7 @@ Foam::ThermalDiffusivity<BasicTurbulenceModel>::New
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
).ptr()) ).ptr())
); );
} }
@ -93,8 +89,7 @@ Foam::ThermalDiffusivity<BasicTurbulenceModel>::New
const volScalarField& rho, const volScalarField& rho,
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName
) )
{ {
return autoPtr<ThermalDiffusivity> return autoPtr<ThermalDiffusivity>
@ -105,8 +100,7 @@ Foam::ThermalDiffusivity<BasicTurbulenceModel>::New
rho, rho,
U, U,
phi, phi,
transport, transport
propertiesName
).ptr()) ).ptr())
); );
} }

11
src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2015-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -69,8 +69,7 @@ public:
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName
); );
@ -84,8 +83,7 @@ public:
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transportModel, const transportModel& transportModel
const word& propertiesName = turbulenceModel::propertiesName
); );
@ -95,8 +93,7 @@ public:
const volScalarField& rho, const volScalarField& rho,
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transportModel, const transportModel& transportModel
const word& propertiesName = turbulenceModel::propertiesName
); );

8
src/TurbulenceModels/compressible/compressibleTurbulenceModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -42,16 +42,14 @@ Foam::compressibleTurbulenceModel::compressibleTurbulenceModel
const volScalarField& rho, const volScalarField& rho,
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi
const word& propertiesName
) )
: :
turbulenceModel turbulenceModel
( (
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi
propertiesName
), ),
rho_(rho) rho_(rho)
{} {}

5
src/TurbulenceModels/compressible/compressibleTurbulenceModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -83,8 +83,7 @@ public:
const volScalarField& rho, const volScalarField& rho,
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi
const word& propertiesName
); );
//- Disallow default bitwise copy construction //- Disallow default bitwise copy construction

8
src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -38,8 +38,7 @@ namespace Foam
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const typename BasicCompressibleTurbulenceModel::transportModel& const typename BasicCompressibleTurbulenceModel::transportModel&
transport, transport
const word& propertiesName
) )
{ {
return BasicCompressibleTurbulenceModel::New return BasicCompressibleTurbulenceModel::New
@ -49,8 +48,7 @@ namespace Foam
U, U,
phi, phi,
phi, phi,
transport, transport
propertiesName
); );
} }
} }

5
src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -71,8 +71,7 @@ namespace Foam
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const typename BasicCompressibleTurbulenceModel::transportModel& const typename BasicCompressibleTurbulenceModel::transportModel&
transport, transport
const word& propertiesName = turbulenceModel::propertiesName
); );
} }
} }

14
src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -37,8 +37,7 @@ IncompressibleTurbulenceModel
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const TransportModel& transport, const TransportModel& transport
const word& propertiesName
) )
: :
TurbulenceModel TurbulenceModel
@ -54,8 +53,7 @@ IncompressibleTurbulenceModel
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
) )
{} {}
@ -68,8 +66,7 @@ Foam::IncompressibleTurbulenceModel<TransportModel>::New
( (
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const TransportModel& transport, const TransportModel& transport
const word& propertiesName
) )
{ {
return autoPtr<IncompressibleTurbulenceModel> return autoPtr<IncompressibleTurbulenceModel>
@ -88,8 +85,7 @@ Foam::IncompressibleTurbulenceModel<TransportModel>::New
U, U,
phi, phi,
phi, phi,
transport, transport
propertiesName
).ptr()) ).ptr())
); );
} }

8
src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -79,8 +79,7 @@ public:
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const TransportModel& transport, const TransportModel& transport
const word& propertiesName
); );
@ -91,8 +90,7 @@ public:
( (
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const TransportModel& transportModel, const TransportModel& transportModel
const word& propertiesName = turbulenceModel::propertiesName
); );

8
src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -40,16 +40,14 @@ Foam::incompressibleTurbulenceModel::incompressibleTurbulenceModel
const geometricOneField&, const geometricOneField&,
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi
const word& propertiesName
) )
: :
turbulenceModel turbulenceModel
( (
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi
propertiesName
) )
{} {}

5
src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -83,8 +83,7 @@ public:
const geometricOneField& rho, const geometricOneField& rho,
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi
const word& propertiesName
); );
//- Disallow default bitwise copy construction //- Disallow default bitwise copy construction

6
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -94,7 +94,6 @@ LamBremhorstKE::LamBremhorstKE
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -106,8 +105,7 @@ LamBremhorstKE::LamBremhorstKE
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
Cmu_ Cmu_

3
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -112,7 +112,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -127,7 +127,6 @@ LienCubicKE::LienCubicKE
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -139,8 +138,7 @@ LienCubicKE::LienCubicKE
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
Ceps1_ Ceps1_

3
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -141,7 +141,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -93,7 +93,6 @@ LienLeschziner::LienLeschziner
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -105,8 +104,7 @@ LienLeschziner::LienLeschziner
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
Ceps1_ Ceps1_

3
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -129,7 +129,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -84,7 +84,6 @@ ShihQuadraticKE::ShihQuadraticKE
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -96,8 +95,7 @@ ShihQuadraticKE::ShihQuadraticKE
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
Ceps1_ Ceps1_

3
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -116,7 +116,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -223,7 +223,6 @@ kkLOmega::kkLOmega
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -235,8 +234,7 @@ kkLOmega::kkLOmega
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
A0_ A0_

3
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -222,7 +222,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -84,7 +84,6 @@ qZeta::qZeta
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -96,8 +95,7 @@ qZeta::qZeta
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
Cmu_ Cmu_

3
src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -123,7 +123,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

8
src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -37,8 +37,7 @@ namespace Foam
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const typename BasicIncompressibleTurbulenceModel::transportModel& const typename BasicIncompressibleTurbulenceModel::transportModel&
transport, transport
const word& propertiesName
) )
{ {
return BasicIncompressibleTurbulenceModel::New return BasicIncompressibleTurbulenceModel::New
@ -48,8 +47,7 @@ namespace Foam
U, U,
phi, phi,
phi, phi,
transport, transport
propertiesName
); );
} }
} }

5
src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -67,8 +67,7 @@ namespace Foam
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const typename BasicIncompressibleTurbulenceModel::transportModel& const typename BasicIncompressibleTurbulenceModel::transportModel&
transport, transport
const word& propertiesName = turbulenceModel::propertiesName
); );
} }
} }

4
src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -46,7 +46,6 @@ NicenoKEqn<BasicTurbulenceModel>::NicenoKEqn
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -58,7 +57,6 @@ NicenoKEqn<BasicTurbulenceModel>::NicenoKEqn
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport,
propertiesName,
type type
), ),

3
src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -133,7 +133,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

4
src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -44,7 +44,6 @@ SmagorinskyZhang<BasicTurbulenceModel>::SmagorinskyZhang
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -56,7 +55,6 @@ SmagorinskyZhang<BasicTurbulenceModel>::SmagorinskyZhang
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport,
propertiesName,
type type
), ),

1
src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H
View File

@ -126,7 +126,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

4
src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -44,7 +44,6 @@ continuousGasKEqn<BasicTurbulenceModel>::continuousGasKEqn
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -56,7 +55,6 @@ continuousGasKEqn<BasicTurbulenceModel>::continuousGasKEqn
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport,
propertiesName,
type type
), ),

3
src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -117,7 +117,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

14
src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -37,8 +37,7 @@ PhaseCompressibleTurbulenceModel
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName
) )
: :
TurbulenceModel TurbulenceModel
@ -54,8 +53,7 @@ PhaseCompressibleTurbulenceModel
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
) )
{} {}
@ -71,8 +69,7 @@ Foam::PhaseCompressibleTurbulenceModel<TransportModel>::New
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName
) )
{ {
return autoPtr<PhaseCompressibleTurbulenceModel> return autoPtr<PhaseCompressibleTurbulenceModel>
@ -91,8 +88,7 @@ Foam::PhaseCompressibleTurbulenceModel<TransportModel>::New
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
).ptr()) ).ptr())
); );
} }

8
src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -78,8 +78,7 @@ public:
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName
); );
@ -93,8 +92,7 @@ public:
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transportModel, const transportModel& transportModel
const word& propertiesName = turbulenceModel::propertiesName
); );

4
src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -46,7 +46,6 @@ LaheyKEpsilon<BasicTurbulenceModel>::LaheyKEpsilon
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -58,7 +57,6 @@ LaheyKEpsilon<BasicTurbulenceModel>::LaheyKEpsilon
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport,
propertiesName,
type type
), ),

3
src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -137,7 +137,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

4
src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -47,7 +47,6 @@ continuousGasKEpsilon<BasicTurbulenceModel>::continuousGasKEpsilon
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -59,7 +58,6 @@ continuousGasKEpsilon<BasicTurbulenceModel>::continuousGasKEpsilon
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport,
propertiesName,
type type
), ),

3
src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -123,7 +123,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

4
src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2014-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -46,7 +46,6 @@ kOmegaSSTSato<BasicTurbulenceModel>::kOmegaSSTSato
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -58,7 +57,6 @@ kOmegaSSTSato<BasicTurbulenceModel>::kOmegaSSTSato
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport,
propertiesName,
type type
), ),

3
src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2014-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -175,7 +175,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -51,7 +51,6 @@ mixtureKEpsilon<BasicTurbulenceModel>::mixtureKEpsilon
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -63,8 +62,7 @@ mixtureKEpsilon<BasicTurbulenceModel>::mixtureKEpsilon
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
liquidTurbulencePtr_(nullptr), liquidTurbulencePtr_(nullptr),

3
src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -208,7 +208,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

14
src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -37,8 +37,7 @@ PhaseIncompressibleTurbulenceModel
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const TransportModel& transportModel, const TransportModel& transportModel
const word& propertiesName
) )
: :
TurbulenceModel TurbulenceModel
@ -54,8 +53,7 @@ PhaseIncompressibleTurbulenceModel
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transportModel, transportModel
propertiesName
) )
{} {}
@ -70,8 +68,7 @@ Foam::PhaseIncompressibleTurbulenceModel<TransportModel>::New
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const TransportModel& transportModel, const TransportModel& transportModel
const word& propertiesName
) )
{ {
return autoPtr<PhaseIncompressibleTurbulenceModel> return autoPtr<PhaseIncompressibleTurbulenceModel>
@ -90,8 +87,7 @@ Foam::PhaseIncompressibleTurbulenceModel<TransportModel>::New
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transportModel, transportModel
propertiesName
).ptr()) ).ptr())
); );
} }

8
src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -78,8 +78,7 @@ public:
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const TransportModel& transportModel, const TransportModel& transportModel
const word& propertiesName
); );
@ -92,8 +91,7 @@ public:
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const TransportModel& transportModel, const TransportModel& transportModel
const word& propertiesName = turbulenceModel::propertiesName
); );

8
src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -217,8 +217,7 @@ kOmegaSST<TurbulenceModel, BasicTurbulenceModel>::kOmegaSST
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName
) )
: :
TurbulenceModel TurbulenceModel
@ -229,8 +228,7 @@ kOmegaSST<TurbulenceModel, BasicTurbulenceModel>::kOmegaSST
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
alphaK1_ alphaK1_

5
src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -256,8 +256,7 @@ public:
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName = turbulenceModel::propertiesName
); );
//- Disallow default bitwise copy construction //- Disallow default bitwise copy construction

6
src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -57,7 +57,6 @@ DeardorffDiffStress<BasicTurbulenceModel>::DeardorffDiffStress
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -69,8 +68,7 @@ DeardorffDiffStress<BasicTurbulenceModel>::DeardorffDiffStress
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
Ck_ Ck_

3
src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -121,7 +121,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

47
src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -48,8 +48,7 @@ Foam::LESModel<BasicTurbulenceModel>::LESModel
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName
) )
: :
BasicTurbulenceModel BasicTurbulenceModel
@ -60,8 +59,7 @@ Foam::LESModel<BasicTurbulenceModel>::LESModel
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
LESDict_(this->subOrEmptyDict("LES")), LESDict_(this->subOrEmptyDict("LES")),
@ -129,26 +127,31 @@ Foam::LESModel<BasicTurbulenceModel>::New
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName
) )
{ {
// get model name, but do not register the dictionary IOdictionary modelDict
// otherwise it is registered in the database twice (
IOobject
(
IOobject::groupName
(
turbulenceModel::propertiesName,
alphaRhoPhi.group()
),
U.time().constant(),
U.db(),
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
);
const word modelType const word modelType
( (
IOdictionary modelDict.subDict("LES").found("model")
( ? modelDict.subDict("LES").lookup("model")
IOobject : modelDict.subDict("LES").lookup("LESModel")
(
IOobject::groupName(propertiesName, alphaRhoPhi.group()),
U.time().constant(),
U.db(),
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
).subDict("LES").lookup("LESModel")
); );
Info<< "Selecting LES turbulence model " << modelType << endl; Info<< "Selecting LES turbulence model " << modelType << endl;
@ -168,7 +171,7 @@ Foam::LESModel<BasicTurbulenceModel>::New
return autoPtr<LESModel> return autoPtr<LESModel>
( (
cstrIter()(alpha, rho, U, alphaRhoPhi, phi, transport, propertiesName) cstrIter()(alpha, rho, U, alphaRhoPhi, phi, transport)
); );
} }

13
src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -118,10 +118,9 @@ public:
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName
), ),
(alpha, rho, U, alphaRhoPhi, phi, transport, propertiesName) (alpha, rho, U, alphaRhoPhi, phi, transport)
); );
@ -136,8 +135,7 @@ public:
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName
); );
//- Disallow default bitwise copy construction //- Disallow default bitwise copy construction
@ -154,8 +152,7 @@ public:
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName = turbulenceModel::propertiesName
); );

8
src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -43,8 +43,7 @@ LESeddyViscosity<BasicTurbulenceModel>::LESeddyViscosity
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName
) )
: :
eddyViscosity<LESModel<BasicTurbulenceModel>> eddyViscosity<LESModel<BasicTurbulenceModel>>
@ -55,8 +54,7 @@ LESeddyViscosity<BasicTurbulenceModel>::LESeddyViscosity
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
Ce_ Ce_

5
src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -79,8 +79,7 @@ public:
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName = turbulenceModel::propertiesName
); );
//- Disallow default bitwise copy construction //- Disallow default bitwise copy construction

6
src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -79,7 +79,6 @@ Smagorinsky<BasicTurbulenceModel>::Smagorinsky
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -91,8 +90,7 @@ Smagorinsky<BasicTurbulenceModel>::Smagorinsky
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
Ck_ Ck_

3
src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -127,7 +127,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -113,7 +113,6 @@ SpalartAllmarasDDES<BasicTurbulenceModel>::SpalartAllmarasDDES
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -124,8 +123,7 @@ SpalartAllmarasDDES<BasicTurbulenceModel>::SpalartAllmarasDDES
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
) )
{} {}

3
src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -113,7 +113,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -223,7 +223,6 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -235,8 +234,7 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
sigmaNut_ sigmaNut_

3
src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -171,7 +171,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -219,7 +219,6 @@ SpalartAllmarasIDDES<BasicTurbulenceModel>::SpalartAllmarasIDDES
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -230,8 +229,7 @@ SpalartAllmarasIDDES<BasicTurbulenceModel>::SpalartAllmarasIDDES
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
fwStar_ fwStar_
( (

3
src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -140,7 +140,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -99,7 +99,6 @@ WALE<BasicTurbulenceModel>::WALE
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -111,8 +110,7 @@ WALE<BasicTurbulenceModel>::WALE
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
Ck_ Ck_

3
src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2015-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -119,7 +119,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -151,7 +151,6 @@ dynamicKEqn<BasicTurbulenceModel>::dynamicKEqn
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -163,8 +162,7 @@ dynamicKEqn<BasicTurbulenceModel>::dynamicKEqn
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
k_ k_

3
src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -146,7 +146,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -67,7 +67,6 @@ dynamicLagrangian<BasicTurbulenceModel>::dynamicLagrangian
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -79,8 +78,7 @@ dynamicLagrangian<BasicTurbulenceModel>::dynamicLagrangian
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
flm_ flm_

3
src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -107,7 +107,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -72,7 +72,6 @@ kEqn<BasicTurbulenceModel>::kEqn
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -84,8 +83,7 @@ kEqn<BasicTurbulenceModel>::kEqn
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
k_ k_

3
src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -115,7 +115,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
src/TurbulenceModels/turbulenceModels/LES/kOmegaSSTDES/kOmegaSSTDES.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -87,7 +87,6 @@ kOmegaSSTDES<BasicTurbulenceModel>::kOmegaSSTDES
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -103,8 +102,7 @@ kOmegaSSTDES<BasicTurbulenceModel>::kOmegaSSTDES
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
CDES_ CDES_

3
src/TurbulenceModels/turbulenceModels/LES/kOmegaSSTDES/kOmegaSSTDES.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -138,7 +138,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -58,7 +58,6 @@ LRR<BasicTurbulenceModel>::LRR
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -70,8 +69,7 @@ LRR<BasicTurbulenceModel>::LRR
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
Cmu_ Cmu_

3
src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -158,7 +158,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -104,7 +104,6 @@ LaunderSharmaKE<BasicTurbulenceModel>::LaunderSharmaKE
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -116,8 +115,7 @@ LaunderSharmaKE<BasicTurbulenceModel>::LaunderSharmaKE
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
Cmu_ Cmu_

3
src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -135,7 +135,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

47
src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -48,8 +48,7 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName
) )
: :
BasicTurbulenceModel BasicTurbulenceModel
@ -60,8 +59,7 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
RASDict_(this->subOrEmptyDict("RAS")), RASDict_(this->subOrEmptyDict("RAS")),
@ -119,26 +117,31 @@ Foam::RASModel<BasicTurbulenceModel>::New
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName
) )
{ {
// get model name, but do not register the dictionary IOdictionary modelDict
// otherwise it is registered in the database twice (
IOobject
(
IOobject::groupName
(
turbulenceModel::propertiesName,
alphaRhoPhi.group()
),
U.time().constant(),
U.db(),
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
);
const word modelType const word modelType
( (
IOdictionary modelDict.subDict("RAS").found("model")
( ? modelDict.subDict("RAS").lookup("model")
IOobject : modelDict.subDict("RAS").lookup("RASModel")
(
IOobject::groupName(propertiesName, alphaRhoPhi.group()),
U.time().constant(),
U.db(),
IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE,
false
)
).subDict("RAS").lookup("RASModel")
); );
Info<< "Selecting RAS turbulence model " << modelType << endl; Info<< "Selecting RAS turbulence model " << modelType << endl;
@ -158,7 +161,7 @@ Foam::RASModel<BasicTurbulenceModel>::New
return autoPtr<RASModel> return autoPtr<RASModel>
( (
cstrIter()(alpha, rho, U, alphaRhoPhi, phi, transport, propertiesName) cstrIter()(alpha, rho, U, alphaRhoPhi, phi, transport)
); );
} }

13
src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -108,10 +108,9 @@ public:
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName
), ),
(alpha, rho, U, alphaRhoPhi, phi, transport, propertiesName) (alpha, rho, U, alphaRhoPhi, phi, transport)
); );
@ -126,8 +125,7 @@ public:
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName
); );
//- Disallow default bitwise copy construction //- Disallow default bitwise copy construction
@ -144,8 +142,7 @@ public:
const volVectorField& U, const volVectorField& U,
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport
const word& propertiesName = turbulenceModel::propertiesName
); );

6
src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -88,7 +88,6 @@ RNGkEpsilon<BasicTurbulenceModel>::RNGkEpsilon
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -100,8 +99,7 @@ RNGkEpsilon<BasicTurbulenceModel>::RNGkEpsilon
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
Cmu_ Cmu_

3
src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -140,7 +140,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -58,7 +58,6 @@ SSG<BasicTurbulenceModel>::SSG
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -70,8 +69,7 @@ SSG<BasicTurbulenceModel>::SSG
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
Cmu_ Cmu_

3
src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2015-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -149,7 +149,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -164,7 +164,6 @@ SpalartAllmaras<BasicTurbulenceModel>::SpalartAllmaras
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -176,8 +175,7 @@ SpalartAllmaras<BasicTurbulenceModel>::SpalartAllmaras
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
sigmaNut_ sigmaNut_

3
src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -169,7 +169,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -88,7 +88,6 @@ kEpsilon<BasicTurbulenceModel>::kEpsilon
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -100,8 +99,7 @@ kEpsilon<BasicTurbulenceModel>::kEpsilon
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
Cmu_ Cmu_

3
src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -133,7 +133,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -87,7 +87,6 @@ kOmega<BasicTurbulenceModel>::kOmega
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -99,8 +98,7 @@ kOmega<BasicTurbulenceModel>::kOmega
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
), ),
Cmu_ Cmu_

3
src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -123,7 +123,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

6
src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -43,7 +43,6 @@ kOmegaSST<BasicTurbulenceModel>::kOmegaSST
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName,
const word& type const word& type
) )
: :
@ -59,8 +58,7 @@ kOmegaSST<BasicTurbulenceModel>::kOmegaSST
U, U,
alphaRhoPhi, alphaRhoPhi,
phi, phi,
transport, transport
propertiesName
) )
{ {
if (type == typeName) if (type == typeName)

3
src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org \\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -86,7 +86,6 @@ public:
const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi, const surfaceScalarField& phi,
const transportModel& transport, const transportModel& transport,
const word& propertiesName = turbulenceModel::propertiesName,
const word& type = typeName const word& type = typeName
); );

Some files were not shown because too many files have changed in this diff Show More