diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C index d078068d8c..f78265570b 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C @@ -54,7 +54,7 @@ PDRkEpsilon::PDRkEpsilon const word& modelName ) : - Foam::RASModels::kEpsilon> + Foam::RASModels::kEpsilon ( geometricOneField(), rho, diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H index cd673deb47..a9ef9927bf 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H @@ -78,13 +78,7 @@ namespace RASModels class PDRkEpsilon : - public Foam::RASModels::kEpsilon - < - EddyDiffusivity - < - compressible::turbulenceModel - > - > + public Foam::RASModels::kEpsilon { // Private Data diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModel.H b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModel.H index 8f1fcc8bb9..87a6314bf7 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModel.H +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,14 +34,13 @@ Description #include "VoFphaseCompressibleTurbulenceModelFwd.H" #include "PhaseCompressibleTurbulenceModel.H" -#include "ThermalDiffusivity.H" #include "fluidThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - typedef ThermalDiffusivity> + typedef PhaseCompressibleTurbulenceModel VoFphaseCompressibleTurbulenceModel; } diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModelFwd.H b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModelFwd.H index 41bdcbfb74..49fba94fee 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModelFwd.H +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModelFwd.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,10 +41,7 @@ namespace Foam template class PhaseCompressibleTurbulenceModel; - template - class ThermalDiffusivity; - - typedef ThermalDiffusivity> + typedef PhaseCompressibleTurbulenceModel VoFphaseCompressibleTurbulenceModel; } diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModels.C b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModels.C index 6de4245842..a975261a33 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModels.C +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModels.C @@ -28,9 +28,6 @@ License #include "addToRunTimeSelectionTable.H" #include "makeTurbulenceModel.H" -#include "ThermalDiffusivity.H" -#include "EddyDiffusivity.H" - #include "laminarModel.H" #include "RASModel.H" #include "LESModel.H" @@ -43,7 +40,6 @@ makeTurbulenceModelTypes volScalarField, compressibleTurbulenceModel, PhaseCompressibleTurbulenceModel, - ThermalDiffusivity, fluidThermo ); @@ -53,7 +49,6 @@ makeBaseTurbulenceModel volScalarField, compressibleTurbulenceModel, PhaseCompressibleTurbulenceModel, - ThermalDiffusivity, fluidThermo ); diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.C b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.C index d069c78a4e..5696988134 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.C +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.C @@ -94,8 +94,7 @@ Foam::compressibleInterPhaseTransportModel::compressibleInterPhaseTransportModel turbulence1_ = ( - ThermalDiffusivity> - ::New + PhaseCompressibleTurbulenceModel::New ( alpha1, rho1, @@ -108,8 +107,7 @@ Foam::compressibleInterPhaseTransportModel::compressibleInterPhaseTransportModel turbulence2_ = ( - ThermalDiffusivity> - ::New + PhaseCompressibleTurbulenceModel::New ( alpha2, rho2, diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.H b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.H index 44768c5cf3..dde0c8479a 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.H +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.H @@ -84,16 +84,10 @@ class compressibleInterPhaseTransportModel autoPtr turbulence_; //- Phase-1 transport model (constructed for two-phase transport) - autoPtr - < - ThermalDiffusivity> - > turbulence1_; + autoPtr> turbulence1_; //- Phase-2 transport model (constructed for two-phase transport) - autoPtr - < - ThermalDiffusivity> - > turbulence2_; + autoPtr> turbulence2_; public: diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/Make/options index 8efa65991e..9574f73895 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/Make/options +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/Make/options @@ -13,10 +13,4 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude -LIB_LIBS = \ - -lreactingPhaseSystem \ - -lreactingEulerianInterfacialModels \ - -lreactingEulerianInterfacialCompositionModels \ - -lfiniteVolume \ - -lfvOptions \ - -lmeshTools +LIB_LIBS = diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C index df9973c066..441f83ff28 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C @@ -26,7 +26,6 @@ License #include "alphatWallBoilingWallFunctionFvPatchScalarField.H" #include "phaseSystem.H" #include "compressibleTurbulenceModel.H" -#include "ThermalDiffusivity.H" #include "PhaseCompressibleTurbulenceModel.H" #include "saturationModel.H" #include "rhoReactionThermo.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C index d617027ef2..9d92b70fb2 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C @@ -29,7 +29,6 @@ License #include "phaseSystem.H" #include "compressibleTurbulenceModel.H" -#include "ThermalDiffusivity.H" #include "PhaseCompressibleTurbulenceModel.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C index d47ae91aa1..0f5b3a15fa 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C @@ -27,7 +27,6 @@ License #include "addToRunTimeSelectionTable.H" #include "uniformDimensionedFields.H" #include "compressibleTurbulenceModel.H" -#include "ThermalDiffusivity.H" #include "PhaseCompressibleTurbulenceModel.H" #include "phaseSystem.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C index 2f53de49b8..f62656073c 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C @@ -27,7 +27,6 @@ License #include "addToRunTimeSelectionTable.H" #include "uniformDimensionedFields.H" #include "compressibleTurbulenceModel.H" -#include "ThermalDiffusivity.H" #include "PhaseCompressibleTurbulenceModel.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C index 4c722832a3..ec4111e1c8 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C @@ -27,7 +27,6 @@ License #include "addToRunTimeSelectionTable.H" #include "uniformDimensionedFields.H" #include "compressibleTurbulenceModel.H" -#include "ThermalDiffusivity.H" #include "PhaseCompressibleTurbulenceModel.H" #include "phaseSystem.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C index 44891b0fc7..acedbc3251 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -73,10 +73,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel const word& type ) : - eddyViscosity - < - RASModel> - > + eddyViscosity> ( type, alpha, @@ -241,10 +238,7 @@ bool Foam::RASModels::kineticTheoryModel::read() { if ( - eddyViscosity - < - RASModel> - >::read() + eddyViscosity>::read() ) { coeffDict().lookup("equilibrium") >> equilibrium_; diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H index e40586df36..d9f51a5967 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H @@ -48,7 +48,6 @@ SourceFiles #include "RASModel.H" #include "eddyViscosity.H" #include "phaseCompressibleTurbulenceModel.H" -#include "EddyDiffusivity.H" #include "phaseModel.H" #include "dragModel.H" #include "viscosityModel.H" @@ -71,10 +70,7 @@ namespace RASModels class kineticTheoryModel : - public eddyViscosity - < - RASModel> - > + public eddyViscosity> { // Private Data diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C index 94dfb8f12d..cee127e241 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C @@ -39,7 +39,6 @@ makeTurbulenceModelTypes volScalarField, compressibleTurbulenceModel, PhaseCompressibleTurbulenceModel, - ThermalDiffusivity, phaseModel ); @@ -49,7 +48,6 @@ makeBaseTurbulenceModel volScalarField, compressibleTurbulenceModel, PhaseCompressibleTurbulenceModel, - ThermalDiffusivity, phaseModel ); diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C index c978c0ae22..bf4b5561bd 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C @@ -38,10 +38,7 @@ Foam::RASModels::phasePressureModel::phasePressureModel const word& type ) : - eddyViscosity - < - RASModel> - > + eddyViscosity> ( type, alpha, @@ -83,11 +80,7 @@ bool Foam::RASModels::phasePressureModel::read() { if ( - eddyViscosity - < - RASModel> - >::read() - ) + eddyViscosity>::read()) { coeffDict().lookup("alphaMax") >> alphaMax_; coeffDict().lookup("preAlphaExp") >> preAlphaExp_; diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H index 6b2bbcf367..cfa6120a54 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H @@ -54,7 +54,6 @@ SourceFiles #include "RASModel.H" #include "eddyViscosity.H" #include "phaseCompressibleTurbulenceModel.H" -#include "EddyDiffusivity.H" #include "phaseModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -70,10 +69,7 @@ namespace RASModels class phasePressureModel : - public eddyViscosity - < - RASModel> - > + public eddyViscosity> { // Private Data diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H index 0301838738..02d7bb41e3 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,14 +34,13 @@ Description #include "phaseCompressibleTurbulenceModelFwd.H" #include "PhaseCompressibleTurbulenceModel.H" -#include "ThermalDiffusivity.H" #include "phaseModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - typedef ThermalDiffusivity> + typedef PhaseCompressibleTurbulenceModel phaseCompressibleTurbulenceModel; } diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H index 7c6f1c0893..da2c08808c 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,10 +41,7 @@ namespace Foam template class PhaseCompressibleTurbulenceModel; - template - class ThermalDiffusivity; - - typedef ThermalDiffusivity> + typedef PhaseCompressibleTurbulenceModel phaseCompressibleTurbulenceModel; } diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C index c7f1870872..f5b27cf57e 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C @@ -71,17 +71,6 @@ wallBoiling ) ).dPtr()() ) - ), - turbulence_ - ( - popBal_.mesh().lookupObjectRef - ( - IOobject::groupName - ( - turbulenceModel::typeName, - popBal_.continuousPhase().name() - ) - ) ) {} @@ -90,8 +79,13 @@ wallBoiling void Foam::diameterModels::nucleationModels::wallBoiling::correct() { - const tmp talphat(turbulence_.alphat()); - const volScalarField::Boundary& alphatBf = talphat().boundaryField(); + const volScalarField& alphat = + popBal_.mesh().lookupObject + ( + IOobject::groupName("alphat", popBal_.continuousPhase().name()) + ); + + const volScalarField::Boundary& alphatBf = alphat.boundaryField(); typedef compressible::alphatWallBoilingWallFunctionFvPatchScalarField alphatWallBoilingWallFunction; @@ -153,8 +147,14 @@ Foam::diameterModels::nucleationModels::wallBoiling::addToNucleationRate const sizeGroup& fi = popBal_.sizeGroups()[i]; const phaseModel& phase = fi.phase(); const volScalarField& rho = phase.rho(); - const tmp talphat(turbulence_.alphat()); - const volScalarField::Boundary& alphatBf = talphat().boundaryField(); + + const volScalarField& alphat = + popBal_.mesh().lookupObject + ( + IOobject::groupName("alphat", popBal_.continuousPhase().name()) + ); + + const volScalarField::Boundary& alphatBf = alphat.boundaryField(); typedef compressible::alphatWallBoilingWallFunctionFvPatchScalarField alphatWallBoilingWallFunction; diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H index 6c3211e118..0fc745ac3e 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,7 +41,6 @@ SourceFiles #define wallBoiling_H #include "nucleationModel.H" -#include "phaseCompressibleTurbulenceModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -65,9 +64,6 @@ class wallBoiling //- Velocity group in which the nucleation occurs const velocityGroup& velGroup_; - //- Pointer to turbulence model - const phaseCompressibleTurbulenceModel& turbulence_; - public: diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/twoPhaseCompressibleTurbulenceModels.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/twoPhaseCompressibleTurbulenceModels.C index 91bf1ce40e..6a51e1e202 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/twoPhaseCompressibleTurbulenceModels.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/twoPhaseCompressibleTurbulenceModels.C @@ -39,7 +39,6 @@ makeTurbulenceModelTypes volScalarField, compressibleTurbulenceModel, PhaseCompressibleTurbulenceModel, - ThermalDiffusivity, phaseModel ); diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C index ba9fd91822..2c306f8f02 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C @@ -24,7 +24,6 @@ License \*---------------------------------------------------------------------------*/ #include "wallBoiling.H" -#include "phaseCompressibleTurbulenceModel.H" #include "alphatWallBoilingWallFunctionFvPatchScalarField.H" #include "fvmSup.H" #include "addToRunTimeSelectionTable.H" @@ -89,18 +88,13 @@ Foam::diameterModels::IATEsources::wallBoiling::R dimensionedScalar(kappai.dimensions()/dimTime, 0) ); - const phaseCompressibleTurbulenceModel& turbulence = - phase().db().lookupObjectRef + const volScalarField& alphat = + phase().mesh().lookupObject ( - IOobject::groupName - ( - turbulenceModel::typeName, - otherPhase().name() - ) + IOobject::groupName("alphat", otherPhase().name()) ); - const tmp talphat(turbulence.alphat()); - const volScalarField::Boundary& alphatBf = talphat().boundaryField(); + const volScalarField::Boundary& alphatBf = alphat.boundaryField(); const scalarField& rho = phase().rho(); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C index edd2eb32e6..71e627c8b9 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -41,10 +41,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel const word& type ) : - eddyViscosity - < - RASModel> - > + eddyViscosity> ( type, alpha, @@ -204,10 +201,7 @@ bool Foam::RASModels::kineticTheoryModel::read() { if ( - eddyViscosity - < - RASModel> - >::read() + eddyViscosity>::read() ) { coeffDict().lookup("equilibrium") >> equilibrium_; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H index e334d8e559..4593ecb93d 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H @@ -48,7 +48,6 @@ SourceFiles #include "RASModel.H" #include "eddyViscosity.H" #include "phaseCompressibleTurbulenceModel.H" -#include "EddyDiffusivity.H" #include "phaseModel.H" #include "dragModel.H" #include "viscosityModel.H" @@ -71,10 +70,7 @@ namespace RASModels class kineticTheoryModel : - public eddyViscosity - < - RASModel> - > + public eddyViscosity> { // Private Data diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModel.H index 0301838738..02d7bb41e3 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,14 +34,13 @@ Description #include "phaseCompressibleTurbulenceModelFwd.H" #include "PhaseCompressibleTurbulenceModel.H" -#include "ThermalDiffusivity.H" #include "phaseModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - typedef ThermalDiffusivity> + typedef PhaseCompressibleTurbulenceModel phaseCompressibleTurbulenceModel; } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModelFwd.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModelFwd.H index 7c6f1c0893..189a64fdfa 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModelFwd.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModelFwd.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,11 +41,8 @@ namespace Foam template class PhaseCompressibleTurbulenceModel; - template - class ThermalDiffusivity; - - typedef ThermalDiffusivity> - phaseCompressibleTurbulenceModel; + typedef PhaseCompressibleTurbulenceModel + phaseCompressibleTurbulenceModel; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C index 894a572fcd..6f0ccee8dd 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,9 +29,6 @@ License #include "addToRunTimeSelectionTable.H" #include "makeTurbulenceModel.H" -#include "ThermalDiffusivity.H" -#include "EddyDiffusivity.H" - #include "laminarModel.H" #include "RASModel.H" #include "LESModel.H" @@ -44,7 +41,6 @@ makeTurbulenceModelTypes volScalarField, compressibleTurbulenceModel, PhaseCompressibleTurbulenceModel, - ThermalDiffusivity, phaseModel ); @@ -54,7 +50,6 @@ makeBaseTurbulenceModel volScalarField, compressibleTurbulenceModel, PhaseCompressibleTurbulenceModel, - ThermalDiffusivity, phaseModel ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C index b22eb73235..ceda0040f8 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C @@ -39,13 +39,7 @@ Foam::RASModels::phasePressureModel::phasePressureModel const word& type ) : - eddyViscosity - < - RASModel - >>> - > + eddyViscosity>> ( type, alpha, @@ -87,13 +81,8 @@ bool Foam::RASModels::phasePressureModel::read() { if ( - eddyViscosity - < - RASModel - >>> - >::read() + eddyViscosity>> + ::read() ) { coeffDict().lookup("alphaMax") >> alphaMax_; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H index 049695e226..e7609ae4a8 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H @@ -54,8 +54,6 @@ SourceFiles #include "RASModel.H" #include "eddyViscosity.H" #include "PhaseCompressibleTurbulenceModel.H" -#include "ThermalDiffusivity.H" -#include "EddyDiffusivity.H" #include "phaseModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -71,13 +69,7 @@ namespace RASModels class phasePressureModel : - public eddyViscosity - < - RASModel - >>> - > + public eddyViscosity>> { // Private Data diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseThermophysicalTransportModels/Make/files b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseThermophysicalTransportModels/Make/files index f9623dcab6..109b4eca89 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseThermophysicalTransportModels/Make/files +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseThermophysicalTransportModels/Make/files @@ -1,3 +1,3 @@ phaseThermophysicalTransportModels.C -LIB = $(FOAM_LIBBIN)/libphaseReactingTherophysicalTransportModels +LIB = $(FOAM_LIBBIN)/libphaseTherophysicalTransportModels diff --git a/src/ThermophysicalTransportModels/Make/files b/src/ThermophysicalTransportModels/Make/files index 0a514b90f2..1b09d2180e 100644 --- a/src/ThermophysicalTransportModels/Make/files +++ b/src/ThermophysicalTransportModels/Make/files @@ -1,8 +1,7 @@ thermophysicalTransportModel/thermophysicalTransportModel.C thermophysicalTransportModels/thermophysicalTransportModels.C -/* -BCs = turbulentFluidThermoModels/derivedFvPatchFields +BCs = derivedFvPatchFields $(BCs)/temperatureCoupledBase/temperatureCoupledBase.C $(BCs)/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C $(BCs)/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C @@ -11,9 +10,7 @@ $(BCs)/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFv $(BCs)/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C $(BCs)/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C $(BCs)/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C - -turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C -turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C -*/ +$(BCs)/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C +$(BCs)/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C LIB = $(FOAM_LIBBIN)/libthermophysicalTransportModels diff --git a/src/ThermophysicalTransportModels/ThermophysicalTransportModel/ThermophysicalTransportModel.H b/src/ThermophysicalTransportModels/ThermophysicalTransportModel/ThermophysicalTransportModel.H index 7f87d5ffc4..5782fe33f8 100644 --- a/src/ThermophysicalTransportModels/ThermophysicalTransportModel/ThermophysicalTransportModel.H +++ b/src/ThermophysicalTransportModels/ThermophysicalTransportModel/ThermophysicalTransportModel.H @@ -36,8 +36,6 @@ SourceFiles #define ThermophysicalTransportModel_H #include "thermophysicalTransportModel.H" -#include "autoPtr.H" -#include "fluidThermo.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -122,7 +120,7 @@ public: } //- Access function to incompressible transport model - const fluidThermo& thermo() const + virtual const fluidThermo& thermo() const { return momentumTransport_.transport(); } diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C similarity index 93% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C rename to src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C index 848d27a033..e6402b5dd0 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "alphatJayatillekeWallFunctionFvPatchScalarField.H" -#include "turbulentFluidThermoModel.H" +#include "thermophysicalTransportModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -159,17 +159,18 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs() const label patchi = patch().index(); - // Retrieve turbulence properties from model - const compressible::turbulenceModel& turbModel = - db().lookupObject + const thermophysicalTransportModel& ttm = + db().lookupObject ( IOobject::groupName ( - compressible::turbulenceModel::typeName, + thermophysicalTransportModel::typeName, internalField().group() ) ); + const compressibleTurbulenceModel& turbModel = ttm.momentumTransport(); + const nutWallFunctionFvPatchScalarField& nutw = nutWallFunctionFvPatchScalarField::nutw(turbModel, patchi); @@ -180,7 +181,7 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs() const tmp tmuw = turbModel.mu(patchi); const scalarField& muw = tmuw(); - const tmp talphaw = turbModel.alpha(patchi); + const tmp talphaw = ttm.thermo().alpha(patchi); const scalarField& alphaw = talphaw(); scalarField& alphatw = *this; @@ -193,14 +194,10 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs() const scalarField magGradUw(mag(Uw.snGrad())); const scalarField& rhow = turbModel.rho().boundaryField()[patchi]; - const fvPatchScalarField& hew = - turbModel.transport().he().boundaryField()[patchi]; + const fvPatchScalarField& hew = ttm.thermo().he().boundaryField()[patchi]; // Heat flux [W/m^2] - lagging alphatw - const scalarField qDot - ( - turbModel.transport().alphaEff(alphatw, patchi)*hew.snGrad() - ); + const scalarField qDot(ttm.thermo().alphaEff(alphatw, patchi)*hew.snGrad()); // Populate boundary values forAll(alphatw, facei) diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H b/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H similarity index 98% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H rename to src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H index 43446093ed..027c3bd12f 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C similarity index 92% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C rename to src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C index f241653af9..b37f518b04 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C @@ -24,9 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "alphatWallFunctionFvPatchScalarField.H" -#include "compressibleTurbulenceModel.H" -#include "fvPatchFieldMapper.H" -#include "volFields.H" +#include "thermophysicalTransportModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -106,18 +104,20 @@ void alphatWallFunctionFvPatchScalarField::updateCoeffs() const label patchi = patch().index(); - // Retrieve turbulence properties from model - const compressibleTurbulenceModel& turbModel = - db().lookupObject + const thermophysicalTransportModel& ttm = + db().lookupObject ( IOobject::groupName ( - turbulenceModel::typeName, + thermophysicalTransportModel::typeName, internalField().group() ) ); + const compressibleTurbulenceModel& turbModel = ttm.momentumTransport(); + const scalarField& rhow = turbModel.rho().boundaryField()[patchi]; + const tmp tnutw = turbModel.nut(patchi); operator==(rhow*tnutw/Prt_); diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H b/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H similarity index 98% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H rename to src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H index 9d8a73541c..489e91b3d2 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C similarity index 91% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C rename to src/ThermophysicalTransportModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C index f2e36ce4eb..7539e4e897 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C @@ -24,8 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "convectiveHeatTransferFvPatchScalarField.H" -#include "turbulentFluidThermoModel.H" -#include "fvPatchFieldMapper.H" +#include "thermophysicalTransportModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -110,17 +109,19 @@ void convectiveHeatTransferFvPatchScalarField::updateCoeffs() const label patchi = patch().index(); - const compressible::turbulenceModel& turbModel = - db().lookupObject + const thermophysicalTransportModel& ttm = + db().lookupObject ( IOobject::groupName ( - compressible::turbulenceModel::typeName, + thermophysicalTransportModel::typeName, internalField().group() ) ); - const scalarField alphaEffw(turbModel.alphaEff(patchi)); + const compressibleTurbulenceModel& turbModel = ttm.momentumTransport(); + + const scalarField alphaEffw(ttm.alphaEff(patchi)); const tmp tmuw = turbModel.mu(patchi); const scalarField& muw = tmuw(); @@ -128,8 +129,8 @@ void convectiveHeatTransferFvPatchScalarField::updateCoeffs() const scalarField& rhow = turbModel.rho().boundaryField()[patchi]; const vectorField& Uc = turbModel.U(); const vectorField& Uw = turbModel.U().boundaryField()[patchi]; - const scalarField& Tw = turbModel.transport().T().boundaryField()[patchi]; - const scalarField Cpw(turbModel.transport().Cp(Tw, patchi)); + const scalarField& Tw = ttm.thermo().T().boundaryField()[patchi]; + const scalarField Cpw(ttm.thermo().Cp(Tw, patchi)); const scalarField kappaw(Cpw*alphaEffw); const scalarField Pr(muw*Cpw/kappaw); diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H b/src/ThermophysicalTransportModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H similarity index 98% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H rename to src/ThermophysicalTransportModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H index d379c635aa..f9829c0439 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C similarity index 93% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C rename to src/ThermophysicalTransportModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C index 517e741df4..987228c99f 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C @@ -24,11 +24,9 @@ License \*---------------------------------------------------------------------------*/ #include "externalCoupledTemperatureMixedFvPatchScalarField.H" -#include "turbulentFluidThermoModel.H" -#include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" -#include "volFields.H" +#include "thermophysicalTransportModel.H" #include "OFstream.H" +#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // @@ -126,29 +124,27 @@ void Foam::externalCoupledTemperatureMixedFvPatchScalarField::transferData // heat flux [W/m^2] scalarField qDot(this->patch().size(), 0.0); - typedef compressible::turbulenceModel cmpTurbModelType; - - static word turbName + static word ttmName ( IOobject::groupName ( - turbulenceModel::typeName, + thermophysicalTransportModel::typeName, internalField().group() ) ); static word thermoName(basicThermo::dictName); - if (db().foundObject(turbName)) + if (db().foundObject(ttmName)) { - const cmpTurbModelType& turbModel = - db().lookupObject(turbName); + const thermophysicalTransportModel& ttm = + db().lookupObject(ttmName); - const basicThermo& thermo = turbModel.transport(); + const basicThermo& thermo = ttm.thermo(); const fvPatchScalarField& hep = thermo.he().boundaryField()[patchi]; - qDot = turbModel.alphaEff(patchi)*hep.snGrad(); + qDot = ttm.alphaEff(patchi)*hep.snGrad(); } else if (db().foundObject(thermoName)) { diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H b/src/ThermophysicalTransportModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H similarity index 99% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H rename to src/ThermophysicalTransportModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H index a55b24b728..9b08dfd98b 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C similarity index 99% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C rename to src/ThermophysicalTransportModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C index 03a79843d9..126f5b9f3b 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C @@ -24,10 +24,9 @@ License \*---------------------------------------------------------------------------*/ #include "externalWallHeatFluxTemperatureFvPatchScalarField.H" -#include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" #include "volFields.H" #include "physicoChemicalConstants.H" +#include "addToRunTimeSelectionTable.H" using Foam::constant::physicoChemical::sigma; diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H b/src/ThermophysicalTransportModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H similarity index 99% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H rename to src/ThermophysicalTransportModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H index 502e3ce072..cedece8d43 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C similarity index 88% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C rename to src/ThermophysicalTransportModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C index e540f8c91b..8f6722ba4e 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C @@ -24,10 +24,9 @@ License \*---------------------------------------------------------------------------*/ #include "temperatureCoupledBase.H" -#include "volFields.H" #include "fluidThermo.H" #include "solidThermo.H" -#include "turbulentFluidThermoModel.H" +#include "thermophysicalTransportModel.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -74,6 +73,7 @@ Foam::tmp Foam::temperatureCoupledBase::kappa const label patchi = patch_.index(); const word& phase(Tp.internalField().group()); + const word fluidThermoName ( IOobject::groupName(basicThermo::dictName, phase) @@ -81,19 +81,21 @@ Foam::tmp Foam::temperatureCoupledBase::kappa if (mesh.foundObject(fluidThermoName)) { - typedef compressible::turbulenceModel turbulenceModel; - - const word turbulenceModelName + static word ttmName ( - IOobject::groupName(turbulenceModel::typeName, phase) + IOobject::groupName + ( + thermophysicalTransportModel::typeName, + phase + ) ); - if (mesh.foundObject(turbulenceModelName)) + if (mesh.foundObject(ttmName)) { - const turbulenceModel& turbModel = - mesh.lookupObject( turbulenceModelName); + const thermophysicalTransportModel& ttm = + mesh.lookupObject(ttmName); - return turbModel.kappaEff(patchi); + return ttm.kappaEff(patchi); } else { diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H b/src/ThermophysicalTransportModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H similarity index 98% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H rename to src/ThermophysicalTransportModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H index a93fbfef90..3923e88a19 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H @@ -31,7 +31,7 @@ Description or solidThermo as appropriate. For turbulent fluid regions \c kappa is obtained from the - compressible::turbulenceModel \c kappaEff. + thermophysicalTransportModel \c kappaEff. For solid regions kappa may be obtained from the anisotropic alpha field by specifying the optional \c alphaAni field name. diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C similarity index 95% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C rename to src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C index eb50ed4162..5aae0f2dc8 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "volFields.H" #include "surfaceFields.H" -#include "turbulentFluidThermoModel.H" +#include "thermophysicalTransportModel.H" #include "mapDistribute.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -351,14 +351,21 @@ void thermalBaffle1DFvPatchScalarField::updateCoeffs() { const fvPatch& nbrPatch = patch().boundaryMesh()[nbrPatchi]; - const compressible::turbulenceModel& turbModel = - db().template lookupObject + const thermophysicalTransportModel& ttm = + db().objectRegistry::template lookupObject + < + thermophysicalTransportModel + > ( - turbulenceModel::typeName + IOobject::groupName + ( + thermophysicalTransportModel::typeName, + internalField().group() + ) ); // local properties - const scalarField kappaw(turbModel.kappaEff(patchi)); + const scalarField kappaw(ttm.kappaEff(patchi)); const fvPatchScalarField& Tp = patch().template lookupPatchField(TName_); @@ -380,8 +387,7 @@ void thermalBaffle1DFvPatchScalarField::updateCoeffs() scalarField myKDelta(patch().deltaCoeffs()*kappaw); // nrb properties - scalarField nbrTp = - turbModel.transport().T().boundaryField()[nbrPatchi]; + scalarField nbrTp = ttm.thermo().T().boundaryField()[nbrPatchi]; mapDist.distribute(nbrTp); // solid properties diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H b/src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H similarity index 99% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H rename to src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H index 3ab4c59786..21c4f3e911 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C similarity index 96% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C rename to src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C index a964e1d868..4307746405 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H b/src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H similarity index 96% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H rename to src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H index 5c4fe3d37c..18bf857955 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C similarity index 94% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C rename to src/ThermophysicalTransportModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C index 57c6a1da2d..a52c8abcc5 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C @@ -24,12 +24,9 @@ License \*---------------------------------------------------------------------------*/ #include "totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H" -#include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" -#include "volFields.H" #include "surfaceFields.H" -#include "IOobjectList.H" -#include "turbulentFluidThermoModel.H" +#include "thermophysicalTransportModel.H" +#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -154,12 +151,12 @@ void Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::updateCoeffs() const label patchi = patch().index(); - const compressible::turbulenceModel& turbModel = - db().lookupObject + const thermophysicalTransportModel& ttm = + db().lookupObject ( IOobject::groupName ( - turbulenceModel::typeName, + thermophysicalTransportModel::typeName, internalField().group() ) ); @@ -167,7 +164,7 @@ void Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::updateCoeffs() const fvsPatchField& phip = patch().lookupPatchField(phiName_); - const scalarField alphap(turbModel.alphaEff(patchi)); + const scalarField alphap(ttm.alphaEff(patchi)); refValue() = massFluxFraction_; refGrad() = 0.0; diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H b/src/ThermophysicalTransportModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H similarity index 98% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H rename to src/ThermophysicalTransportModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H index 9875ffafdc..f26e3903cf 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C similarity index 99% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C rename to src/ThermophysicalTransportModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C index 7f5e58ea79..04f6cabb83 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H b/src/ThermophysicalTransportModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H similarity index 99% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H rename to src/ThermophysicalTransportModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H index 722aee13c6..3670a55a01 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/ThermophysicalTransportModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C rename to src/ThermophysicalTransportModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H b/src/ThermophysicalTransportModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H similarity index 99% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H rename to src/ThermophysicalTransportModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H index 96f4aff66e..93928cbc92 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H +++ b/src/ThermophysicalTransportModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/ThermophysicalTransportModels/thermophysicalTransportModel/thermophysicalTransportModel.H b/src/ThermophysicalTransportModels/thermophysicalTransportModel/thermophysicalTransportModel.H index a77b5ac6e6..a28c536770 100644 --- a/src/ThermophysicalTransportModels/thermophysicalTransportModel/thermophysicalTransportModel.H +++ b/src/ThermophysicalTransportModels/thermophysicalTransportModel/thermophysicalTransportModel.H @@ -37,6 +37,7 @@ SourceFiles #define thermophysicalTransportModel_H #include "compressibleTurbulenceModel.H" +#include "fluidThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -94,6 +95,9 @@ public: return momentumTransportModel_; } + //- Access function to incompressible transport model + virtual const fluidThermo& thermo() const = 0; + //- Const access to the coefficients dictionary virtual const dictionary& coeffDict() const = 0; diff --git a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C deleted file mode 100644 index 3cb80284d1..0000000000 --- a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.C +++ /dev/null @@ -1,114 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "EddyDiffusivity.H" - -// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // - -template -void Foam::EddyDiffusivity::correctNut() -{ - // Read Prt if provided - Prt_ = dimensioned::lookupOrDefault - ( - "Prt", - this->coeffDict(), - 1.0 - ); - - alphat_ = this->rho_*this->nut()/Prt_; - alphat_.correctBoundaryConditions(); -} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template -Foam::EddyDiffusivity::EddyDiffusivity -( - const word& type, - const alphaField& alpha, - const volScalarField& rho, - const volVectorField& U, - const surfaceScalarField& alphaRhoPhi, - const surfaceScalarField& phi, - const transportModel& transport -) -: - BasicTurbulenceModel - ( - type, - alpha, - rho, - U, - alphaRhoPhi, - phi, - transport - ), - - // Cannot read Prt yet - Prt_("Prt", dimless, 1.0), - - alphat_ - ( - IOobject - ( - IOobject::groupName("alphat", alphaRhoPhi.group()), - this->runTime_.timeName(), - this->mesh_, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - this->mesh_ - ) -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -bool Foam::EddyDiffusivity::read() -{ - if (BasicTurbulenceModel::read()) - { - Prt_.readIfPresent(this->coeffDict()); - - return true; - } - else - { - return false; - } -} - - -template -void Foam::EddyDiffusivity::correctEnergyTransport() -{ - EddyDiffusivity::correctNut(); -} - - -// ************************************************************************* // diff --git a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H b/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H deleted file mode 100644 index cfb006e63a..0000000000 --- a/src/TurbulenceModels/compressible/EddyDiffusivity/EddyDiffusivity.H +++ /dev/null @@ -1,162 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::EddyDiffusivity - -Description - Templated abstract base class for single-phase compressible - turbulence models. - -SourceFiles - EddyDiffusivity.C - -\*---------------------------------------------------------------------------*/ - -#ifndef EddyDiffusivity_H -#define EddyDiffusivity_H - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class EddyDiffusivity Declaration -\*---------------------------------------------------------------------------*/ - -template -class EddyDiffusivity -: - public BasicTurbulenceModel -{ - -protected: - - // Protected data - - // Model coefficients - - dimensionedScalar Prt_; - - // Fields - - volScalarField alphat_; - - - // Protected Member Functions - - virtual void correctNut(); - - -public: - - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; - - - // Constructors - - //- Construct - EddyDiffusivity - ( - const word& type, - const alphaField& alpha, - const volScalarField& rho, - const volVectorField& U, - const surfaceScalarField& alphaRhoPhi, - const surfaceScalarField& phi, - const transportModel& transport - ); - - - //- Destructor - virtual ~EddyDiffusivity() - {} - - - // Member Functions - - //- Re-read model coefficients if they have changed - virtual bool read(); - - //- Turbulent thermal diffusivity for enthalpy [kg/m/s] - virtual tmp alphat() const - { - return alphat_; - } - - //- Turbulent thermal diffusivity for enthalpy for a patch [kg/m/s] - virtual tmp alphat(const label patchi) const - { - return alphat()().boundaryField()[patchi]; - } - - //- Effective thermal turbulent diffusivity for temperature - // of mixture [W/m/K] - virtual tmp kappaEff() const - { - return this->transport_.kappaEff(alphat()); - } - - //- Effective thermal turbulent diffusivity for temperature - // of mixture for patch [W/m/K] - virtual tmp kappaEff(const label patchi) const - { - return this->transport_.kappaEff(alphat(patchi), patchi); - } - - //- Effective thermal turbulent diffusivity of mixture [kg/m/s] - virtual tmp alphaEff() const - { - return this->transport_.alphaEff(alphat()); - } - - //- Effective thermal turbulent diffusivity of mixture - // for patch [kg/m/s] - virtual tmp alphaEff(const label patchi) const - { - return this->transport_.alphaEff(alphat(patchi), patchi); - } - - //- Correct the turbulence thermal diffusivity for energy transport - virtual void correctEnergyTransport(); -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#ifdef NoRepository - #include "EddyDiffusivity.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/TurbulenceModels/compressible/Make/files b/src/TurbulenceModels/compressible/Make/files index 7d2ddcc3ea..3197fb304a 100644 --- a/src/TurbulenceModels/compressible/Make/files +++ b/src/TurbulenceModels/compressible/Make/files @@ -1,17 +1,4 @@ compressibleTurbulenceModel.C turbulentFluidThermoModels/turbulentFluidThermoModels.C -BCs = turbulentFluidThermoModels/derivedFvPatchFields -$(BCs)/temperatureCoupledBase/temperatureCoupledBase.C -$(BCs)/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C -$(BCs)/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C -$(BCs)/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C -$(BCs)/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C -$(BCs)/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C -$(BCs)/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C -$(BCs)/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C - -turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C -turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C - LIB = $(FOAM_LIBBIN)/libcompressibleTurbulenceModels diff --git a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C deleted file mode 100644 index 132da439ca..0000000000 --- a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.C +++ /dev/null @@ -1,138 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "ThermalDiffusivity.H" - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template -Foam::ThermalDiffusivity::ThermalDiffusivity -( - const word& type, - const alphaField& alpha, - const volScalarField& rho, - const volVectorField& U, - const surfaceScalarField& alphaRhoPhi, - const surfaceScalarField& phi, - const transportModel& transport -) -: - BasicTurbulenceModel - ( - type, - alpha, - rho, - U, - alphaRhoPhi, - phi, - transport - ) -{} - - -// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * // - -template -Foam::autoPtr> -Foam::ThermalDiffusivity::New -( - const alphaField& alpha, - const volScalarField& rho, - const volVectorField& U, - const surfaceScalarField& alphaRhoPhi, - const surfaceScalarField& phi, - const transportModel& transport -) -{ - return autoPtr - ( - static_cast( - BasicTurbulenceModel::New - ( - alpha, - rho, - U, - alphaRhoPhi, - phi, - transport - ).ptr()) - ); -} - - -template -Foam::autoPtr> -Foam::ThermalDiffusivity::New -( - const volScalarField& rho, - const volVectorField& U, - const surfaceScalarField& phi, - const transportModel& transport -) -{ - return autoPtr - ( - static_cast( - BasicTurbulenceModel::New - ( - rho, - U, - phi, - transport - ).ptr()) - ); -} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -Foam::tmp -Foam::ThermalDiffusivity::alphat() const -{ - return volScalarField::New - ( - IOobject::groupName("alphat", this->alphaRhoPhi_.group()), - this->mesh_, - dimensionedScalar(dimDensity*dimViscosity, 0) - ); -} - - -template -Foam::tmp -Foam::ThermalDiffusivity::alphat -( - const label patchi -) const -{ - return tmp - ( - new scalarField(this->mesh_.boundary()[patchi].size(), 0.0) - ); -} - - -// ************************************************************************* // diff --git a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H b/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H deleted file mode 100644 index 23d4a6e1f8..0000000000 --- a/src/TurbulenceModels/compressible/ThermalDiffusivity/ThermalDiffusivity.H +++ /dev/null @@ -1,189 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::ThermalDiffusivity - -Description - Templated wrapper class to provide compressible turbulence models - thermal diffusivity based thermal transport. - -SourceFiles - ThermalDiffusivity.C - -\*---------------------------------------------------------------------------*/ - -#ifndef ThermalDiffusivity_H -#define ThermalDiffusivity_H - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class ThermalDiffusivity Declaration -\*---------------------------------------------------------------------------*/ - -template -class ThermalDiffusivity -: - public BasicTurbulenceModel -{ - -public: - - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef volScalarField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; - - - // Constructors - - //- Construct - ThermalDiffusivity - ( - const word& type, - const alphaField& alpha, - const volScalarField& rho, - const volVectorField& U, - const surfaceScalarField& alphaRhoPhi, - const surfaceScalarField& phi, - const transportModel& transport - ); - - - // Selectors - - //- Return a reference to the selected turbulence model - static autoPtr New - ( - const alphaField& alpha, - const volScalarField& rho, - const volVectorField& U, - const surfaceScalarField& alphaRhoPhi, - const surfaceScalarField& phi, - const transportModel& transportModel - ); - - - //- Return a reference to the selected turbulence model - static autoPtr New - ( - const volScalarField& rho, - const volVectorField& U, - const surfaceScalarField& phi, - const transportModel& transportModel - ); - - - //- Destructor - virtual ~ThermalDiffusivity() - {} - - - // Member Functions - - //- Thermal diffusivity for enthalpy of mixture [kg/m/s] - virtual tmp alpha() const - { - return this->transport_.alpha(); - } - - //- Thermal diffusivity for enthalpy of mixture for patch [kg/m/s] - virtual tmp alpha(const label patchi) const - { - return this->transport_.alpha(patchi); - } - - //- Thermal diffusivity for temperature of mixture [W/m/K] - virtual tmp kappa() const - { - return this->transport_.kappa(); - } - - //- Thermal diffusivity for temperature of mixture - // for patch [W/m/K] - virtual tmp kappa(const label patchi) const - { - return this->transport_.kappa(patchi); - } - - //- Turbulent thermal diffusivity for enthalpy [kg/m/s] - virtual tmp alphat() const; - - //- Turbulent thermal diffusivity for enthalpy for a patch [kg/m/s] - virtual tmp alphat(const label patchi) const; - - //- Effective thermal turbulent diffusivity for temperature - // of mixture [W/m/K] - virtual tmp kappaEff() const - { - return volScalarField::New - ( - "kappaEff", - this->transport_.kappa() - ); - } - - //- Effective thermal turbulent diffusivity for temperature - // of mixture for patch [W/m/K] - virtual tmp kappaEff(const label patchi) const - { - return kappa(patchi); - } - - //- Effective thermal turbulent diffusivity of mixture [kg/m/s] - virtual tmp alphaEff() const - { - return volScalarField::New - ( - "alphaEff", - this->transport_.alphahe() - ); - } - - //- Effective thermal turbulent diffusivity of mixture - // for patch [kg/m/s] - virtual tmp alphaEff(const label patchi) const - { - return this->transport_.alphahe(patchi); - } -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#ifdef NoRepository - #include "ThermalDiffusivity.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H index 2aeea9cbb8..1280e6b561 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,28 +23,26 @@ License \*---------------------------------------------------------------------------*/ -#include "EddyDiffusivity.H" - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #define makeTurbulenceModelTypes( \ - Alpha, Rho, baseModel, BaseModel, TDModel, Transport) \ + Alpha, Rho, baseModel, BaseModel, Transport) \ \ namespace Foam \ { \ - typedef TDModel> \ + typedef BaseModel \ Transport##BaseModel; \ typedef laminarModel \ laminar##Transport##BaseModel; \ - typedef RASModel> \ + typedef RASModel \ RAS##Transport##BaseModel; \ - typedef LESModel> \ + typedef LESModel \ LES##Transport##BaseModel; \ } #define makeBaseTurbulenceModel( \ - Alpha, Rho, baseModel, BaseModel, TDModel, Transport) \ + Alpha, Rho, baseModel, BaseModel, Transport) \ \ namespace Foam \ { \ @@ -62,7 +60,7 @@ License dictionary \ ); \ \ - typedef TDModel> \ + typedef BaseModel \ Transport##BaseModel; \ \ \ @@ -82,7 +80,7 @@ License ); \ \ \ - typedef RASModel> \ + typedef RASModel \ RAS##Transport##BaseModel; \ \ defineNamedTemplateTypeNameAndDebug(RAS##Transport##BaseModel, 0); \ @@ -98,7 +96,7 @@ License ); \ \ \ - typedef LESModel> \ + typedef LESModel \ LES##Transport##BaseModel; \ \ defineNamedTemplateTypeNameAndDebug(LES##Transport##BaseModel, 0); \ @@ -137,7 +135,7 @@ License #define makeTemplatedTurbulenceModel(BaseModel, SType, Type) \ - typedef Foam::SType##Models::Type> \ + typedef Foam::SType##Models::Type \ Type##SType##BaseModel; \ defineNamedTemplateTypeNameAndDebug(Type##SType##BaseModel, 0); \ \ @@ -145,7 +143,7 @@ License { \ namespace SType##Models \ { \ - typedef Type> Type##SType##BaseModel; \ + typedef Type Type##SType##BaseModel; \ \ addToRunTimeSelectionTable \ ( \ diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H index d6bb7d4723..5f229bdfab 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H @@ -47,8 +47,6 @@ SourceFiles #define turbulentFluidThermoModel_H #include "CompressibleTurbulenceModel.H" -#include "ThermalDiffusivity.H" -#include "EddyDiffusivity.H" #include "laminarModel.H" #include "RASModel.H" #include "LESModel.H" @@ -60,12 +58,10 @@ namespace Foam { namespace compressible { - typedef ThermalDiffusivity> - turbulenceModel; - + typedef CompressibleTurbulenceModel turbulenceModel; typedef laminarModel laminarModel; - typedef RASModel> RASModel; - typedef LESModel> LESModel; + typedef RASModel RASModel; + typedef LESModel LESModel; template autoPtr New diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C index 0209821e89..46543c3bbc 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C @@ -33,7 +33,6 @@ makeBaseTurbulenceModel volScalarField, compressibleTurbulenceModel, CompressibleTurbulenceModel, - ThermalDiffusivity, fluidThermo ); diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.H index e4b2899a11..30a067ee91 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,9 +29,6 @@ License #include "addToRunTimeSelectionTable.H" #include "makeTurbulenceModel.H" -#include "ThermalDiffusivity.H" -#include "EddyDiffusivity.H" - #include "laminarModel.H" #include "RASModel.H" #include "LESModel.H" @@ -44,7 +41,6 @@ makeTurbulenceModelTypes volScalarField, compressibleTurbulenceModel, CompressibleTurbulenceModel, - ThermalDiffusivity, fluidThermo ); diff --git a/src/functionObjects/field/Make/options b/src/functionObjects/field/Make/options index 5613d538a1..c25f39f00d 100644 --- a/src/functionObjects/field/Make/options +++ b/src/functionObjects/field/Make/options @@ -11,7 +11,8 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude LIB_LIBS = \ -lfiniteVolume \ @@ -22,6 +23,7 @@ LIB_LIBS = \ -lcompressibleTransportModels \ -lincompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermophysicalTransportModels \ -lmeshTools \ -lsurfMesh \ -llagrangian \ diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFields.C b/src/functionObjects/field/turbulenceFields/turbulenceFields.C index 047e62d1a6..0e8aa15d41 100644 --- a/src/functionObjects/field/turbulenceFields/turbulenceFields.C +++ b/src/functionObjects/field/turbulenceFields/turbulenceFields.C @@ -25,7 +25,7 @@ License #include "turbulenceFields.H" #include "turbulentTransportModel.H" -#include "turbulentFluidThermoModel.H" +#include "thermophysicalTransportModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -49,7 +49,7 @@ template<> const char* Foam::NamedEnum < Foam::functionObjects::turbulenceFields::compressibleField, - 9 + 8 >::names[] = { "k", @@ -57,7 +57,6 @@ const char* Foam::NamedEnum "omega", "mut", "muEff", - "alphat", "alphaEff", "R", "devRhoReff" @@ -66,7 +65,7 @@ const char* Foam::NamedEnum const Foam::NamedEnum < Foam::functionObjects::turbulenceFields::compressibleField, - 9 + 8 > Foam::functionObjects::turbulenceFields::compressibleFieldNames_; template<> @@ -163,10 +162,15 @@ bool Foam::functionObjects::turbulenceFields::read(const dictionary& dict) bool Foam::functionObjects::turbulenceFields::execute() { - if (obr_.foundObject(modelName())) + if (obr_.foundObject(modelName())) { - const compressible::turbulenceModel& model = - obr_.lookupObject(modelName()); + const thermophysicalTransportModel& ttm = + obr_.lookupObject + ( + thermophysicalTransportModel::typeName + ); + + const compressibleTurbulenceModel& model = ttm.momentumTransport(); forAllConstIter(wordHashSet, fieldSet_, iter) { @@ -198,14 +202,9 @@ bool Foam::functionObjects::turbulenceFields::execute() processField(f, model.muEff()); break; } - case compressibleField::alphat: - { - processField(f, model.alphat()); - break; - } case compressibleField::alphaEff: { - processField(f, model.alphaEff()); + processField(f, ttm.alphaEff()); break; } case compressibleField::R: diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFields.H b/src/functionObjects/field/turbulenceFields/turbulenceFields.H index a79e6b19db..4c20331677 100644 --- a/src/functionObjects/field/turbulenceFields/turbulenceFields.H +++ b/src/functionObjects/field/turbulenceFields/turbulenceFields.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -114,12 +114,11 @@ public: omega, mut, muEff, - alphat, alphaEff, R, devRhoReff }; - static const NamedEnum compressibleFieldNames_; + static const NamedEnum compressibleFieldNames_; enum class incompressibleField { diff --git a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C index e57e822ca8..c782abf84c 100644 --- a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C +++ b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "wallHeatFlux.H" -#include "turbulentFluidThermoModel.H" +#include "thermophysicalTransportModel.H" #include "solidThermo.H" #include "surfaceInterpolate.H" #include "fvcSnGrad.H" @@ -202,22 +202,22 @@ bool Foam::functionObjects::wallHeatFlux::execute() if ( - foundObject + foundObject ( - turbulenceModel::typeName + thermophysicalTransportModel::typeName ) ) { - const compressible::turbulenceModel& turbModel = - lookupObject + const thermophysicalTransportModel& ttm = + lookupObject ( - turbulenceModel::typeName + thermophysicalTransportModel::typeName ); return store ( name, - calcWallHeatFlux(turbModel.alphaEff(), turbModel.transport().he()) + calcWallHeatFlux(ttm.alphaEff(), ttm.thermo().he()) ); } else if (foundObject(solidThermo::dictName)) diff --git a/src/fvOptions/Make/options b/src/fvOptions/Make/options index 124084c057..f2ef0d9e6f 100644 --- a/src/fvOptions/Make/options +++ b/src/fvOptions/Make/options @@ -7,11 +7,13 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude LIB_LIBS = \ -lfiniteVolume \ -lsampling \ -lmeshTools \ -lturbulenceModels \ - -lcompressibleTurbulenceModels + -lcompressibleTurbulenceModels \ + -lthermophysicalTransportModels diff --git a/src/fvOptions/sources/derived/volumeFractionSource/volumeFractionSource.C b/src/fvOptions/sources/derived/volumeFractionSource/volumeFractionSource.C index a231c4c1c9..9ae455a47b 100644 --- a/src/fvOptions/sources/derived/volumeFractionSource/volumeFractionSource.C +++ b/src/fvOptions/sources/derived/volumeFractionSource/volumeFractionSource.C @@ -24,11 +24,11 @@ License \*---------------------------------------------------------------------------*/ #include "volumeFractionSource.H" -#include "fvmDdt.H" #include "fvmDiv.H" #include "fvmLaplacian.H" +#include "fvcDiv.H" #include "surfaceInterpolate.H" -#include "turbulentFluidThermoModel.H" +#include "thermophysicalTransportModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -97,18 +97,18 @@ Foam::tmp Foam::fv::volumeFractionSource::D } else if (phi.dimensions() == dimMass/dimTime) { - const compressible::turbulenceModel& turbulence = - mesh().lookupObject + const thermophysicalTransportModel& ttm = + mesh().lookupObject ( - turbulenceModel::typeName + thermophysicalTransportModel::typeName ); return - fieldNames_[fieldi] == turbulence.transport().T().name() - ? turbulence.kappaEff() - : fieldNames_[fieldi] == turbulence.transport().he().name() - ? turbulence.alphaEff() - : turbulence.muEff(); + fieldNames_[fieldi] == ttm.thermo().T().name() + ? ttm.kappaEff() + : fieldNames_[fieldi] == ttm.thermo().he().name() + ? ttm.alphaEff() + : ttm.momentumTransport().muEff(); } else { diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C index d34e556c54..b1f37495cc 100644 --- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C +++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "variableHeatTransfer.H" -#include "turbulentFluidThermoModel.H" +#include "thermophysicalTransportModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -102,14 +102,15 @@ void Foam::fv::variableHeatTransfer::calculateHtc() const fvMesh& nbrMesh = mesh_.time().lookupObject(nbrRegionName()); - const compressible::turbulenceModel& nbrTurb = - nbrMesh.lookupObject + const thermophysicalTransportModel& nbrTtm = + nbrMesh.lookupObject ( - turbulenceModel::typeName + thermophysicalTransportModel::typeName ); - const fluidThermo& nbrThermo = - nbrMesh.lookupObject(basicThermo::dictName); + const compressibleTurbulenceModel& nbrTurb = nbrTtm.momentumTransport(); + + const fluidThermo& nbrThermo = nbrTtm.thermo(); const volVectorField& UNbr = nbrMesh.lookupObject(UNbrName_); @@ -118,7 +119,7 @@ void Foam::fv::variableHeatTransfer::calculateHtc() const volScalarField NuNbr(a_*pow(ReNbr, b_)*pow(Pr_, c_)); - const scalarField htcNbr(NuNbr*nbrTurb.kappaEff()/ds_); + const scalarField htcNbr(NuNbr*nbrTtm.kappaEff()/ds_); const scalarField htcNbrMapped(interpolate(htcNbr)); diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options index 9f799143bc..733c4dd36d 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options @@ -7,6 +7,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude\ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -21,6 +22,7 @@ LIB_LIBS = \ -lSLGThermo \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermophysicalTransportModels \ -lregionModels \ -lsurfaceFilmModels \ -lfiniteVolume \ diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C index f08a48a834..7a3e1617f0 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "alphatFilmWallFunctionFvPatchScalarField.H" -#include "turbulentFluidThermoModel.H" +#include "thermophysicalTransportModel.H" #include "surfaceFilmRegionModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" @@ -162,15 +162,17 @@ void alphatFilmWallFunctionFvPatchScalarField::updateCoeffs() scalarField mDotFilmp = mDotFilm().boundaryField()[filmPatchi]; filmModel.toPrimary(filmPatchi, mDotFilmp); - // Retrieve RAS turbulence model - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const thermophysicalTransportModel& ttm = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + thermophysicalTransportModel::typeName, + internalField().group() + ) + ); + + const compressibleTurbulenceModel& turbModel = ttm.momentumTransport(); const scalarField& y = turbModel.y()[patchi]; const scalarField& rhow = turbModel.rho().boundaryField()[patchi]; @@ -178,7 +180,7 @@ void alphatFilmWallFunctionFvPatchScalarField::updateCoeffs() const volScalarField& k = tk(); const tmp tmuw = turbModel.mu(patchi); const scalarField& muw = tmuw(); - const tmp talpha = turbModel.alpha(patchi); + const tmp talpha = ttm.thermo().alpha(patchi); const scalarField& alphaw = talpha(); const scalar Cmu25 = pow(Cmu_, 0.25); diff --git a/src/regionModels/thermalBaffleModels/Make/options b/src/regionModels/thermalBaffleModels/Make/options index d0cdb540f2..953c90c6f8 100644 --- a/src/regionModels/thermalBaffleModels/Make/options +++ b/src/regionModels/thermalBaffleModels/Make/options @@ -6,6 +6,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/mesh/extrudeModel/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -17,6 +18,7 @@ LIB_LIBS = \ -lsolidThermo \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermophysicalTransportModels \ -lradiationModels \ -ldynamicMesh \ -lfiniteVolume \ diff --git a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C index 1c84d4cfb5..16e5e8059c 100644 --- a/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C +++ b/src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,9 +24,9 @@ License \*---------------------------------------------------------------------------*/ #include "thermalBaffleFvPatchScalarField.H" -#include "addToRunTimeSelectionTable.H" #include "emptyPolyPatch.H" #include "mappedWallPolyPatch.H" +#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/specieTransfer/Make/options b/src/specieTransfer/Make/options index 0631400a71..100bb5e29b 100644 --- a/src/specieTransfer/Make/options +++ b/src/specieTransfer/Make/options @@ -6,7 +6,8 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude LIB_LIBS = \ -lfiniteVolume \ @@ -16,4 +17,5 @@ LIB_LIBS = \ -lspecie \ -lreactionThermophysicalModels \ -lturbulenceModels \ - -lcompressibleTurbulenceModels + -lcompressibleTurbulenceModels \ + -lthermophysicalTransportModels diff --git a/src/specieTransfer/derivedFvPatchFields/adsorptionMassFraction/adsorptionMassFractionFvPatchScalarField.C b/src/specieTransfer/derivedFvPatchFields/adsorptionMassFraction/adsorptionMassFractionFvPatchScalarField.C index 74f8972152..2d46601568 100644 --- a/src/specieTransfer/derivedFvPatchFields/adsorptionMassFraction/adsorptionMassFractionFvPatchScalarField.C +++ b/src/specieTransfer/derivedFvPatchFields/adsorptionMassFraction/adsorptionMassFractionFvPatchScalarField.C @@ -24,12 +24,12 @@ License \*---------------------------------------------------------------------------*/ #include "adsorptionMassFractionFvPatchScalarField.H" -#include "addToRunTimeSelectionTable.H" #include "volFields.H" #include "surfaceFields.H" -#include "turbulentFluidThermoModel.H" +#include "thermophysicalTransportModel.H" #include "psiReactionThermo.H" #include "rhoReactionThermo.H" +#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -109,14 +109,14 @@ Foam::adsorptionMassFractionFvPatchScalarField::calcPhiYp() const const scalarField Yc(patchInternalField()); // Get the patch delta coefficients multiplied by the diffusivity - const compressible::turbulenceModel& turb = - db().lookupObject + const thermophysicalTransportModel& ttm = + db().lookupObject ( - turbulenceModel::typeName + thermophysicalTransportModel::typeName ); const scalarField alphaEffDeltap ( - turb.alphaEff(patch().index())*patch().deltaCoeffs() + ttm.alphaEff(patch().index())*patch().deltaCoeffs() ); // Get the specie molecular weight, if needed diff --git a/src/specieTransfer/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C b/src/specieTransfer/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C index 226a641156..8b11b2d2ac 100644 --- a/src/specieTransfer/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C +++ b/src/specieTransfer/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C @@ -24,14 +24,13 @@ License \*---------------------------------------------------------------------------*/ #include "semiPermeableBaffleMassFractionFvPatchScalarField.H" -#include "addToRunTimeSelectionTable.H" #include "fvPatchFieldMapper.H" #include "volFields.H" #include "surfaceFields.H" -#include "turbulentFluidThermoModel.H" +#include "thermophysicalTransportModel.H" #include "psiReactionThermo.H" #include "rhoReactionThermo.H" - +#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -124,18 +123,18 @@ Foam::semiPermeableBaffleMassFractionFvPatchScalarField::calcPhiYp() const mappedPatchBase::map().distribute(nbrYc); // Get the patch delta coefficients multiplied by the diffusivity - const compressible::turbulenceModel& turb = - db().lookupObject + const thermophysicalTransportModel& ttm = + db().lookupObject ( - turbulenceModel::typeName + thermophysicalTransportModel::typeName ); const scalarField alphaEffDeltap ( - turb.alphaEff(patch().index())*patch().deltaCoeffs() + ttm.alphaEff(patch().index())*patch().deltaCoeffs() ); scalarField nbrAlphaEffDeltap ( - turb.alphaEff(nbrPatch.index())*nbrPatch.deltaCoeffs() + ttm.alphaEff(nbrPatch.index())*nbrPatch.deltaCoeffs() ); mappedPatchBase::map().distribute(nbrAlphaEffDeltap); diff --git a/src/specieTransfer/derivedFvPatchFields/specieTransferMassFraction/specieTransferMassFractionFvPatchScalarField.C b/src/specieTransfer/derivedFvPatchFields/specieTransferMassFraction/specieTransferMassFractionFvPatchScalarField.C index 94b6df738e..be097a7a8f 100644 --- a/src/specieTransfer/derivedFvPatchFields/specieTransferMassFraction/specieTransferMassFractionFvPatchScalarField.C +++ b/src/specieTransfer/derivedFvPatchFields/specieTransferMassFraction/specieTransferMassFractionFvPatchScalarField.C @@ -27,7 +27,7 @@ License #include "specieTransferVelocityFvPatchVectorField.H" #include "volFields.H" #include "surfaceFields.H" -#include "turbulentFluidThermoModel.H" +#include "thermophysicalTransportModel.H" #include "psiReactionThermo.H" #include "rhoReactionThermo.H" @@ -253,9 +253,9 @@ void Foam::specieTransferMassFractionFvPatchScalarField::updateCoeffs() const scalarField AAlphaEffp ( patch().magSf() - *db().lookupObject + *db().lookupObject ( - turbulenceModel::typeName + thermophysicalTransportModel::typeName ) .alphaEff(patch().index()) ); diff --git a/src/specieTransfer/derivedFvPatchFields/specieTransferTemperature/specieTransferTemperatureFvPatchScalarField.C b/src/specieTransfer/derivedFvPatchFields/specieTransferTemperature/specieTransferTemperatureFvPatchScalarField.C index d67cd28ef8..f92aa50723 100644 --- a/src/specieTransfer/derivedFvPatchFields/specieTransferTemperature/specieTransferTemperatureFvPatchScalarField.C +++ b/src/specieTransfer/derivedFvPatchFields/specieTransferTemperature/specieTransferTemperatureFvPatchScalarField.C @@ -26,11 +26,11 @@ License #include "specieTransferTemperatureFvPatchScalarField.H" #include "specieTransferMassFractionFvPatchScalarField.H" #include "specieTransferVelocityFvPatchVectorField.H" -#include "addToRunTimeSelectionTable.H" #include "volFields.H" #include "surfaceFields.H" -#include "turbulentFluidThermoModel.H" +#include "thermophysicalTransportModel.H" #include "basicSpecieMixture.H" +#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -166,9 +166,9 @@ void Foam::specieTransferTemperatureFvPatchScalarField::updateCoeffs() const scalarField AAlphaEffp ( patch().magSf() - *db().lookupObject + *db().lookupObject ( - turbulenceModel::typeName + thermophysicalTransportModel::typeName ).alphaEff(patch().index()) );