From de66b1be68b117f69075758e89ae08a224cc9d4b Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Tue, 14 Apr 2020 20:44:22 +0100 Subject: [PATCH] MomentumTransportModels: Update of the TurbulenceModels library for all flow types providing the shear-stress term in the momentum equation for incompressible and compressible Newtonian, non-Newtonian and visco-elastic laminar flow as well as Reynolds averaged and large-eddy simulation of turbulent flow. The general deviatoric shear-stress term provided by the MomentumTransportModels library is named divDevTau for compressible flow and divDevSigma (sigma = tau/rho) for incompressible flow, the spherical part of the shear-stress is assumed to be either included in the pressure or handled separately. The corresponding stress function sigma is also provided which in the case of Reynolds stress closure returns the effective Reynolds stress (including the laminar contribution) or for other Reynolds averaged or large-eddy turbulence closures returns the modelled Reynolds stress or sub-grid stress respectively. For visco-elastic flow the sigma function returns the effective total stress including the visco-elastic and Newtonian contributions. For thermal flow the heat-flux generated by thermal diffusion is now handled by the separate ThermophysicalTransportModels library allowing independent run-time selection of the heat-flux model. During the development of the MomentumTransportModels library significant effort has been put into rationalising the components and supporting libraries, removing redundant code, updating names to provide a more logical, consistent and extensible interface and aid further development and maintenance. All solvers and tutorials have been updated correspondingly and backward compatibility of the input dictionaries provided. Henry G. Weller CFD Direct Ltd. --- .../solvers/combustion/PDRFoam/Make/options | 10 +- .../solvers/combustion/PDRFoam/PDRFoam.C | 2 +- .../combustion/PDRFoam/PDRFoamAutoRefine.C | 4 +- .../dragModels/PDRDragModel/PDRDragModel.H | 4 +- .../turbulence/PDRkEpsilon/PDRkEpsilon.C | 2 +- .../turbulence/PDRkEpsilon/PDRkEpsilon.H | 4 +- .../solvers/combustion/PDRFoam/UEqn.H | 2 +- .../XiModels/XiEqModels/XiEqModel/XiEqModel.H | 4 +- .../XiModels/XiGModels/XiGModel/XiGModel.H | 4 +- .../PDRFoam/XiModels/XiModel/XiModel.H | 4 +- .../solvers/combustion/XiFoam/Make/options | 10 +- applications/solvers/combustion/XiFoam/UEqn.H | 2 +- .../XiFoam/XiEngineFoam/Make/options | 10 +- .../combustion/XiFoam/XiEngineFoam/UEqn.H | 2 +- .../XiFoam/XiEngineFoam/XiEngineFoam.C | 2 +- .../solvers/combustion/XiFoam/XiFoam.C | 2 +- .../solvers/combustion/XiFoam/createFields.H | 4 +- .../solvers/combustion/chemFoam/Make/options | 1 - .../combustion/coldEngineFoam/Make/options | 10 +- .../coldEngineFoam/coldEngineFoam.C | 2 +- .../combustion/coldEngineFoam/createFields.H | 4 +- .../solvers/combustion/fireFoam/Make/options | 10 +- .../solvers/combustion/fireFoam/UEqn.H | 2 +- .../combustion/fireFoam/createFields.H | 4 +- .../solvers/combustion/fireFoam/fireFoam.C | 2 +- .../combustion/reactingFoam/Make/options | 10 +- .../solvers/combustion/reactingFoam/UEqn.H | 2 +- .../combustion/reactingFoam/createFields.H | 4 +- .../combustion/reactingFoam/reactingFoam.C | 2 +- .../rhoReactingBuoyantFoam/Make/options | 10 +- .../rhoReactingBuoyantFoam/UEqn.H | 2 +- .../rhoReactingBuoyantFoam/createFields.H | 4 +- .../rhoReactingBuoyantFoam.C | 2 +- .../reactingFoam/rhoReactingFoam/Make/options | 10 +- .../rhoReactingFoam/createFields.H | 4 +- .../rhoReactingFoam/rhoReactingFoam.C | 2 +- .../rhoCentralFoam/BCs/Make/options | 2 - .../compressible/rhoCentralFoam/Make/options | 10 +- .../rhoCentralFoam/createFields.H | 4 +- .../rhoCentralFoam/rhoCentralFoam.C | 2 +- .../compressible/rhoPimpleFoam/Make/options | 10 +- .../solvers/compressible/rhoPimpleFoam/UEqn.H | 2 +- .../compressible/rhoPimpleFoam/createFields.H | 4 +- .../rhoPimpleFoam/rhoPimpleFoam.C | 2 +- .../compressible/rhoSimpleFoam/Make/options | 10 +- .../solvers/compressible/rhoSimpleFoam/UEqn.H | 2 +- .../compressible/rhoSimpleFoam/createFields.H | 4 +- .../rhoPorousSimpleFoam/Make/options | 10 +- .../rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H | 2 +- .../rhoPorousSimpleFoam/rhoPorousSimpleFoam.C | 2 +- .../rhoSimpleFoam/rhoSimpleFoam.C | 2 +- .../buoyantPimpleFoam/Make/options | 10 +- .../heatTransfer/buoyantPimpleFoam/UEqn.H | 2 +- .../buoyantPimpleFoam/buoyantPimpleFoam.C | 2 +- .../buoyantPimpleFoam/createFields.H | 4 +- .../buoyantSimpleFoam/Make/options | 10 +- .../heatTransfer/buoyantSimpleFoam/UEqn.H | 2 +- .../buoyantSimpleFoam/buoyantSimpleFoam.C | 2 +- .../buoyantSimpleFoam/createFields.H | 4 +- .../chtMultiRegionFoam/Make/options | 10 +- .../chtMultiRegionFoam/chtMultiRegionFoam.C | 2 +- .../chtMultiRegionFoam/fluid/UEqn.H | 2 +- .../fluid/createFluidFields.H | 5 +- .../fluid/setRegionFluidFields.H | 2 +- .../heatTransfer/thermoFoam/Make/options | 10 +- .../heatTransfer/thermoFoam/createFields.H | 4 +- .../heatTransfer/thermoFoam/thermoFoam.C | 2 +- .../adjointShapeOptimizationFoam/Make/options | 13 +- .../adjointShapeOptimizationFoam.C | 8 +- .../createFields.H | 4 +- .../incompressible/boundaryFoam/Make/options | 11 +- .../boundaryFoam/boundaryFoam.C | 6 +- .../boundaryFoam/createFields.H | 4 +- .../boundaryFoam/evaluateNearWall.H | 2 +- .../incompressible/boundaryFoam/makeGraphs.H | 2 +- .../nonNewtonianIcoFoam/Make/options | 3 +- .../incompressible/pimpleFoam/Make/options | 11 +- .../pimpleFoam/SRFPimpleFoam/Make/options | 11 +- .../pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C | 4 +- .../pimpleFoam/SRFPimpleFoam/UrelEqn.H | 2 +- .../pimpleFoam/SRFPimpleFoam/createFields.H | 4 +- .../solvers/incompressible/pimpleFoam/UEqn.H | 2 +- .../incompressible/pimpleFoam/createFields.H | 4 +- .../incompressible/pimpleFoam/pimpleFoam.C | 4 +- .../incompressible/pisoFoam/Make/options | 11 +- .../solvers/incompressible/pisoFoam/UEqn.H | 2 +- .../incompressible/pisoFoam/createFields.H | 4 +- .../incompressible/pisoFoam/pisoFoam.C | 4 +- .../incompressible/simpleFoam/Make/options | 11 +- .../simpleFoam/SRFSimpleFoam/Make/options | 11 +- .../simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C | 4 +- .../simpleFoam/SRFSimpleFoam/UrelEqn.H | 2 +- .../simpleFoam/SRFSimpleFoam/createFields.H | 4 +- .../solvers/incompressible/simpleFoam/UEqn.H | 2 +- .../incompressible/simpleFoam/createFields.H | 4 +- .../simpleFoam/porousSimpleFoam/Make/options | 11 +- .../simpleFoam/porousSimpleFoam/UEqn.H | 2 +- .../porousSimpleFoam/porousSimpleFoam.C | 4 +- .../incompressible/simpleFoam/simpleFoam.C | 4 +- .../solvers/lagrangian/DPMFoam/Allwclean | 2 +- .../solvers/lagrangian/DPMFoam/Allwmake | 2 +- .../solvers/lagrangian/DPMFoam/DPMFoam.C | 4 +- .../DPMMomentumTransportModels.C} | 42 +++-- .../DPMMomentumTransportModels/Make/files | 3 + .../DPMMomentumTransportModels/Make/options | 8 + .../DPMFoam/DPMTurbulenceModels/Make/files | 3 - .../DPMFoam/DPMTurbulenceModels/Make/options | 10 - .../lagrangian/DPMFoam/MPPICFoam/Make/options | 18 +- .../solvers/lagrangian/DPMFoam/Make/options | 18 +- .../solvers/lagrangian/DPMFoam/UcEqn.H | 2 +- .../solvers/lagrangian/DPMFoam/createFields.H | 4 +- .../lagrangian/coalChemistryFoam/Make/options | 10 +- .../lagrangian/coalChemistryFoam/UEqn.H | 2 +- .../coalChemistryFoam/coalChemistryFoam.C | 2 +- .../coalChemistryFoam/createFields.H | 4 +- .../Make/options | 11 +- .../createFields.H | 4 +- .../icoUncoupledKinematicParcelFoam.C | 4 +- .../reactingParcelFoam/Make/options | 10 +- .../lagrangian/reactingParcelFoam/UEqn.H | 2 +- .../reactingParcelFoam/createFields.H | 4 +- .../reactingParcelFoam/reactingParcelFoam.C | 2 +- .../simpleReactingParcelFoam/Make/options | 10 +- .../simpleReactingParcelFoam/UEqn.H | 2 +- .../simpleReactingParcelFoam/createFields.H | 4 +- .../simpleReactingParcelFoam.C | 2 +- .../solvers/lagrangian/sprayFoam/Make/options | 10 +- .../solvers/lagrangian/sprayFoam/UEqn.H | 2 +- .../lagrangian/sprayFoam/createFields.H | 4 +- .../sprayFoam/engineFoam/Make/options | 10 +- .../sprayFoam/engineFoam/engineFoam.C | 2 +- .../solvers/lagrangian/sprayFoam/sprayFoam.C | 2 +- .../uncoupledKinematicParcelFoam/Make/options | 10 +- .../createFields.H | 4 +- .../uncoupledKinematicParcelFoam.C | 4 +- .../multiphase/cavitatingFoam/Make/options | 17 +- .../solvers/multiphase/cavitatingFoam/UEqn.H | 2 +- .../cavitatingFoam/cavitatingFoam.C | 4 +- .../multiphase/cavitatingFoam/createFields.H | 4 +- .../compressibleInterFoam/Allwclean | 2 +- .../multiphase/compressibleInterFoam/Allwmake | 2 +- .../compressibleInterFoam/Make/options | 21 +-- .../multiphase/compressibleInterFoam/UEqn.H | 2 +- .../Make/files | 4 + .../Make/options | 15 +- ...phaseCompressibleMomentumTransportModel.H} | 16 +- ...seCompressibleMomentumTransportModelFwd.H} | 15 +- ...haseCompressibleMomentumTransportModels.C} | 26 +-- .../compressibleInterPhaseTransportModel.C | 16 +- .../compressibleInterPhaseTransportModel.H | 14 +- .../Make/files | 4 - .../compressibleInterFilmFoam/Make/options | 21 +-- .../surfaceTensionModels/Make/options | 4 +- .../twoPhaseMixtureThermo/Make/options | 6 +- .../Make/options | 15 +- .../compressibleMultiphaseInterFoam/UEqn.H | 2 +- .../compressibleMultiphaseInterFoam.C | 4 +- .../createFields.H | 4 +- .../multiphaseMixtureThermo/Make/options | 2 - .../multiphase/driftFluxFoam/Make/files | 2 +- .../multiphase/driftFluxFoam/Make/options | 14 +- .../solvers/multiphase/driftFluxFoam/UEqn.H | 2 +- ... => compressibleMomentumTransportModels.C} | 33 ++-- .../multiphase/driftFluxFoam/createFields.H | 4 +- .../multiphase/driftFluxFoam/driftFluxFoam.C | 6 +- ...incompressibleTwoPhaseInteractingMixture.H | 6 +- .../mixtureViscosityModels/Make/options | 5 +- .../relativeVelocityModels/Make/options | 5 +- .../solvers/multiphase/interFoam/Make/options | 19 +- .../solvers/multiphase/interFoam/UEqn.H | 2 +- .../multiphase/interFoam/createFields.H | 4 +- .../solvers/multiphase/interFoam/interFoam.C | 4 +- .../interFoam/interMixingFoam/Make/options | 17 +- .../interFoam/interMixingFoam/createFields.H | 4 +- .../incompressibleThreePhaseMixture.H | 6 +- .../interMixingFoam/interMixingFoam.C | 4 +- .../interPhaseChangeFoam/Make/options | 19 +- .../multiphase/interPhaseChangeFoam/UEqn.H | 2 +- .../interPhaseChangeFoam/createFields.H | 4 +- .../interPhaseChangeFoam.C | 4 +- .../phaseChangeTwoPhaseMixtures/Make/options | 10 +- .../multiphaseEulerFoam/Make/options | 14 +- .../multiphaseEulerFoam/createFields.H | 4 +- .../multiphaseEulerFoam/multiphaseEulerFoam.C | 4 +- .../multiphaseSystem/Make/options | 5 +- .../multiphaseSystem/multiphaseSystem.H | 2 +- .../multiphaseInterFoam/Make/options | 15 +- .../multiphaseInterFoam/createFields.H | 4 +- .../multiphaseInterFoam/multiphaseInterFoam.C | 4 +- .../multiphaseMixture/Make/options | 5 +- .../multiphaseMixture/multiphaseMixture.H | 2 +- .../multiphaseMixture/phase/phase.H | 4 +- .../potentialFreeSurfaceFoam/Make/options | 11 +- .../potentialFreeSurfaceFoam/UEqn.H | 2 +- .../potentialFreeSurfaceFoam/createFields.H | 4 +- .../potentialFreeSurfaceFoam.C | 4 +- .../multiphase/reactingEulerFoam/Allwclean | 2 +- .../multiphase/reactingEulerFoam/Allwmake | 2 +- .../functionObjects/Make/options | 1 - .../interfacialCompositionModels/Make/options | 8 +- .../interfacialModels/Make/options | 9 +- .../turbulentDispersionModels/Burns/Burns.C | 4 +- .../turbulentDispersionModels/Gosman/Gosman.C | 4 +- .../LopezDeBertodano/LopezDeBertodano.C | 4 +- .../constantTurbulentDispersionCoefficient.C | 4 +- .../turbulentDispersionModel.C | 11 +- .../turbulentDispersionModel.H | 7 +- .../Make/files | 4 +- .../Make/options | 8 +- ...sonJacksonParticleSlipFvPatchVectorField.C | 0 ...sonJacksonParticleSlipFvPatchVectorField.H | 0 ...onJacksonParticleThetaFvPatchScalarField.C | 0 ...onJacksonParticleThetaFvPatchScalarField.H | 0 ...allBoilingWallFunctionFvPatchScalarField.C | 0 ...allBoilingWallFunctionFvPatchScalarField.H | 0 ...haseChangeWallFunctionFvPatchScalarField.C | 0 ...haseChangeWallFunctionFvPatchScalarField.H | 0 ...ayatillekeWallFunctionFvPatchScalarField.C | 8 +- ...ayatillekeWallFunctionFvPatchScalarField.H | 0 ...allBoilingWallFunctionFvPatchScalarField.C | 16 +- ...allBoilingWallFunctionFvPatchScalarField.H | 0 .../copiedFixedValueFvPatchScalarField.C | 0 .../copiedFixedValueFvPatchScalarField.H | 0 ...ixedMultiPhaseHeatFluxFvPatchScalarField.C | 4 +- ...ixedMultiPhaseHeatFluxFvPatchScalarField.H | 0 ...ocamustafaogullariIshiiDepartureDiameter.C | 4 +- ...ocamustafaogullariIshiiDepartureDiameter.H | 0 .../TolubinskiKostanchuk.C | 0 .../TolubinskiKostanchuk.H | 0 .../departureDiameterModel.C | 0 .../departureDiameterModel.H | 0 .../newDepartureDiameterModel.C | 0 .../departureFrequencyModels/Cole/Cole.C | 4 +- .../departureFrequencyModels/Cole/Cole.H | 0 ...camustafaogullariIshiiDepartureFrequency.C | 4 +- ...camustafaogullariIshiiDepartureFrequency.H | 0 .../departureFrequencyModel.C | 0 .../departureFrequencyModel.H | 0 .../newDepartureFrequencyModel.C | 0 .../KocamustafaogullariIshiiNucleationSite.C | 0 .../KocamustafaogullariIshiiNucleationSite.H | 0 .../LemmertChawla/LemmertChawla.C | 0 .../LemmertChawla/LemmertChawla.H | 0 .../newNucleationSiteModel.C | 0 .../nucleationSiteModel/nucleationSiteModel.C | 0 .../nucleationSiteModel/nucleationSiteModel.H | 0 .../Lavieville/Lavieville.C | 0 .../Lavieville/Lavieville.H | 0 .../partitioningModels/cosine/cosine.C | 0 .../partitioningModels/cosine/cosine.H | 0 .../partitioningModels/linear/linear.C | 0 .../partitioningModels/linear/linear.H | 0 .../partitioningModel/newPartitioningModel.C | 0 .../partitioningModel/partitioningModel.C | 0 .../partitioningModel/partitioningModel.H | 0 .../phaseFraction/phaseFraction.C | 0 .../phaseFraction/phaseFraction.H | 0 .../Gidaspow/GidaspowConductivity.C | 0 .../Gidaspow/GidaspowConductivity.H | 0 .../HrenyaSinclairConductivity.C | 0 .../HrenyaSinclairConductivity.H | 0 .../Syamlal/SyamlalConductivity.C | 0 .../Syamlal/SyamlalConductivity.H | 0 .../conductivityModel/conductivityModel.C | 0 .../conductivityModel/conductivityModel.H | 0 .../conductivityModel/newConductivityModel.C | 0 .../JohnsonJacksonFrictionalStress.C | 0 .../JohnsonJacksonFrictionalStress.H | 0 .../JohnsonJacksonSchaefferFrictionalStress.C | 0 .../JohnsonJacksonSchaefferFrictionalStress.H | 0 .../Schaeffer/SchaefferFrictionalStress.C | 0 .../Schaeffer/SchaefferFrictionalStress.H | 0 .../frictionalStressModel.C | 0 .../frictionalStressModel.H | 0 .../newFrictionalStressModel.C | 0 .../granularPressureModel/Lun/LunPressure.C | 0 .../granularPressureModel/Lun/LunPressure.H | 0 .../SyamlalRogersOBrienPressure.C | 0 .../SyamlalRogersOBrienPressure.H | 0 .../granularPressureModel.C | 0 .../granularPressureModel.H | 0 .../newGranularPressureModel.C | 0 .../kineticTheoryModel/kineticTheoryModel.C | 10 +- .../kineticTheoryModel/kineticTheoryModel.H | 8 +- .../CarnahanStarling/CarnahanStarlingRadial.C | 0 .../CarnahanStarling/CarnahanStarlingRadial.H | 0 .../radialModel/LunSavage/LunSavageRadial.C | 0 .../radialModel/LunSavage/LunSavageRadial.H | 0 .../SinclairJackson/SinclairJacksonRadial.C | 0 .../SinclairJackson/SinclairJacksonRadial.H | 0 .../radialModel/radialModel/newRadialModel.C | 0 .../radialModel/radialModel/radialModel.C | 0 .../radialModel/radialModel/radialModel.H | 0 .../Gidaspow/GidaspowViscosity.C | 0 .../Gidaspow/GidaspowViscosity.H | 0 .../HrenyaSinclair/HrenyaSinclairViscosity.C | 0 .../HrenyaSinclair/HrenyaSinclairViscosity.H | 0 .../viscosityModel/Syamlal/SyamlalViscosity.C | 0 .../viscosityModel/Syamlal/SyamlalViscosity.H | 0 .../viscosityModel/none/noneViscosity.C | 0 .../viscosityModel/none/noneViscosity.H | 0 .../viscosityModel/newViscosityModel.C | 0 .../viscosityModel/viscosityModel.C | 0 .../viscosityModel/viscosityModel.H | 0 ...haseCompressibleMomentumTransportModels.C} | 34 ++-- .../phasePressureModel/phasePressureModel.C | 11 +- .../phasePressureModel/phasePressureModel.H | 8 +- .../phaseSystems/Make/options | 9 +- .../MovingPhaseModel/MovingPhaseModel.C | 10 +- .../MovingPhaseModel/MovingPhaseModel.H | 4 +- ...phaseCompressibleMomentumTransportModel.H} | 16 +- ...seCompressibleMomentumTransportModelFwd.H} | 14 +- .../phaseThermophysicalTransportModel.H | 4 +- .../phaseModel/phaseModel/phaseModel.H | 2 +- .../LehrMilliesMewes/LehrMilliesMewes.C | 4 +- .../LuoSvendsen/LuoSvendsen.C | 4 +- .../LaakkonenAlopaeusAittamaa.C | 4 +- .../CoulaloglouTavlaridesCoalescence.C | 4 +- .../LehrMilliesMewesCoalescence.C | 4 +- .../coalescenceModels/Luo/Luo.C | 4 +- .../PrinceBlanch/PrinceBlanch.C | 4 +- .../turbulentShear/turbulentShear.C | 4 +- .../populationBalanceModel.C | 8 +- .../populationBalanceModel.H | 7 +- .../Make/options | 10 +- .../phaseThermophysicalTransportModels.C | 12 +- .../reactingMultiphaseEulerFoam/Make/options | 9 +- .../multiphaseSystem/Make/options | 9 +- .../reactingMultiphaseEulerFoam.C | 2 +- .../reactingTwoPhaseEulerFoam/Allwclean | 2 +- .../reactingTwoPhaseEulerFoam/Allwmake | 2 +- .../reactingTwoPhaseEulerFoam/Make/options | 11 +- .../reactingTwoPhaseEulerFoam.C | 2 +- .../Make/files | 3 + .../Make/options | 8 +- ...haseCompressibleMomentumTransportModels.C} | 20 +- .../Make/files | 3 - .../twoPhaseSystem/Make/options | 11 +- .../IATE/IATEsources/IATEsource/IATEsource.C | 4 +- .../twoLiquidMixingFoam/Make/options | 19 +- .../multiphase/twoLiquidMixingFoam/UEqn.H | 2 +- .../twoLiquidMixingFoam/createFields.H | 4 +- .../twoLiquidMixingFoam/twoLiquidMixingFoam.C | 4 +- .../multiphase/twoPhaseEulerFoam/Allwclean | 2 +- .../multiphase/twoPhaseEulerFoam/Allwmake | 2 +- .../multiphase/twoPhaseEulerFoam/Make/options | 17 +- .../interfacialModels/Make/options | 9 +- .../turbulentDispersionModels/Burns/Burns.C | 4 +- .../turbulentDispersionModels/Gosman/Gosman.C | 4 +- .../LopezDeBertodano/LopezDeBertodano.C | 4 +- .../constantTurbulentDispersionCoefficient.C | 4 +- .../multiphase/twoPhaseEulerFoam/pU/UEqns.H | 4 +- .../multiphase/twoPhaseEulerFoam/pUf/UEqns.H | 4 +- .../Make/files | 4 +- .../Make/options | 12 +- .../Gidaspow/GidaspowConductivity.C | 2 +- .../Gidaspow/GidaspowConductivity.H | 2 +- .../HrenyaSinclairConductivity.C | 2 +- .../HrenyaSinclairConductivity.H | 2 +- .../Syamlal/SyamlalConductivity.C | 2 +- .../Syamlal/SyamlalConductivity.H | 2 +- .../conductivityModel/conductivityModel.C | 2 +- .../conductivityModel/conductivityModel.H | 2 +- .../conductivityModel/newConductivityModel.C | 2 +- ...sonJacksonParticleSlipFvPatchVectorField.C | 0 ...sonJacksonParticleSlipFvPatchVectorField.H | 2 +- ...onJacksonParticleThetaFvPatchScalarField.C | 0 ...onJacksonParticleThetaFvPatchScalarField.H | 2 +- .../JohnsonJacksonFrictionalStress.C | 2 +- .../JohnsonJacksonFrictionalStress.H | 2 +- .../JohnsonJacksonSchaefferFrictionalStress.C | 2 +- .../JohnsonJacksonSchaefferFrictionalStress.H | 2 +- .../Schaeffer/SchaefferFrictionalStress.C | 2 +- .../Schaeffer/SchaefferFrictionalStress.H | 2 +- .../frictionalStressModel.C | 2 +- .../frictionalStressModel.H | 2 +- .../newFrictionalStressModel.C | 2 +- .../granularPressureModel/Lun/LunPressure.C | 2 +- .../granularPressureModel/Lun/LunPressure.H | 2 +- .../SyamlalRogersOBrienPressure.C | 2 +- .../SyamlalRogersOBrienPressure.H | 2 +- .../granularPressureModel.C | 2 +- .../granularPressureModel.H | 2 +- .../newGranularPressureModel.C | 2 +- .../kineticTheoryModel/kineticTheoryModel.C | 12 +- .../kineticTheoryModel/kineticTheoryModel.H | 8 +- .../CarnahanStarling/CarnahanStarlingRadial.C | 2 +- .../CarnahanStarling/CarnahanStarlingRadial.H | 2 +- .../radialModel/LunSavage/LunSavageRadial.C | 2 +- .../radialModel/LunSavage/LunSavageRadial.H | 2 +- .../SinclairJackson/SinclairJacksonRadial.C | 2 +- .../SinclairJackson/SinclairJacksonRadial.H | 2 +- .../radialModel/radialModel/newRadialModel.C | 2 +- .../radialModel/radialModel/radialModel.C | 2 +- .../radialModel/radialModel/radialModel.H | 2 +- .../Gidaspow/GidaspowViscosity.C | 2 +- .../Gidaspow/GidaspowViscosity.H | 2 +- .../HrenyaSinclair/HrenyaSinclairViscosity.C | 2 +- .../HrenyaSinclair/HrenyaSinclairViscosity.H | 2 +- .../viscosityModel/Syamlal/SyamlalViscosity.C | 2 +- .../viscosityModel/Syamlal/SyamlalViscosity.H | 2 +- .../viscosityModel/none/noneViscosity.C | 2 +- .../viscosityModel/none/noneViscosity.H | 2 +- .../viscosityModel/newViscosityModel.C | 2 +- .../viscosityModel/viscosityModel.C | 2 +- .../viscosityModel/viscosityModel.H | 2 +- ...phaseCompressibleMomentumTransportModel.H} | 16 +- ...seCompressibleMomentumTransportModelFwd.H} | 14 +- ...haseCompressibleMomentumTransportModels.C} | 34 ++-- .../phasePressureModel/phasePressureModel.C | 16 +- .../phasePressureModel/phasePressureModel.H | 11 +- .../Make/options | 12 +- .../phaseThermophysicalTransportModels.C | 12 +- .../twoPhaseEulerFoam/twoPhaseEulerFoam.C | 4 +- .../twoPhaseSystem/Make/options | 10 +- .../IATE/IATEsources/IATEsource/IATEsource.C | 4 +- .../twoPhaseSystem/phaseModel/phaseModel.C | 10 +- .../twoPhaseSystem/phaseModel/phaseModel.H | 19 +- .../twoPhaseSystem/twoPhaseSystem.C | 4 +- .../mesh/advanced/PDRMesh/Make/options | 5 +- .../dataConversion/foamToGMV/Make/options | 2 +- .../postProcessing/postProcess/Make/options | 17 +- .../applyBoundaryLayer/Make/options | 11 +- .../applyBoundaryLayer/applyBoundaryLayer.C | 8 +- .../Make/options | 4 +- .../thermophysical/chemkinToFoam/Make/options | 1 - .../icoUncoupledKinematicCloud | 20 -- etc/config.sh/bash_completion | 102 +++++----- etc/controlDict | 2 +- src/Allwmake | 5 +- .../Allwmake | 2 +- .../CompressibleMomentumTransportModel.C} | 22 +-- .../CompressibleMomentumTransportModel.H} | 28 +-- .../compressible/Make/files | 4 + .../compressible/Make/options | 5 +- .../RAS/buoyantKEpsilon/buoyantKEpsilon.C | 28 +-- .../RAS/buoyantKEpsilon/buoyantKEpsilon.H | 10 +- .../compressibleMomentumTransportModel.C} | 14 +- .../compressibleMomentumTransportModel.H} | 43 ++--- .../fluidThermoMomentumTransportModel.C} | 12 +- .../fluidThermoMomentumTransportModel.H} | 31 ++-- .../fluidThermoMomentumTransportModels.C} | 8 +- .../fluidThermoMomentumTransportModels.H} | 21 +-- .../makeMomentumTransportModel.H} | 10 +- .../IncompressibleMomentumTransportModel.C} | 48 ++--- .../IncompressibleMomentumTransportModel.H} | 38 ++-- .../incompressible/Make/files | 11 ++ .../incompressible/Make/options | 6 +- .../incompressibleMomentumTransportModel.C} | 20 +- .../incompressibleMomentumTransportModel.H} | 40 ++-- .../RAS/LamBremhorstKE/LamBremhorstKE.C | 0 .../RAS/LamBremhorstKE/LamBremhorstKE.H | 2 +- .../RAS/LienCubicKE/LienCubicKE.C | 0 .../RAS/LienCubicKE/LienCubicKE.H | 2 +- .../RAS/LienLeschziner/LienLeschziner.C | 0 .../RAS/LienLeschziner/LienLeschziner.H | 2 +- .../RAS/ShihQuadraticKE/ShihQuadraticKE.C | 0 .../RAS/ShihQuadraticKE/ShihQuadraticKE.H | 2 +- .../RAS/kkLOmega/kkLOmega.C | 0 .../RAS/kkLOmega/kkLOmega.H | 2 +- .../RAS/qZeta/qZeta.C | 0 .../RAS/qZeta/qZeta.H | 2 +- .../kinematicMomentumTransportModel.C} | 12 +- .../kinematicMomentumTransportModel.H} | 33 ++-- .../kinematicMomentumTransportModels.C} | 8 +- .../kinematicMomentumTransportModels.H} | 26 +-- .../Base/kOmegaSST/kOmegaSSTBase.C | 70 +++---- .../Base/kOmegaSST/kOmegaSSTBase.H | 10 +- .../DeardorffDiffStress/DeardorffDiffStress.C | 29 ++- .../DeardorffDiffStress/DeardorffDiffStress.H | 10 +- .../LES/LESModel/LESModel.C | 30 +-- .../LES/LESModel/LESModel.H | 12 +- .../LES/LESdeltas/IDDESDelta/IDDESDelta.C | 8 +- .../LES/LESdeltas/IDDESDelta/IDDESDelta.H | 4 +- .../LES/LESdeltas/LESdelta/LESdelta.C | 10 +- .../LES/LESdeltas/LESdelta/LESdelta.H | 22 +-- .../LES/LESdeltas/PrandtlDelta/PrandtlDelta.C | 8 +- .../LES/LESdeltas/PrandtlDelta/PrandtlDelta.H | 4 +- .../cubeRootVolDelta/cubeRootVolDelta.C | 8 +- .../cubeRootVolDelta/cubeRootVolDelta.H | 6 +- .../LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C | 8 +- .../LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H | 6 +- .../LES/LESdeltas/smoothDelta/smoothDelta.C | 8 +- .../LES/LESdeltas/smoothDelta/smoothDelta.H | 6 +- .../smoothDelta/smoothDeltaDeltaDataI.H | 2 +- .../LESdeltas/vanDriestDelta/vanDriestDelta.C | 14 +- .../LESdeltas/vanDriestDelta/vanDriestDelta.H | 6 +- .../LES/LESeddyViscosity/LESeddyViscosity.C | 17 +- .../LES/LESeddyViscosity/LESeddyViscosity.H | 10 +- .../LES/LESfilters/LESfilter/LESfilter.C | 2 +- .../LES/LESfilters/LESfilter/LESfilter.H | 2 +- .../anisotropicFilter/anisotropicFilter.C | 2 +- .../anisotropicFilter/anisotropicFilter.H | 2 +- .../LESfilters/laplaceFilter/laplaceFilter.C | 2 +- .../LESfilters/laplaceFilter/laplaceFilter.H | 2 +- .../LESfilters/simpleFilter/simpleFilter.C | 2 +- .../LESfilters/simpleFilter/simpleFilter.H | 2 +- .../LES/Smagorinsky/Smagorinsky.C | 32 ++-- .../LES/Smagorinsky/Smagorinsky.H | 10 +- .../SpalartAllmarasDDES/SpalartAllmarasDDES.C | 21 ++- .../SpalartAllmarasDDES/SpalartAllmarasDDES.H | 10 +- .../SpalartAllmarasDES/SpalartAllmarasDES.C | 77 ++++---- .../SpalartAllmarasDES/SpalartAllmarasDES.H | 10 +- .../SpalartAllmarasIDDES.C | 40 ++-- .../SpalartAllmarasIDDES.H | 10 +- .../momentumTransportModels}/LES/WALE/WALE.C | 36 ++-- .../momentumTransportModels}/LES/WALE/WALE.H | 10 +- .../LES/dynamicKEqn/dynamicKEqn.C | 53 +++--- .../LES/dynamicKEqn/dynamicKEqn.H | 10 +- .../LES/dynamicLagrangian/dynamicLagrangian.C | 28 ++- .../LES/dynamicLagrangian/dynamicLagrangian.H | 10 +- .../momentumTransportModels}/LES/kEqn/kEqn.C | 32 ++-- .../momentumTransportModels}/LES/kEqn/kEqn.H | 10 +- .../LES/kOmegaSSTDES/kOmegaSSTDES.C | 33 ++-- .../LES/kOmegaSSTDES/kOmegaSSTDES.H | 12 +- .../momentumTransportModels}/Make/files | 4 +- .../momentumTransportModels}/Make/options | 0 .../MomentumTransportModel.C} | 41 +++-- .../MomentumTransportModel.H} | 32 ++-- .../momentumTransportModels}/RAS/LRR/LRR.C | 32 ++-- .../momentumTransportModels}/RAS/LRR/LRR.H | 10 +- .../RAS/LaunderSharmaKE/LaunderSharmaKE.C | 42 ++--- .../RAS/LaunderSharmaKE/LaunderSharmaKE.H | 10 +- .../RAS/RASModel/RASModel.C | 30 +-- .../RAS/RASModel/RASModel.H | 12 +- .../RAS/RNGkEpsilon/RNGkEpsilon.C | 33 ++-- .../RAS/RNGkEpsilon/RNGkEpsilon.H | 10 +- .../momentumTransportModels}/RAS/SSG/SSG.C | 32 ++-- .../momentumTransportModels}/RAS/SSG/SSG.H | 10 +- .../RAS/SpalartAllmaras/SpalartAllmaras.C | 63 +++---- .../RAS/SpalartAllmaras/SpalartAllmaras.H | 10 +- ...thDissipationRateInletFvPatchScalarField.C | 17 +- ...thDissipationRateInletFvPatchScalarField.H | 2 +- ...ngLengthFrequencyInletFvPatchScalarField.C | 17 +- ...ngLengthFrequencyInletFvPatchScalarField.H | 2 +- .../RAS/kEpsilon/kEpsilon.C | 32 ++-- .../RAS/kEpsilon/kEpsilon.H | 10 +- .../RAS/kOmega/kOmega.C | 32 ++-- .../RAS/kOmega/kOmega.H | 10 +- .../RAS/kOmegaSST/kOmegaSST.C | 8 +- .../RAS/kOmegaSST/kOmegaSST.H | 12 +- .../RAS/kOmegaSSTLM/kOmegaSSTLM.C | 62 ++++--- .../RAS/kOmegaSSTLM/kOmegaSSTLM.H | 10 +- .../RAS/kOmegaSSTSAS/kOmegaSSTSAS.C | 16 +- .../RAS/kOmegaSSTSAS/kOmegaSSTSAS.H | 10 +- .../RAS/realizableKE/realizableKE.C | 41 ++--- .../RAS/realizableKE/realizableKE.H | 10 +- .../momentumTransportModels}/RAS/v2f/v2f.C | 32 ++-- .../momentumTransportModels}/RAS/v2f/v2f.H | 10 +- .../RAS/v2f/v2fBase.C | 2 +- .../RAS/v2f/v2fBase.H | 2 +- .../ReynoldsStress/ReynoldsStress.C | 58 +++--- .../ReynoldsStress/ReynoldsStress.H | 20 +- .../fixedShearStressFvPatchVectorField.C | 17 +- .../fixedShearStressFvPatchVectorField.H | 2 +- .../porousBafflePressureFvPatchField.C | 17 +- .../porousBafflePressureFvPatchField.H | 2 +- .../porousBafflePressureFvPatchFieldFwd.H | 2 +- .../epsilonWallFunctionFvPatchScalarField.C | 36 ++-- .../epsilonWallFunctionFvPatchScalarField.H | 8 +- .../fWallFunctionFvPatchScalarField.C | 17 +- .../fWallFunctionFvPatchScalarField.H | 2 +- .../kLowReWallFunctionFvPatchScalarField.C | 17 +- .../kLowReWallFunctionFvPatchScalarField.H | 2 +- .../kqRWallFunctionFvPatchField.C | 2 +- .../kqRWallFunctionFvPatchField.H | 2 +- .../kqRWallFunctionFvPatchFields.C | 2 +- .../kqRWallFunctionFvPatchFields.H | 2 +- .../nutLowReWallFunctionFvPatchScalarField.C | 17 +- .../nutLowReWallFunctionFvPatchScalarField.H | 2 +- .../nutURoughWallFunctionFvPatchScalarField.C | 32 ++-- .../nutURoughWallFunctionFvPatchScalarField.H | 2 +- ...tUSpaldingWallFunctionFvPatchScalarField.C | 47 ++--- ...tUSpaldingWallFunctionFvPatchScalarField.H | 2 +- ...UTabulatedWallFunctionFvPatchScalarField.C | 32 ++-- ...UTabulatedWallFunctionFvPatchScalarField.H | 2 +- .../nutUWallFunctionFvPatchScalarField.C | 47 ++--- .../nutUWallFunctionFvPatchScalarField.H | 2 +- .../nutWallFunctionFvPatchScalarField.C | 6 +- .../nutWallFunctionFvPatchScalarField.H | 6 +- .../nutkRoughWallFunctionFvPatchScalarField.C | 17 +- .../nutkRoughWallFunctionFvPatchScalarField.H | 2 +- .../nutkWallFunctionFvPatchScalarField.C | 32 ++-- .../nutkWallFunctionFvPatchScalarField.H | 2 +- .../omegaWallFunctionFvPatchScalarField.C | 36 ++-- .../omegaWallFunctionFvPatchScalarField.H | 8 +- .../v2WallFunctionFvPatchScalarField.C | 17 +- .../v2WallFunctionFvPatchScalarField.H | 2 +- .../eddyViscosity/eddyViscosity.C | 26 +-- .../eddyViscosity/eddyViscosity.H | 14 +- .../laminar/Giesekus/Giesekus.C | 16 +- .../laminar/Giesekus/Giesekus.H | 10 +- .../laminar/Maxwell/Maxwell.C | 44 ++--- .../laminar/Maxwell/Maxwell.H | 20 +- .../laminar/PTT/PTT.C | 16 +- .../laminar/PTT/PTT.H | 10 +- .../laminar/Stokes/Stokes.C | 48 ++--- .../laminar/Stokes/Stokes.H | 14 +- .../generalizedNewtonian.C | 48 ++--- .../generalizedNewtonian.H | 14 +- .../BirdCarreau/BirdCarreau.C | 2 +- .../BirdCarreau/BirdCarreau.H | 2 +- .../Casson/Casson.C | 2 +- .../Casson/Casson.H | 2 +- .../CrossPowerLaw/CrossPowerLaw.C | 2 +- .../CrossPowerLaw/CrossPowerLaw.H | 2 +- .../HerschelBulkley/HerschelBulkley.C | 2 +- .../HerschelBulkley/HerschelBulkley.H | 2 +- .../generalizedNewtonianViscosityModel.C | 2 +- .../generalizedNewtonianViscosityModel.H | 2 +- .../generalizedNewtonianViscosityModelNew.C | 2 +- .../powerLaw/powerLaw.C | 2 +- .../powerLaw/powerLaw.H | 2 +- .../strainRateFunction/strainRateFunction.C | 2 +- .../strainRateFunction/strainRateFunction.H | 2 +- .../laminar/laminarModel/laminarModel.C | 66 +++---- .../laminar/laminarModel/laminarModel.H | 16 +- .../linearViscousStress/linearViscousStress.C | 32 ++-- .../linearViscousStress/linearViscousStress.H | 16 +- .../makeMomentumTransportModel.H} | 14 +- .../momentumTransportModel.C} | 16 +- .../momentumTransportModel.H} | 24 +-- .../nonlinearEddyViscosity.C | 37 ++-- .../nonlinearEddyViscosity.H | 20 +- .../phaseCompressible/LES/Niceno/NicenoKEqn.C | 60 +++--- .../phaseCompressible/LES/Niceno/NicenoKEqn.H | 18 +- .../LES/SmagorinskyZhang/SmagorinskyZhang.C | 38 ++-- .../LES/SmagorinskyZhang/SmagorinskyZhang.H | 18 +- .../LES/continuousGasKEqn/continuousGasKEqn.C | 34 ++-- .../LES/continuousGasKEqn/continuousGasKEqn.H | 14 +- ...PhaseCompressibleMomentumTransportModel.C} | 26 +-- ...PhaseCompressibleMomentumTransportModel.H} | 28 +-- .../RAS/LaheyKEpsilon/LaheyKEpsilon.C | 75 ++++---- .../RAS/LaheyKEpsilon/LaheyKEpsilon.H | 18 +- .../continuousGasKEpsilon.C | 60 +++--- .../continuousGasKEpsilon.H | 18 +- .../RAS/kOmegaSSTSato/kOmegaSSTSato.C | 28 ++- .../RAS/kOmegaSSTSato/kOmegaSSTSato.H | 10 +- .../RAS/mixtureKEpsilon/mixtureKEpsilon.C | 105 ++++++----- .../RAS/mixtureKEpsilon/mixtureKEpsilon.H | 15 +- ...aseIncompressibleMomentumTransportModel.C} | 47 ++--- ...aseIncompressibleMomentumTransportModel.H} | 36 ++-- .../pointFields/pointFieldsFwd.H | 5 +- src/OpenFOAM/include/listOptions.H | 6 +- src/OpenFOAM/include/listOutput.H | 12 +- .../objectFunction1/objectFunction1.H | 143 ++++++++++++++ .../objectFunction1Templates.C | 131 +++++++++++++ .../Make/options | 8 +- ...ayatillekeWallFunctionFvPatchScalarField.C | 3 +- .../alphatWallFunctionFvPatchScalarField.C | 3 +- ...convectiveHeatTransferFvPatchScalarField.C | 3 +- .../fluidThermo/fluidThermoTransportModel.H | 4 +- .../thermophysicalTransportModel.C | 2 +- .../thermophysicalTransportModel.H | 10 +- .../thermophysicalTransportModels.C | 2 +- .../thermophysicalTransportModels.H | 10 +- src/TurbulenceModels/compressible/Make/files | 4 - .../incompressible/Make/files | 11 -- src/atmosphericModels/Make/options | 11 +- .../atmosphericTurbulentTransportModels.C | 4 +- ...tkAtmRoughWallFunctionFvPatchScalarField.C | 17 +- .../kEpsilonLopesdaCosta.C | 45 +++-- .../kEpsilonLopesdaCosta.H | 10 +- .../ChemistryCombustion/ChemistryCombustion.C | 4 +- .../ChemistryCombustion/ChemistryCombustion.H | 4 +- .../CombustionModel/CombustionModel.C | 6 +- .../CombustionModel/CombustionModel.H | 8 +- .../ThermoCombustion/ThermoCombustion.C | 4 +- .../ThermoCombustion/ThermoCombustion.H | 4 +- src/combustionModels/EDC/EDC.C | 4 +- src/combustionModels/EDC/EDC.H | 4 +- src/combustionModels/FSD/FSD.C | 4 +- src/combustionModels/FSD/FSD.H | 4 +- .../relaxation/relaxation.C | 5 +- src/combustionModels/Make/options | 10 +- src/combustionModels/PaSR/PaSR.C | 4 +- src/combustionModels/PaSR/PaSR.H | 4 +- .../combustionModel/combustionModel.C | 4 +- .../combustionModel/combustionModel.H | 12 +- .../combustionModel/combustionModelI.H | 4 +- .../combustionModelTemplates.C | 4 +- src/combustionModels/diffusion/diffusion.C | 4 +- src/combustionModels/diffusion/diffusion.H | 4 +- .../infinitelyFastChemistry.C | 4 +- .../infinitelyFastChemistry.H | 4 +- src/combustionModels/laminar/laminar.C | 4 +- src/combustionModels/laminar/laminar.H | 4 +- .../noCombustion/noCombustion.C | 4 +- .../noCombustion/noCombustion.H | 4 +- .../singleStepCombustion.C | 4 +- .../singleStepCombustion.H | 4 +- .../zoneCombustion/zoneCombustion.C | 4 +- .../zoneCombustion/zoneCombustion.H | 4 +- .../fields/surfaceFields/surfaceFieldsFwd.H | 5 +- .../fields/volFields/volFieldsFwd.H | 5 +- src/functionObjects/field/Make/options | 16 +- src/functionObjects/field/PecletNo/PecletNo.C | 6 +- src/functionObjects/field/age/age.C | 10 +- .../field/shearStress/shearStress.C | 26 +-- .../field/turbulenceFields/turbulenceFields.C | 47 +++-- .../field/turbulenceFields/turbulenceFields.H | 14 +- .../turbulenceIntensity/turbulenceIntensity.C | 19 +- .../wallHeatTransferCoeff.C | 12 +- .../field/wallShearStress/wallShearStress.C | 32 ++-- .../field/wallShearStress/wallShearStress.H | 4 +- src/functionObjects/field/yPlus/yPlus.C | 21 ++- src/functionObjects/field/yPlus/yPlus.H | 4 +- src/functionObjects/forces/Make/options | 16 +- src/functionObjects/forces/forces/forces.C | 32 ++-- src/functionObjects/forces/forces/forces.H | 2 +- src/functionObjects/lagrangian/Make/files | 1 - src/functionObjects/lagrangian/Make/options | 3 +- .../icoUncoupledKinematicCloud.C | 144 --------------- .../icoUncoupledKinematicCloud.H | 174 ------------------ src/functionObjects/solvers/Make/options | 17 +- .../phaseScalarTransport.C | 12 +- .../solvers/scalarTransport/scalarTransport.C | 16 +- src/fvOptions/Make/options | 9 +- .../volumeFractionSource.C | 6 +- .../semiImplicitSource/semiImplicitSource.C | 43 +++-- .../semiImplicitSource/semiImplicitSource.H | 8 +- .../variableHeatTransfer.C | 3 +- src/lagrangian/coalCombustion/Make/options | 15 +- src/lagrangian/intermediate/Make/options | 3 - src/lagrangian/spray/Make/options | 15 +- src/lagrangian/turbulence/Make/options | 15 +- .../DispersionRASModel/DispersionRASModel.C | 18 +- .../BrownianMotion/BrownianMotionForce.C | 10 +- src/radiationModels/Make/options | 2 - src/regionModels/surfaceFilmModels/Make/files | 6 +- .../surfaceFilmModels/Make/options | 2 - .../wallFunctions/Make/options | 10 +- ...alphatFilmWallFunctionFvPatchScalarField.C | 3 +- .../nutkFilmWallFunctionFvPatchScalarField.C | 47 ++--- .../kinematicSingleLayer.C | 2 +- .../kinematicSingleLayer.H | 6 +- .../kinematicSingleLayerI.H | 3 +- .../filmMomentumTransportModel.C} | 17 +- .../filmMomentumTransportModel.H} | 30 +-- .../filmMomentumTransportModelNew.C} | 14 +- .../laminar/laminar.C | 4 +- .../laminar/laminar.H | 4 +- .../thermalBaffleModels/Make/options | 8 +- src/specieTransfer/Make/options | 10 +- .../SLGThermo/Make/options | 2 - src/thermophysicalModels/basic/Make/options | 2 - .../basic/fluidThermo/fluidThermo.H | 6 +- .../chemistryModel/Make/options | 2 - .../laminarFlameSpeed/Make/options | 2 - .../reactionThermo/Make/options | 2 - .../{incompressible => }/Make/files | 2 - .../{compressible => }/Make/options | 0 src/transportModels/compressible/Make/files | 3 - .../compressibleTransportModel.C | 48 ----- .../compressibleTransportModel.H | 104 ----------- .../Make/options | 13 -- .../interfaceProperties/Make/options | 8 - .../singlePhaseTransportModel.C | 2 +- .../singlePhaseTransportModel.H | 4 +- .../transportModel/transportModel.C | 2 +- .../transportModel/transportModel.H | 2 +- .../viscosityModels/BirdCarreau/BirdCarreau.C | 2 +- .../viscosityModels/BirdCarreau/BirdCarreau.H | 2 +- .../viscosityModels/Casson/Casson.C | 2 +- .../viscosityModels/Casson/Casson.H | 2 +- .../CrossPowerLaw/CrossPowerLaw.C | 2 +- .../CrossPowerLaw/CrossPowerLaw.H | 2 +- .../HerschelBulkley/HerschelBulkley.C | 2 +- .../HerschelBulkley/HerschelBulkley.H | 2 +- .../viscosityModels/Newtonian/Newtonian.C | 2 +- .../viscosityModels/Newtonian/Newtonian.H | 2 +- .../viscosityModels/powerLaw/powerLaw.C | 2 +- .../viscosityModels/powerLaw/powerLaw.H | 2 +- .../strainRateFunction/strainRateFunction.C | 2 +- .../strainRateFunction/strainRateFunction.H | 2 +- .../viscosityModel/viscosityModel.C | 2 +- .../viscosityModel/viscosityModel.H | 2 +- .../viscosityModel/viscosityModelNew.C | 2 +- .../Allwmake | 2 - .../Make/files | 0 .../Make/options | 14 ++ .../immiscibleIncompressibleTwoPhaseMixture.C | 2 +- .../immiscibleIncompressibleTwoPhaseMixture.H | 2 +- .../incompressibleTwoPhaseMixture/Make/files | 3 + .../Make/options | 4 +- .../incompressibleTwoPhaseMixture.C | 2 +- .../incompressibleTwoPhaseMixture.H | 6 +- .../interfaceProperties/Make/files | 0 .../interfaceProperties/Make/options | 8 + .../interfaceCompression.C | 2 +- .../interfaceCompression.H | 2 +- .../interfaceProperties/interfaceProperties.C | 0 .../interfaceProperties/interfaceProperties.H | 0 .../constant/constantSurfaceTension.C | 2 +- .../constant/constantSurfaceTension.H | 2 +- .../newSurfaceTensionModel.C | 2 +- .../surfaceTensionModel/surfaceTensionModel.C | 2 +- .../surfaceTensionModel/surfaceTensionModel.H | 2 +- .../temperatureDependentSurfaceTension.C | 2 +- .../temperatureDependentSurfaceTension.H | 2 +- .../twoPhaseMixture/Make/files | 0 .../twoPhaseMixture/Make/options | 0 .../twoPhaseMixture}/VoF/alphaCourantNo.H | 2 +- .../twoPhaseMixture}/VoF/alphaEqn.H | 0 .../twoPhaseMixture}/VoF/alphaEqnSubCycle.H | 0 .../twoPhaseMixture}/VoF/createAlphaFluxes.H | 0 .../twoPhaseMixture}/VoF/setDeltaT.H | 2 +- .../twoPhaseMixture}/VoF/setRDeltaT.H | 0 .../twoPhaseMixture/twoPhaseMixture.C | 2 +- .../twoPhaseMixture/twoPhaseMixture.H | 2 +- .../twoPhaseProperties/Make/files | 0 .../twoPhaseProperties/Make/options | 4 +- .../alphaContactAngleFvPatchScalarField.C | 2 +- .../alphaContactAngleFvPatchScalarField.H | 2 +- ...stantAlphaContactAngleFvPatchScalarField.C | 2 +- ...stantAlphaContactAngleFvPatchScalarField.H | 2 +- ...namicAlphaContactAngleFvPatchScalarField.C | 2 +- ...namicAlphaContactAngleFvPatchScalarField.H | 2 +- ...ndentAlphaContactAngleFvPatchScalarField.C | 2 +- ...ndentAlphaContactAngleFvPatchScalarField.H | 2 +- ...ryingAlphaContactAngleFvPatchScalarField.C | 2 +- ...ryingAlphaContactAngleFvPatchScalarField.H | 2 +- .../alphaFixedPressureFvPatchScalarField.C | 2 +- .../alphaFixedPressureFvPatchScalarField.H | 2 +- .../system/continuity | 1 - .../waterEvaporation/system/continuity | 1 - .../waterEvaporation/system/continuity | 1 - .../templates/system/solid/fvOptions | 6 - .../validation/WatersKing/Make/options | 11 +- .../validation/WatersKing/WatersKing.C | 4 +- .../interFoam/RAS/DTCHull/0/p_rgh.orig | 2 +- .../interFoam/RAS/DTCHullMoving/0/p_rgh.orig | 2 +- .../interFoam/RAS/DTCHullWave/0/p_rgh.orig | 2 +- 833 files changed, 3717 insertions(+), 4015 deletions(-) rename applications/solvers/lagrangian/DPMFoam/{DPMTurbulenceModels/DPMTurbulenceModels.C => DPMMomentumTransportModels/DPMMomentumTransportModels.C} (57%) create mode 100644 applications/solvers/lagrangian/DPMFoam/DPMMomentumTransportModels/Make/files create mode 100644 applications/solvers/lagrangian/DPMFoam/DPMMomentumTransportModels/Make/options delete mode 100644 applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/files delete mode 100644 applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/options create mode 100644 applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/Make/files rename applications/solvers/multiphase/compressibleInterFoam/{VoFphaseCompressibleTurbulenceModels => VoFphaseCompressibleMomentumTransportModels}/Make/options (51%) rename applications/solvers/multiphase/compressibleInterFoam/{VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModel.H => VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModel.H} (76%) rename applications/solvers/multiphase/compressibleInterFoam/{VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModelFwd.H => VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModelFwd.H} (78%) rename applications/solvers/multiphase/compressibleInterFoam/{VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModels.C => VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModels.C} (78%) rename applications/solvers/multiphase/compressibleInterFoam/{VoFphaseCompressibleTurbulenceModels => VoFphaseCompressibleMomentumTransportModels}/compressibleInterPhaseTransportModel.C (92%) rename applications/solvers/multiphase/compressibleInterFoam/{VoFphaseCompressibleTurbulenceModels => VoFphaseCompressibleMomentumTransportModels}/compressibleInterPhaseTransportModel.H (91%) delete mode 100644 applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/files rename applications/solvers/multiphase/driftFluxFoam/{compressibleTurbulenceModels.C => compressibleMomentumTransportModels.C} (74%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/Make/files (97%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/Make/options (56%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C (97%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C (97%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C (98%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C (97%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/newDepartureDiameterModel.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C (96%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C (97%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/newDepartureFrequencyModel.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/newNucleationSiteModel.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/newPartitioningModel.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C (97%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H (96%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/radialModel/radialModel/newRadialModel.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/radialModel/radialModel/radialModel.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/radialModel/radialModel/radialModel.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/viscosityModel/none/noneViscosity.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/viscosityModel/none/noneViscosity.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H (100%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C => phaseCompressibleMomentumTransportModels/phaseCompressibleMomentumTransportModels.C} (75%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/phasePressureModel/phasePressureModel.C (94%) rename applications/solvers/multiphase/reactingEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/phasePressureModel/phasePressureModel.H (95%) rename applications/solvers/multiphase/{twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModel.H => reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleMomentumTransportModel.H} (77%) rename applications/solvers/multiphase/{twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModelFwd.H => reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleMomentumTransportModelFwd.H} (79%) create mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleMomentumTransportModels/Make/files rename applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/{twoPhaseCompressibleTurbulenceModels => twoPhaseCompressibleMomentumTransportModels}/Make/options (63%) rename applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/{twoPhaseCompressibleTurbulenceModels/twoPhaseCompressibleTurbulenceModels.C => twoPhaseCompressibleMomentumTransportModels/twoPhaseCompressibleMomentumTransportModels.C} (80%) delete mode 100644 applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/files rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/Make/files (95%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/Make/options (57%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C (98%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C (96%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H (98%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C (100%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H (98%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C (100%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H (98%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C (98%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H (98%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C (98%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H (98%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C (98%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H (98%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C (96%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H (98%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C (96%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H (98%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H (96%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/radialModel/radialModel/newRadialModel.C (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/radialModel/radialModel/radialModel.C (96%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/radialModel/radialModel/radialModel.H (98%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C (98%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/viscosityModel/none/noneViscosity.C (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/viscosityModel/none/noneViscosity.H (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C (97%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C (96%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H (98%) rename applications/solvers/multiphase/{reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H => twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/phaseCompressibleMomentumTransportModel.H} (77%) rename applications/solvers/multiphase/{reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H => twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/phaseCompressibleMomentumTransportModelFwd.H} (79%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C => phaseCompressibleMomentumTransportModels/phaseCompressibleMomentumTransportModels.C} (77%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/phasePressureModel/phasePressureModel.C (92%) rename applications/solvers/multiphase/twoPhaseEulerFoam/{phaseCompressibleTurbulenceModels => phaseCompressibleMomentumTransportModels}/phasePressureModel/phasePressureModel.H (94%) delete mode 100644 etc/caseDicts/postProcessing/solvers/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud rename src/{TurbulenceModels => MomentumTransportModels}/Allwmake (89%) rename src/{TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C => MomentumTransportModels/compressible/CompressibleMomentumTransportModel/CompressibleMomentumTransportModel.C} (81%) rename src/{TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H => MomentumTransportModels/compressible/CompressibleMomentumTransportModel/CompressibleMomentumTransportModel.H} (86%) create mode 100644 src/MomentumTransportModels/compressible/Make/files rename src/{TurbulenceModels => MomentumTransportModels}/compressible/Make/options (80%) rename src/{TurbulenceModels => MomentumTransportModels}/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C (82%) rename src/{TurbulenceModels => MomentumTransportModels}/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H (93%) rename src/{TurbulenceModels/compressible/compressibleTurbulenceModel.C => MomentumTransportModels/compressible/compressibleMomentumTransportModel.C} (86%) rename src/{TurbulenceModels/compressible/compressibleTurbulenceModel.H => MomentumTransportModels/compressible/compressibleMomentumTransportModel.H} (72%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.C => MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModel.C} (83%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H => MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModel.H} (71%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C => MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModels.C} (95%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.H => MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModels.H} (78%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H => MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/makeMomentumTransportModel.H} (97%) rename src/{TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C => MomentumTransportModels/incompressible/IncompressibleMomentumTransportModel/IncompressibleMomentumTransportModel.C} (73%) rename src/{TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H => MomentumTransportModels/incompressible/IncompressibleMomentumTransportModel/IncompressibleMomentumTransportModel.H} (76%) create mode 100644 src/MomentumTransportModels/incompressible/Make/files rename src/{TurbulenceModels => MomentumTransportModels}/incompressible/Make/options (59%) rename src/{TurbulenceModels/incompressible/incompressibleTurbulenceModel.C => MomentumTransportModels/incompressible/incompressibleMomentumTransportModel.C} (76%) rename src/{TurbulenceModels/incompressible/incompressibleTurbulenceModel.H => MomentumTransportModels/incompressible/incompressibleMomentumTransportModel.H} (77%) rename src/{TurbulenceModels/incompressible/turbulentTransportModels => MomentumTransportModels/incompressible/kinematicMomentumTransportModels}/RAS/LamBremhorstKE/LamBremhorstKE.C (100%) rename src/{TurbulenceModels/incompressible/turbulentTransportModels => MomentumTransportModels/incompressible/kinematicMomentumTransportModels}/RAS/LamBremhorstKE/LamBremhorstKE.H (99%) rename src/{TurbulenceModels/incompressible/turbulentTransportModels => MomentumTransportModels/incompressible/kinematicMomentumTransportModels}/RAS/LienCubicKE/LienCubicKE.C (100%) rename src/{TurbulenceModels/incompressible/turbulentTransportModels => MomentumTransportModels/incompressible/kinematicMomentumTransportModels}/RAS/LienCubicKE/LienCubicKE.H (99%) rename src/{TurbulenceModels/incompressible/turbulentTransportModels => MomentumTransportModels/incompressible/kinematicMomentumTransportModels}/RAS/LienLeschziner/LienLeschziner.C (100%) rename src/{TurbulenceModels/incompressible/turbulentTransportModels => MomentumTransportModels/incompressible/kinematicMomentumTransportModels}/RAS/LienLeschziner/LienLeschziner.H (99%) rename src/{TurbulenceModels/incompressible/turbulentTransportModels => MomentumTransportModels/incompressible/kinematicMomentumTransportModels}/RAS/ShihQuadraticKE/ShihQuadraticKE.C (100%) rename src/{TurbulenceModels/incompressible/turbulentTransportModels => MomentumTransportModels/incompressible/kinematicMomentumTransportModels}/RAS/ShihQuadraticKE/ShihQuadraticKE.H (99%) rename src/{TurbulenceModels/incompressible/turbulentTransportModels => MomentumTransportModels/incompressible/kinematicMomentumTransportModels}/RAS/kkLOmega/kkLOmega.C (100%) rename src/{TurbulenceModels/incompressible/turbulentTransportModels => MomentumTransportModels/incompressible/kinematicMomentumTransportModels}/RAS/kkLOmega/kkLOmega.H (99%) rename src/{TurbulenceModels/incompressible/turbulentTransportModels => MomentumTransportModels/incompressible/kinematicMomentumTransportModels}/RAS/qZeta/qZeta.C (100%) rename src/{TurbulenceModels/incompressible/turbulentTransportModels => MomentumTransportModels/incompressible/kinematicMomentumTransportModels}/RAS/qZeta/qZeta.H (99%) rename src/{TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.C => MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModel.C} (82%) rename src/{TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H => MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModel.H} (70%) rename src/{TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C => MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModels.C} (95%) rename src/{TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.H => MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModels.H} (71%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/Base/kOmegaSST/kOmegaSSTBase.C (82%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/Base/kOmegaSST/kOmegaSSTBase.H (96%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/DeardorffDiffStress/DeardorffDiffStress.C (85%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/DeardorffDiffStress/DeardorffDiffStress.H (93%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESModel/LESModel.C (86%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESModel/LESModel.H (94%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESdeltas/IDDESDelta/IDDESDelta.C (95%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESdeltas/IDDESDelta/IDDESDelta.H (96%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESdeltas/LESdelta/LESdelta.C (94%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESdeltas/LESdelta/LESdelta.H (85%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C (92%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H (96%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C (93%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H (93%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C (94%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H (94%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESdeltas/smoothDelta/smoothDelta.C (95%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESdeltas/smoothDelta/smoothDelta.H (97%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C (91%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESdeltas/vanDriestDelta/vanDriestDelta.H (94%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESeddyViscosity/LESeddyViscosity.C (84%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESeddyViscosity/LESeddyViscosity.H (90%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESfilters/LESfilter/LESfilter.C (97%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESfilters/LESfilter/LESfilter.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESfilters/anisotropicFilter/anisotropicFilter.C (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESfilters/anisotropicFilter/anisotropicFilter.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESfilters/laplaceFilter/laplaceFilter.C (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESfilters/laplaceFilter/laplaceFilter.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESfilters/simpleFilter/simpleFilter.C (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/LESfilters/simpleFilter/simpleFilter.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/Smagorinsky/Smagorinsky.C (80%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/Smagorinsky/Smagorinsky.H (93%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C (85%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H (92%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/SpalartAllmarasDES/SpalartAllmarasDES.C (82%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/SpalartAllmarasDES/SpalartAllmarasDES.H (95%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C (85%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H (93%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/WALE/WALE.C (81%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/WALE/WALE.H (93%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/dynamicKEqn/dynamicKEqn.C (80%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/dynamicKEqn/dynamicKEqn.H (94%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/dynamicLagrangian/dynamicLagrangian.C (88%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/dynamicLagrangian/dynamicLagrangian.H (93%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/kEqn/kEqn.C (85%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/kEqn/kEqn.H (93%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/kOmegaSSTDES/kOmegaSSTDES.C (80%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/LES/kOmegaSSTDES/kOmegaSSTDES.H (92%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/Make/files (97%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/Make/options (100%) rename src/{TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C => MomentumTransportModels/momentumTransportModels/MomentumTransportModel/MomentumTransportModel.C} (79%) rename src/{TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H => MomentumTransportModels/momentumTransportModels/MomentumTransportModel/MomentumTransportModel.H} (86%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/LRR/LRR.C (91%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/LRR/LRR.H (94%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/LaunderSharmaKE/LaunderSharmaKE.C (85%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/LaunderSharmaKE/LaunderSharmaKE.H (94%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/RASModel/RASModel.C (85%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/RASModel/RASModel.H (94%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/RNGkEpsilon/RNGkEpsilon.C (89%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/RNGkEpsilon/RNGkEpsilon.H (94%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/SSG/SSG.C (91%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/SSG/SSG.H (94%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/SpalartAllmaras/SpalartAllmaras.C (82%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/SpalartAllmaras/SpalartAllmaras.H (94%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C (94%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C (94%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/kEpsilon/kEpsilon.C (89%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/kEpsilon/kEpsilon.H (94%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/kOmega/kOmega.C (88%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/kOmega/kOmega.H (93%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/kOmegaSST/kOmegaSST.C (91%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/kOmegaSST/kOmegaSST.H (88%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/kOmegaSSTLM/kOmegaSSTLM.C (89%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/kOmegaSSTLM/kOmegaSSTLM.H (96%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C (92%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H (94%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/realizableKE/realizableKE.C (87%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/realizableKE/realizableKE.H (94%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/v2f/v2f.C (92%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/v2f/v2f.H (95%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/v2f/v2fBase.C (95%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/RAS/v2f/v2fBase.H (97%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/ReynoldsStress/ReynoldsStress.C (80%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/ReynoldsStress/ReynoldsStress.H (88%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C (92%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C (94%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFieldFwd.H (96%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C (95%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H (97%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C (94%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C (94%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C (97%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C (96%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H (96%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C (92%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C (94%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H (99%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C (87%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C (91%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C (86%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C (97%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H (97%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C (95%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H (99%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C (89%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C (95%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H (97%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C (93%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/eddyViscosity/eddyViscosity.C (80%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/eddyViscosity/eddyViscosity.H (89%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/Giesekus/Giesekus.C (87%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/Giesekus/Giesekus.H (92%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/Maxwell/Maxwell.C (89%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/Maxwell/Maxwell.H (89%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/PTT/PTT.C (88%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/PTT/PTT.H (92%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/Stokes/Stokes.C (75%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/Stokes/Stokes.H (89%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/generalizedNewtonian/generalizedNewtonian.C (76%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/generalizedNewtonian/generalizedNewtonian.H (91%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/BirdCarreau/BirdCarreau.C (97%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/BirdCarreau/BirdCarreau.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/Casson/Casson.C (97%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/Casson/Casson.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/CrossPowerLaw/CrossPowerLaw.C (97%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/CrossPowerLaw/CrossPowerLaw.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/HerschelBulkley/HerschelBulkley.C (97%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/HerschelBulkley/HerschelBulkley.H (97%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModel.C (96%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModel.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModelNew.C (96%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/powerLaw/powerLaw.C (97%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/powerLaw/powerLaw.H (97%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/strainRateFunction/strainRateFunction.C (97%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/strainRateFunction/strainRateFunction.H (98%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/laminarModel/laminarModel.C (77%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/laminar/laminarModel/laminarModel.H (91%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/linearViscousStress/linearViscousStress.C (74%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/linearViscousStress/linearViscousStress.H (86%) rename src/{TurbulenceModels/turbulenceModels/makeTurbulenceModel.H => MomentumTransportModels/momentumTransportModels/makeMomentumTransportModel.H} (93%) rename src/{TurbulenceModels/turbulenceModels/turbulenceModel.C => MomentumTransportModels/momentumTransportModels/momentumTransportModel.C} (88%) rename src/{TurbulenceModels/turbulenceModels/turbulenceModel.H => MomentumTransportModels/momentumTransportModels/momentumTransportModel.H} (91%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/nonlinearEddyViscosity/nonlinearEddyViscosity.C (73%) rename src/{TurbulenceModels/turbulenceModels => MomentumTransportModels/momentumTransportModels}/nonlinearEddyViscosity/nonlinearEddyViscosity.H (84%) rename src/{TurbulenceModels => MomentumTransportModels}/phaseCompressible/LES/Niceno/NicenoKEqn.C (75%) rename src/{TurbulenceModels => MomentumTransportModels}/phaseCompressible/LES/Niceno/NicenoKEqn.H (88%) rename src/{TurbulenceModels => MomentumTransportModels}/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C (77%) rename src/{TurbulenceModels => MomentumTransportModels}/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H (87%) rename src/{TurbulenceModels => MomentumTransportModels}/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C (79%) rename src/{TurbulenceModels => MomentumTransportModels}/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H (90%) rename src/{TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C => MomentumTransportModels/phaseCompressible/PhaseCompressibleMomentumTransportModel/PhaseCompressibleMomentumTransportModel.C} (80%) rename src/{TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H => MomentumTransportModels/phaseCompressible/PhaseCompressibleMomentumTransportModel/PhaseCompressibleMomentumTransportModel.H} (86%) rename src/{TurbulenceModels => MomentumTransportModels}/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C (73%) rename src/{TurbulenceModels => MomentumTransportModels}/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H (89%) rename src/{TurbulenceModels => MomentumTransportModels}/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C (78%) rename src/{TurbulenceModels => MomentumTransportModels}/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H (89%) rename src/{TurbulenceModels => MomentumTransportModels}/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C (86%) rename src/{TurbulenceModels => MomentumTransportModels}/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H (95%) rename src/{TurbulenceModels => MomentumTransportModels}/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C (84%) rename src/{TurbulenceModels => MomentumTransportModels}/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H (93%) rename src/{TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C => MomentumTransportModels/phaseIncompressible/PhaseIncompressibleMomentumTransportModel/PhaseIncompressibleMomentumTransportModel.C} (74%) rename src/{TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H => MomentumTransportModels/phaseIncompressible/PhaseIncompressibleMomentumTransportModel/PhaseIncompressibleMomentumTransportModel.H} (77%) create mode 100644 src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1.H create mode 100644 src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1Templates.C delete mode 100644 src/TurbulenceModels/compressible/Make/files delete mode 100644 src/TurbulenceModels/incompressible/Make/files delete mode 100644 src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.C delete mode 100644 src/functionObjects/lagrangian/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.H rename src/regionModels/surfaceFilmModels/submodels/kinematic/{filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.C => filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.C} (81%) rename src/regionModels/surfaceFilmModels/submodels/kinematic/{filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModel.H => filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModel.H} (82%) rename src/regionModels/surfaceFilmModels/submodels/kinematic/{filmTurbulenceModel/filmTurbulenceModel/filmTurbulenceModelNew.C => filmMomentumTransportModel/filmMomentumTransportModel/filmMomentumTransportModelNew.C} (81%) rename src/regionModels/surfaceFilmModels/submodels/kinematic/{filmTurbulenceModel => filmMomentumTransportModel}/laminar/laminar.C (96%) rename src/regionModels/surfaceFilmModels/submodels/kinematic/{filmTurbulenceModel => filmMomentumTransportModel}/laminar/laminar.H (97%) rename src/transportModels/{incompressible => }/Make/files (89%) rename src/transportModels/{compressible => }/Make/options (100%) delete mode 100644 src/transportModels/compressible/Make/files delete mode 100644 src/transportModels/compressible/compressibleTransportModel/compressibleTransportModel.C delete mode 100644 src/transportModels/compressible/compressibleTransportModel/compressibleTransportModel.H delete mode 100644 src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options delete mode 100644 src/transportModels/interfaceProperties/Make/options rename src/transportModels/{incompressible => }/singlePhaseTransportModel/singlePhaseTransportModel.C (97%) rename src/transportModels/{incompressible => }/singlePhaseTransportModel/singlePhaseTransportModel.H (96%) rename src/transportModels/{incompressible => }/transportModel/transportModel.C (96%) rename src/transportModels/{incompressible => }/transportModel/transportModel.H (97%) rename src/transportModels/{incompressible => }/viscosityModels/BirdCarreau/BirdCarreau.C (98%) rename src/transportModels/{incompressible => }/viscosityModels/BirdCarreau/BirdCarreau.H (98%) rename src/transportModels/{incompressible => }/viscosityModels/Casson/Casson.C (98%) rename src/transportModels/{incompressible => }/viscosityModels/Casson/Casson.H (98%) rename src/transportModels/{incompressible => }/viscosityModels/CrossPowerLaw/CrossPowerLaw.C (98%) rename src/transportModels/{incompressible => }/viscosityModels/CrossPowerLaw/CrossPowerLaw.H (98%) rename src/transportModels/{incompressible => }/viscosityModels/HerschelBulkley/HerschelBulkley.C (98%) rename src/transportModels/{incompressible => }/viscosityModels/HerschelBulkley/HerschelBulkley.H (98%) rename src/transportModels/{incompressible => }/viscosityModels/Newtonian/Newtonian.C (97%) rename src/transportModels/{incompressible => }/viscosityModels/Newtonian/Newtonian.H (97%) rename src/transportModels/{incompressible => }/viscosityModels/powerLaw/powerLaw.C (98%) rename src/transportModels/{incompressible => }/viscosityModels/powerLaw/powerLaw.H (98%) rename src/transportModels/{incompressible => }/viscosityModels/strainRateFunction/strainRateFunction.C (98%) rename src/transportModels/{incompressible => }/viscosityModels/strainRateFunction/strainRateFunction.H (98%) rename src/transportModels/{incompressible => }/viscosityModels/viscosityModel/viscosityModel.C (97%) rename src/transportModels/{incompressible => }/viscosityModels/viscosityModel/viscosityModel.H (98%) rename src/transportModels/{incompressible => }/viscosityModels/viscosityModel/viscosityModelNew.C (97%) rename src/{transportModels => twoPhaseModels}/Allwmake (86%) rename src/{transportModels => twoPhaseModels}/immiscibleIncompressibleTwoPhaseMixture/Make/files (100%) create mode 100644 src/twoPhaseModels/immiscibleIncompressibleTwoPhaseMixture/Make/options rename src/{transportModels => twoPhaseModels}/immiscibleIncompressibleTwoPhaseMixture/immiscibleIncompressibleTwoPhaseMixture.C (96%) rename src/{transportModels => twoPhaseModels}/immiscibleIncompressibleTwoPhaseMixture/immiscibleIncompressibleTwoPhaseMixture.H (97%) create mode 100644 src/twoPhaseModels/incompressibleTwoPhaseMixture/Make/files rename src/{transportModels/incompressible => twoPhaseModels/incompressibleTwoPhaseMixture}/Make/options (58%) rename src/{transportModels/incompressible => twoPhaseModels}/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C (98%) rename src/{transportModels/incompressible => twoPhaseModels}/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.H (95%) rename src/{transportModels => twoPhaseModels}/interfaceProperties/Make/files (100%) create mode 100644 src/twoPhaseModels/interfaceProperties/Make/options rename src/{transportModels => twoPhaseModels}/interfaceProperties/interfaceCompression/interfaceCompression.C (95%) rename src/{transportModels => twoPhaseModels}/interfaceProperties/interfaceCompression/interfaceCompression.H (97%) rename src/{transportModels => twoPhaseModels}/interfaceProperties/interfaceProperties.C (100%) rename src/{transportModels => twoPhaseModels}/interfaceProperties/interfaceProperties.H (100%) rename src/{transportModels => twoPhaseModels}/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C (97%) rename src/{transportModels => twoPhaseModels}/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.H (97%) rename src/{transportModels => twoPhaseModels}/interfaceProperties/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C (97%) rename src/{transportModels => twoPhaseModels}/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C (97%) rename src/{transportModels => twoPhaseModels}/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H (98%) rename src/{transportModels => twoPhaseModels}/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C (98%) rename src/{transportModels => twoPhaseModels}/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.H (98%) rename src/{transportModels => twoPhaseModels}/twoPhaseMixture/Make/files (100%) rename src/{transportModels => twoPhaseModels}/twoPhaseMixture/Make/options (100%) rename {applications/solvers/multiphase => src/twoPhaseModels/twoPhaseMixture}/VoF/alphaCourantNo.H (96%) rename {applications/solvers/multiphase => src/twoPhaseModels/twoPhaseMixture}/VoF/alphaEqn.H (100%) rename {applications/solvers/multiphase => src/twoPhaseModels/twoPhaseMixture}/VoF/alphaEqnSubCycle.H (100%) rename {applications/solvers/multiphase => src/twoPhaseModels/twoPhaseMixture}/VoF/createAlphaFluxes.H (100%) rename {applications/solvers/multiphase => src/twoPhaseModels/twoPhaseMixture}/VoF/setDeltaT.H (96%) rename {applications/solvers/multiphase => src/twoPhaseModels/twoPhaseMixture}/VoF/setRDeltaT.H (100%) rename src/{transportModels => twoPhaseModels}/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.C (96%) rename src/{transportModels => twoPhaseModels}/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.H (97%) rename src/{transportModels => twoPhaseModels}/twoPhaseProperties/Make/files (100%) rename src/{transportModels => twoPhaseModels}/twoPhaseProperties/Make/options (52%) rename src/{transportModels => twoPhaseModels}/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C (98%) rename src/{transportModels => twoPhaseModels}/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H (98%) rename src/{transportModels => twoPhaseModels}/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C (98%) rename src/{transportModels => twoPhaseModels}/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H (98%) rename src/{transportModels => twoPhaseModels}/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C (98%) rename src/{transportModels => twoPhaseModels}/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.H (99%) rename src/{transportModels => twoPhaseModels}/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C (98%) rename src/{transportModels => twoPhaseModels}/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H (98%) rename src/{transportModels => twoPhaseModels}/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C (98%) rename src/{transportModels => twoPhaseModels}/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.H (98%) rename src/{transportModels => twoPhaseModels}/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C (98%) rename src/{transportModels => twoPhaseModels}/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.H (98%) diff --git a/applications/solvers/combustion/PDRFoam/Make/options b/applications/solvers/combustion/PDRFoam/Make/options index f2c0ad276d..c7b13c6874 100644 --- a/applications/solvers/combustion/PDRFoam/Make/options +++ b/applications/solvers/combustion/PDRFoam/Make/options @@ -21,11 +21,10 @@ EXE_INC = \ -IlaminarFlameSpeed/SCOPE \ -I$(LIB_SRC)/engine/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -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)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -37,12 +36,11 @@ EXE_INC = \ EXE_LIBS = \ -lengine \ -lmeshTools \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ -lspecie \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ -llaminarFlameSpeedModels \ -lfiniteVolume \ diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C index 81c9d82eb6..23103e41bd 100644 --- a/applications/solvers/combustion/PDRFoam/PDRFoam.C +++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C @@ -69,7 +69,7 @@ Description #include "fvCFD.H" #include "psiuReactionThermo.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "fluidThermoTransportModel.H" #include "laminarFlameSpeed.H" #include "XiModel.H" diff --git a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C index d11054336b..1b5d7bb527 100644 --- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C +++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.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 @@ -58,7 +58,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "psiuReactionThermo.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "laminarFlameSpeed.H" #include "XiModel.H" #include "PDRDragModel.H" diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H index 2302b96e43..566287d832 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.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 @@ -38,7 +38,7 @@ SourceFiles #include "IOdictionary.H" #include "psiuReactionThermo.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "multivariateSurfaceInterpolationScheme.H" #include "runTimeSelectionTables.H" diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C index f78265570b..113fcdccb7 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 a9ef9927bf..16033788e5 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H @@ -61,7 +61,7 @@ SourceFiles #define compressible_PDRkEpsilon_H #include "kEpsilon.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -78,7 +78,7 @@ namespace RASModels class PDRkEpsilon : - public Foam::RASModels::kEpsilon + public Foam::RASModels::kEpsilon { // Private Data diff --git a/applications/solvers/combustion/PDRFoam/UEqn.H b/applications/solvers/combustion/PDRFoam/UEqn.H index 983e020cab..ba46f823b3 100644 --- a/applications/solvers/combustion/PDRFoam/UEqn.H +++ b/applications/solvers/combustion/PDRFoam/UEqn.H @@ -4,7 +4,7 @@ ( betav*fvm::ddt(rho, U) + fvm::div(phi, U) + MRF.DDt(rho, U) - + turbulence->divDevRhoReff(U) + + turbulence->divDevTau(U) == betav*rho*g + betav*fvOptions(rho, U) diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H index 1522e02af1..12b7e3d535 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.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 @@ -43,7 +43,7 @@ SourceFiles #include "IOdictionary.H" #include "psiuReactionThermo.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H index 0fb6e35dfe..017d2a06c4 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.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 @@ -40,7 +40,7 @@ SourceFiles #include "IOdictionary.H" #include "psiuReactionThermo.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H index 0d0e6bade7..7bb30ca018 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.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 @@ -92,7 +92,7 @@ SourceFiles #include "IOdictionary.H" #include "psiuReactionThermo.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "multivariateSurfaceInterpolationScheme.H" #include "fvcDiv.H" #include "runTimeSelectionTables.H" diff --git a/applications/solvers/combustion/XiFoam/Make/options b/applications/solvers/combustion/XiFoam/Make/options index b5f2862825..92f6e1d556 100644 --- a/applications/solvers/combustion/XiFoam/Make/options +++ b/applications/solvers/combustion/XiFoam/Make/options @@ -1,11 +1,10 @@ EXE_INC = \ -I$(LIB_SRC)/engine/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -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)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -14,10 +13,9 @@ EXE_INC = \ EXE_LIBS = \ -lengine \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ -lspecie \ diff --git a/applications/solvers/combustion/XiFoam/UEqn.H b/applications/solvers/combustion/XiFoam/UEqn.H index 59e51b370b..209e3e16f4 100644 --- a/applications/solvers/combustion/XiFoam/UEqn.H +++ b/applications/solvers/combustion/XiFoam/UEqn.H @@ -4,7 +4,7 @@ ( fvm::ddt(rho, U) + fvm::div(phi, U) + MRF.DDt(rho, U) - + turbulence->divDevRhoReff(U) + + turbulence->divDevTau(U) == fvOptions(rho, U) ); diff --git a/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options b/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options index 5342f80a5d..f552a3460d 100644 --- a/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options +++ b/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options @@ -5,11 +5,10 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/engine/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -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)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude @@ -19,10 +18,9 @@ EXE_LIBS = \ -lsampling \ -lmeshTools \ -lengine \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ -lspecie \ diff --git a/applications/solvers/combustion/XiFoam/XiEngineFoam/UEqn.H b/applications/solvers/combustion/XiFoam/XiEngineFoam/UEqn.H index d35e71101c..f88d70be09 100644 --- a/applications/solvers/combustion/XiFoam/XiEngineFoam/UEqn.H +++ b/applications/solvers/combustion/XiFoam/XiEngineFoam/UEqn.H @@ -2,7 +2,7 @@ ( fvm::ddt(rho, U) + fvm::div(phi, U) - + turbulence->divDevRhoReff(U) + + turbulence->divDevTau(U) == fvOptions(rho, U) ); diff --git a/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C b/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C index a2413c8424..c0022c4096 100644 --- a/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C +++ b/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C @@ -52,7 +52,7 @@ Description #include "engineTime.H" #include "engineMesh.H" #include "psiuReactionThermo.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "fluidThermoTransportModel.H" #include "laminarFlameSpeed.H" #include "ignition.H" diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C index 151e365be6..b9cb0557ea 100644 --- a/applications/solvers/combustion/XiFoam/XiFoam.C +++ b/applications/solvers/combustion/XiFoam/XiFoam.C @@ -51,7 +51,7 @@ Description #include "fvCFD.H" #include "psiuReactionThermo.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "fluidThermoTransportModel.H" #include "laminarFlameSpeed.H" #include "ignition.H" diff --git a/applications/solvers/combustion/XiFoam/createFields.H b/applications/solvers/combustion/XiFoam/createFields.H index 2d33788db9..2eeb4a06be 100644 --- a/applications/solvers/combustion/XiFoam/createFields.H +++ b/applications/solvers/combustion/XiFoam/createFields.H @@ -47,9 +47,9 @@ volVectorField U mesh.setFluxRequired(p.name()); Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence +autoPtr turbulence ( - compressible::turbulenceModel::New + compressible::momentumTransportModel::New ( rho, U, diff --git a/applications/solvers/combustion/chemFoam/Make/options b/applications/solvers/combustion/chemFoam/Make/options index 176ec9fd9c..dd3d4a534a 100644 --- a/applications/solvers/combustion/chemFoam/Make/options +++ b/applications/solvers/combustion/chemFoam/Make/options @@ -2,7 +2,6 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude\ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ diff --git a/applications/solvers/combustion/coldEngineFoam/Make/options b/applications/solvers/combustion/coldEngineFoam/Make/options index 65841b342c..a259fa4d3f 100644 --- a/applications/solvers/combustion/coldEngineFoam/Make/options +++ b/applications/solvers/combustion/coldEngineFoam/Make/options @@ -5,11 +5,10 @@ EXE_INC = \ -I../../compressible/rhoPimpleFoam \ -I$(LIB_SRC)/engine/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -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)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ @@ -17,10 +16,9 @@ EXE_INC = \ EXE_LIBS = \ -lengine \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ -lspecie \ -lfiniteVolume \ diff --git a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C index 55a4f2084c..ef6d09d2bb 100644 --- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C +++ b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C @@ -33,7 +33,7 @@ Description #include "engineTime.H" #include "engineMesh.H" #include "psiThermo.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "fluidThermoTransportModel.H" #include "OFstream.H" #include "fvOptions.H" diff --git a/applications/solvers/combustion/coldEngineFoam/createFields.H b/applications/solvers/combustion/coldEngineFoam/createFields.H index 1e363eb350..774601d6bf 100644 --- a/applications/solvers/combustion/coldEngineFoam/createFields.H +++ b/applications/solvers/combustion/coldEngineFoam/createFields.H @@ -40,9 +40,9 @@ volVectorField U Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence +autoPtr turbulence ( - compressible::turbulenceModel::New + compressible::momentumTransportModel::New ( rho, U, diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options index 2613ac02db..99c5621770 100644 --- a/applications/solvers/combustion/fireFoam/Make/options +++ b/applications/solvers/combustion/fireFoam/Make/options @@ -2,12 +2,11 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/combustionModels/lnInclude \ @@ -26,11 +25,10 @@ EXE_LIBS = \ -lfvOptions \ -lmeshTools \ -lsampling \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ -lspecie \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ -lSLGThermo \ diff --git a/applications/solvers/combustion/fireFoam/UEqn.H b/applications/solvers/combustion/fireFoam/UEqn.H index 0bb6ff7240..f6a9d58ef9 100644 --- a/applications/solvers/combustion/fireFoam/UEqn.H +++ b/applications/solvers/combustion/fireFoam/UEqn.H @@ -4,7 +4,7 @@ ( fvm::ddt(rho, U) + fvm::div(phi, U) + MRF.DDt(rho, U) - + turbulence->divDevRhoReff(U) + + turbulence->divDevTau(U) == parcels.SU(U) + fvOptions(rho, U) diff --git a/applications/solvers/combustion/fireFoam/createFields.H b/applications/solvers/combustion/fireFoam/createFields.H index b7388084e5..e1ced9636f 100644 --- a/applications/solvers/combustion/fireFoam/createFields.H +++ b/applications/solvers/combustion/fireFoam/createFields.H @@ -53,9 +53,9 @@ volVectorField U Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence +autoPtr turbulence ( - compressible::turbulenceModel::New + compressible::momentumTransportModel::New ( rho, U, diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C index 20fa4f4620..d078c045a5 100644 --- a/applications/solvers/combustion/fireFoam/fireFoam.C +++ b/applications/solvers/combustion/fireFoam/fireFoam.C @@ -31,7 +31,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "fluidThermoTransportModel.H" #include "basicReactingCloud.H" #include "surfaceFilmModel.H" diff --git a/applications/solvers/combustion/reactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/Make/options index dff0ef8489..abfa4daab3 100644 --- a/applications/solvers/combustion/reactingFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/Make/options @@ -2,12 +2,11 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ @@ -18,12 +17,11 @@ EXE_LIBS = \ -lfvOptions \ -lmeshTools \ -lsampling \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ -lreactionThermophysicalModels \ -lspecie \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lchemistryModel \ -lODE \ diff --git a/applications/solvers/combustion/reactingFoam/UEqn.H b/applications/solvers/combustion/reactingFoam/UEqn.H index e4caa1cea4..7039a5ab77 100644 --- a/applications/solvers/combustion/reactingFoam/UEqn.H +++ b/applications/solvers/combustion/reactingFoam/UEqn.H @@ -6,7 +6,7 @@ tmp tUEqn ( fvm::ddt(rho, U) + fvm::div(phi, U) + MRF.DDt(rho, U) - + turbulence->divDevRhoReff(U) + + turbulence->divDevTau(U) == fvOptions(rho, U) ); diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H index f4c814cf0a..e65bb02c21 100644 --- a/applications/solvers/combustion/reactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/createFields.H @@ -50,9 +50,9 @@ pressureControl pressureControl(p, rho, pimple.dict(), false); mesh.setFluxRequired(p.name()); Info << "Creating turbulence model.\n" << nl; -autoPtr turbulence +autoPtr turbulence ( - compressible::turbulenceModel::New + compressible::momentumTransportModel::New ( rho, U, diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C index c566be7f9a..b49d4ffaeb 100644 --- a/applications/solvers/combustion/reactingFoam/reactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C @@ -30,7 +30,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "fluidThermoTransportModel.H" #include "psiReactionThermo.H" #include "CombustionModel.H" diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options index 2bb23a9d78..e9e306e8b1 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options @@ -5,12 +5,11 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ @@ -22,12 +21,11 @@ EXE_LIBS = \ -lfvOptions \ -lmeshTools \ -lsampling \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ -lreactionThermophysicalModels \ -lspecie \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lchemistryModel \ -lODE \ diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/UEqn.H b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/UEqn.H index e6bb14c76b..f32d532b2b 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/UEqn.H +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/UEqn.H @@ -4,7 +4,7 @@ ( fvm::ddt(rho, U) + fvm::div(phi, U) + MRF.DDt(rho, U) - + turbulence->divDevRhoReff(U) + + turbulence->divDevTau(U) == fvOptions(rho, U) ); diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H index 7b314c29cd..d856535c14 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H @@ -51,9 +51,9 @@ volScalarField& p = thermo.p(); mesh.setFluxRequired(p.name()); Info << "Creating turbulence model.\n" << nl; -autoPtr turbulence +autoPtr turbulence ( - compressible::turbulenceModel::New + compressible::momentumTransportModel::New ( rho, U, diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C index 0da388e640..1a4dda4633 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C @@ -33,7 +33,7 @@ Description #include "fvCFD.H" #include "rhoReactionThermo.H" #include "CombustionModel.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "fluidThermoTransportModel.H" #include "multivariateScheme.H" #include "pimpleControl.H" diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options index 7ee0625fd5..36f5f4de78 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options @@ -1,12 +1,11 @@ EXE_INC = \ -I. \ -I$(FOAM_SOLVERS)/combustion/reactingFoam \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ @@ -18,15 +17,14 @@ EXE_INC = \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude EXE_LIBS = \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lchemistryModel \ -lODE \ -lcombustionModels \ -lreactionThermophysicalModels \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ -lfiniteVolume \ -ldynamicFvMesh \ diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H index 7c30133652..7540a8c60d 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H @@ -53,9 +53,9 @@ mesh.setFluxRequired(p.name()); Info << "Creating turbulence model.\n" << nl; -autoPtr turbulence +autoPtr turbulence ( - compressible::turbulenceModel::New + compressible::momentumTransportModel::New ( rho, U, diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C index 47337cd19a..ce1e03b70c 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C @@ -34,7 +34,7 @@ Description #include "dynamicFvMesh.H" #include "rhoReactionThermo.H" #include "CombustionModel.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "fluidThermoTransportModel.H" #include "multivariateScheme.H" #include "pimpleControl.H" diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options b/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options index 98566f524c..6870682cf2 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options @@ -1,12 +1,10 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude LIB_LIBS = \ -lfiniteVolume \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie diff --git a/applications/solvers/compressible/rhoCentralFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/Make/options index 46c7be115f..8f4f1f25f0 100644 --- a/applications/solvers/compressible/rhoCentralFoam/Make/options +++ b/applications/solvers/compressible/rhoCentralFoam/Make/options @@ -1,11 +1,10 @@ EXE_INC = \ -IBCs/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -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)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude @@ -13,12 +12,11 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ -lfvOptions \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lrhoCentralFoam \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ -ldynamicFvMesh \ -ltopoChangerFvMesh \ diff --git a/applications/solvers/compressible/rhoCentralFoam/createFields.H b/applications/solvers/compressible/rhoCentralFoam/createFields.H index 24f0baf463..584967b8e2 100644 --- a/applications/solvers/compressible/rhoCentralFoam/createFields.H +++ b/applications/solvers/compressible/rhoCentralFoam/createFields.H @@ -90,9 +90,9 @@ surfaceScalarField neg surfaceScalarField phi("phi", fvc::flux(rhoU)); Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence +autoPtr turbulence ( - compressible::turbulenceModel::New + compressible::momentumTransportModel::New ( rho, U, diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C index 9736977ad0..e045ae3691 100644 --- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C +++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C @@ -33,7 +33,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "psiThermo.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "fluidThermoTransportModel.H" #include "fixedRhoFvPatchScalarField.H" #include "directionInterpolate.H" diff --git a/applications/solvers/compressible/rhoPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/Make/options index c7edbe2842..a627ee1fc4 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoPimpleFoam/Make/options @@ -1,8 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -11,11 +10,10 @@ EXE_INC = \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude EXE_LIBS = \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ -lfiniteVolume \ -ldynamicFvMesh \ diff --git a/applications/solvers/compressible/rhoPimpleFoam/UEqn.H b/applications/solvers/compressible/rhoPimpleFoam/UEqn.H index e4caa1cea4..7039a5ab77 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/UEqn.H +++ b/applications/solvers/compressible/rhoPimpleFoam/UEqn.H @@ -6,7 +6,7 @@ tmp tUEqn ( fvm::ddt(rho, U) + fvm::div(phi, U) + MRF.DDt(rho, U) - + turbulence->divDevRhoReff(U) + + turbulence->divDevTau(U) == fvOptions(rho, U) ); diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H index f3ea79a0e2..42d09b67c3 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H +++ b/applications/solvers/compressible/rhoPimpleFoam/createFields.H @@ -51,9 +51,9 @@ pressureControl pressureControl mesh.setFluxRequired(p.name()); Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence +autoPtr turbulence ( - compressible::turbulenceModel::New + compressible::momentumTransportModel::New ( rho, U, diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C index c893c4b6c9..226ab6ab6a 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C @@ -36,7 +36,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "fluidThermo.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "fluidThermoTransportModel.H" #include "pimpleControl.H" #include "pressureControl.H" diff --git a/applications/solvers/compressible/rhoSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/Make/options index 004a38ed50..d81a7e2c19 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoSimpleFoam/Make/options @@ -1,8 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -10,11 +9,10 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ EXE_LIBS = \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ -lfiniteVolume \ -lsampling \ diff --git a/applications/solvers/compressible/rhoSimpleFoam/UEqn.H b/applications/solvers/compressible/rhoSimpleFoam/UEqn.H index a6f410250b..29d8bd22ae 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/UEqn.H +++ b/applications/solvers/compressible/rhoSimpleFoam/UEqn.H @@ -6,7 +6,7 @@ ( fvm::div(phi, U) + MRF.DDt(rho, U) - + turbulence->divDevRhoReff(U) + + turbulence->divDevTau(U) == fvOptions(rho, U) ); diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H index e3472bb586..7fd0b9af81 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/createFields.H +++ b/applications/solvers/compressible/rhoSimpleFoam/createFields.H @@ -49,9 +49,9 @@ pressureControl pressureControl mesh.setFluxRequired(p.name()); Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence +autoPtr turbulence ( - compressible::turbulenceModel::New + compressible::momentumTransportModel::New ( rho, U, diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options index e32cb2c002..5da5515fa5 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options @@ -1,10 +1,9 @@ EXE_INC = \ -I. \ -I.. \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -12,11 +11,10 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ EXE_LIBS = \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ -lfiniteVolume \ -lsampling \ diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H index 3ec153c567..1ed6504ce0 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H @@ -6,7 +6,7 @@ ( fvm::div(phi, U) + MRF.DDt(rho, U) - + turbulence->divDevRhoReff(U) + + turbulence->divDevTau(U) == fvOptions(rho, U) ); diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C index 4fd16544f5..5bdc943751 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "fluidThermo.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "fluidThermoTransportModel.H" #include "simpleControl.H" #include "pressureControl.H" diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C index 9de062c334..dd5285a9b9 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C @@ -31,7 +31,7 @@ Description #include "fvCFD.H" #include "fluidThermo.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "fluidThermoTransportModel.H" #include "simpleControl.H" #include "pressureControl.H" diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options index a2b47826d5..e700dfad60 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options @@ -1,11 +1,10 @@ EXE_INC = \ -I. \ -I../../compressible/rhoPimpleFoam \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/radiationModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -14,12 +13,11 @@ EXE_INC = \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude EXE_LIBS = \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lradiationModels \ -lspecie \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ -lfiniteVolume \ -ldynamicFvMesh \ diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H index 832094b597..e0828d35d4 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H @@ -6,7 +6,7 @@ ( fvm::ddt(rho, U) + fvm::div(phi, U) + MRF.DDt(rho, U) - + turbulence->divDevRhoReff(U) + + turbulence->divDevTau(U) == fvOptions(rho, U) ); diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C index 16e4ece23c..150d7cc84e 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C @@ -37,7 +37,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "fluidThermo.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "fluidThermoTransportModel.H" #include "radiationModel.H" #include "pimpleControl.H" diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H index 1fe7a15ef4..f5bb52cc5d 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H @@ -41,9 +41,9 @@ volVectorField U #include "compressibleCreatePhi.H" Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence +autoPtr turbulence ( - compressible::turbulenceModel::New + compressible::momentumTransportModel::New ( rho, U, diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options index 7ef5940fdf..7d47cb682e 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options @@ -3,11 +3,10 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/radiationModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude EXE_LIBS = \ @@ -15,11 +14,10 @@ EXE_LIBS = \ -lfvOptions \ -lsampling \ -lmeshTools \ - -lcompressibleTransportModels \ -lthermophysicalTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lradiationModels \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lmeshTools diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H index 1a47d06a8e..5aa5f36465 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H @@ -6,7 +6,7 @@ ( fvm::div(phi, U) + MRF.DDt(rho, U) - + turbulence->divDevRhoReff(U) + + turbulence->divDevTau(U) == fvOptions(rho, U) ); diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C index d3044206bf..c7cf474c57 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "rhoThermo.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "fluidThermoTransportModel.H" #include "radiationModel.H" #include "simpleControl.H" diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H index 18f9006e3c..d20541feee 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H @@ -36,9 +36,9 @@ volVectorField U #include "compressibleCreatePhi.H" Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence +autoPtr turbulence ( - compressible::turbulenceModel::New + compressible::momentumTransportModel::New ( rho, U, diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options index 16a5ccd245..48a84f5ba4 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options @@ -9,7 +9,6 @@ EXE_INC = \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/cfdTools \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ @@ -17,15 +16,14 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ -I$(LIB_SRC)/combustionModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/radiationModels/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude EXE_LIBS = \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lreactionThermophysicalModels \ @@ -33,8 +31,8 @@ EXE_LIBS = \ -lchemistryModel \ -lODE \ -lcombustionModels \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ -lmeshTools \ -lfiniteVolume \ diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C index 2ff553a0a2..a52c09db08 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C @@ -32,7 +32,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "fluidThermoTransportModel.H" #include "rhoReactionThermo.H" #include "CombustionModel.H" diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H index e7eea337d0..6bee113c22 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H @@ -6,7 +6,7 @@ ( fvm::ddt(rho, U) + fvm::div(phi, U) + MRF.DDt(rho, U) - + turbulence.divDevRhoReff(U) + + turbulence.divDevTau(U) == fvOptions(rho, U) ); diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H index 455693a9df..9439cf3cae 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H @@ -7,7 +7,8 @@ PtrList gFluid(fluidRegions.size()); PtrList hRefFluid(fluidRegions.size()); PtrList ghFluid(fluidRegions.size()); PtrList ghfFluid(fluidRegions.size()); -PtrList turbulenceFluid(fluidRegions.size()); +PtrList + turbulenceFluid(fluidRegions.size()); PtrList thermophysicalTransportFluid(fluidRegions.size()); PtrList> reactionFluid(fluidRegions.size()); @@ -150,7 +151,7 @@ forAll(fluidRegions, i) turbulenceFluid.set ( i, - compressible::turbulenceModel::New + compressible::momentumTransportModel::New ( rhoFluid[i], UFluid[i], diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H index aace459f6f..aa357e84fc 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H @@ -27,7 +27,7 @@ volVectorField& U = UFluid[i]; surfaceScalarField& phi = phiFluid[i]; - compressible::turbulenceModel& turbulence = turbulenceFluid[i]; + compressible::momentumTransportModel& turbulence = turbulenceFluid[i]; compressible::thermophysicalTransportModel& thermophysicalTransport = thermophysicalTransportFluid[i]; diff --git a/applications/solvers/heatTransfer/thermoFoam/Make/options b/applications/solvers/heatTransfer/thermoFoam/Make/options index 5bd67fa2fb..b5680954d6 100644 --- a/applications/solvers/heatTransfer/thermoFoam/Make/options +++ b/applications/solvers/heatTransfer/thermoFoam/Make/options @@ -2,11 +2,10 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/radiationModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude EXE_LIBS = \ @@ -14,10 +13,9 @@ EXE_LIBS = \ -lsampling \ -lmeshTools \ -lfvOptions \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lradiationModels \ -lspecie \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels diff --git a/applications/solvers/heatTransfer/thermoFoam/createFields.H b/applications/solvers/heatTransfer/thermoFoam/createFields.H index a0bd5bce42..e0bd9354b2 100644 --- a/applications/solvers/heatTransfer/thermoFoam/createFields.H +++ b/applications/solvers/heatTransfer/thermoFoam/createFields.H @@ -36,9 +36,9 @@ volVectorField U #include "compressibleCreatePhi.H" Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence +autoPtr turbulence ( - compressible::turbulenceModel::New + compressible::momentumTransportModel::New ( rho, U, diff --git a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C index 9fd9ed2256..f3f5f7366d 100644 --- a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C +++ b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C @@ -31,7 +31,7 @@ Description #include "fvCFD.H" #include "rhoThermo.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "fluidThermoTransportModel.H" #include "LESModel.H" #include "radiationModel.H" diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options b/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options index 4fcb4c7787..e5d4d35052 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options +++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options @@ -1,17 +1,16 @@ EXE_INC = \ -IadjointOutletPressure \ -IadjointOutletVelocity \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ EXE_LIBS = \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lincompressibleMomentumTransportModels \ -lincompressibleTransportModels \ -lfiniteVolume \ -lmeshTools \ diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C index 9bb5df4dc0..d99d100bb7 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C +++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.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 @@ -47,7 +47,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "simpleControl.H" #include "fvOptions.H" @@ -108,7 +108,7 @@ int main(int argc, char *argv[]) tmp tUEqn ( fvm::div(phi, U) - + turbulence->divDevReff(U) + + turbulence->divDevSigma(U) + fvm::Sp(alpha, U) == fvOptions(U) @@ -179,7 +179,7 @@ int main(int argc, char *argv[]) ( fvm::div(-phi, Ua) - adjointTransposeConvection - + turbulence->divDevReff(Ua) + + turbulence->divDevSigma(Ua) + fvm::Sp(alpha, Ua) == fvOptions(Ua) diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H index 1eef47af05..48a9dd2d49 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H +++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H @@ -80,9 +80,9 @@ mesh.setFluxRequired(pa.name()); singlePhaseTransportModel laminarTransport(U, phi); -autoPtr turbulence +autoPtr turbulence ( - incompressible::turbulenceModel::New(U, phi, laminarTransport) + incompressible::momentumTransportModel::New(U, phi, laminarTransport) ); diff --git a/applications/solvers/incompressible/boundaryFoam/Make/options b/applications/solvers/incompressible/boundaryFoam/Make/options index 9af500124c..3000f6bfe8 100644 --- a/applications/solvers/incompressible/boundaryFoam/Make/options +++ b/applications/solvers/incompressible/boundaryFoam/Make/options @@ -1,15 +1,14 @@ EXE_INC = \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lincompressibleMomentumTransportModels \ -lincompressibleTransportModels \ -lfiniteVolume \ -lmeshTools \ diff --git a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C index 4afafc2b91..ef4f352e0c 100644 --- a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C +++ b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.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 @@ -37,7 +37,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "fvOptions.H" #include "wallFvPatch.H" #include "makeGraph.H" @@ -65,7 +65,7 @@ int main(int argc, char *argv[]) { Info<< "Time = " << runTime.timeName() << nl << endl; - fvVectorMatrix divR(turbulence->divDevReff(U)); + fvVectorMatrix divR(turbulence->divDevSigma(U)); divR.source() = flowMask & divR.source(); fvVectorMatrix UEqn diff --git a/applications/solvers/incompressible/boundaryFoam/createFields.H b/applications/solvers/incompressible/boundaryFoam/createFields.H index fa8c08975f..ac94f6cb57 100644 --- a/applications/solvers/incompressible/boundaryFoam/createFields.H +++ b/applications/solvers/incompressible/boundaryFoam/createFields.H @@ -31,9 +31,9 @@ surfaceScalarField phi singlePhaseTransportModel laminarTransport(U, phi); -autoPtr turbulence +autoPtr turbulence ( - incompressible::turbulenceModel::New(U, phi, laminarTransport) + incompressible::momentumTransportModel::New(U, phi, laminarTransport) ); dimensionedVector Ubar("Ubar", dimVelocity, laminarTransport); diff --git a/applications/solvers/incompressible/boundaryFoam/evaluateNearWall.H b/applications/solvers/incompressible/boundaryFoam/evaluateNearWall.H index 9813bf8cd0..9edb251416 100644 --- a/applications/solvers/incompressible/boundaryFoam/evaluateNearWall.H +++ b/applications/solvers/incompressible/boundaryFoam/evaluateNearWall.H @@ -3,7 +3,7 @@ scalar nu = turbulence->nu()().boundaryField()[patchId][faceId]; scalar nut = turbulence->nut()().boundaryField()[patchId][faceId]; - symmTensor R = turbulence->devReff()().boundaryField()[patchId][faceId]; + symmTensor R = turbulence->devSigma()().boundaryField()[patchId][faceId]; scalar epsilon = turbulence->epsilon()()[cellId]; // scalar omega = turbulence->omega()()[cellId]; scalar k = turbulence->k()()[cellId]; diff --git a/applications/solvers/incompressible/boundaryFoam/makeGraphs.H b/applications/solvers/incompressible/boundaryFoam/makeGraphs.H index 2f24e8924b..2691a796fa 100644 --- a/applications/solvers/incompressible/boundaryFoam/makeGraphs.H +++ b/applications/solvers/incompressible/boundaryFoam/makeGraphs.H @@ -8,7 +8,7 @@ volSymmTensorField R IOobject::NO_READ, IOobject::AUTO_WRITE ), - turbulence->R() + turbulence->sigma() ); runTime.write(); diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/Make/options b/applications/solvers/incompressible/nonNewtonianIcoFoam/Make/options index a3c2426059..521ce3e3eb 100644 --- a/applications/solvers/incompressible/nonNewtonianIcoFoam/Make/options +++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/Make/options @@ -1,6 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude diff --git a/applications/solvers/incompressible/pimpleFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/Make/options index 14a5a2d924..c908f122ff 100644 --- a/applications/solvers/incompressible/pimpleFoam/Make/options +++ b/applications/solvers/incompressible/pimpleFoam/Make/options @@ -1,8 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ @@ -10,8 +9,8 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ EXE_LIBS = \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lincompressibleMomentumTransportModels \ -lincompressibleTransportModels \ -lfiniteVolume \ -lfvOptions \ diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options index 4c2a78fa5a..a699863f86 100644 --- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options +++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options @@ -1,17 +1,16 @@ EXE_INC = \ -I. \ -I.. \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lincompressibleMomentumTransportModels \ -lincompressibleTransportModels \ -lfiniteVolume \ -lmeshTools \ diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C index d245c2bb6a..06aa549a15 100644 --- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C +++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.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 @@ -34,7 +34,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "pimpleControl.H" #include "SRFModel.H" #include "fvOptions.H" diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/UrelEqn.H b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/UrelEqn.H index 0d55edd5a0..703ea9a65c 100644 --- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/UrelEqn.H +++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/UrelEqn.H @@ -3,7 +3,7 @@ ( fvm::ddt(Urel) + fvm::div(phi, Urel) - + turbulence->divDevReff(Urel) + + turbulence->divDevSigma(Urel) + SRF->Su() == fvOptions(Urel) diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H index b2ccf32cc8..a3eacbe0c8 100644 --- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H +++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H @@ -67,9 +67,9 @@ volVectorField U singlePhaseTransportModel laminarTransport(U, phi); -autoPtr turbulence +autoPtr turbulence ( - incompressible::turbulenceModel::New(U, phi, laminarTransport) + incompressible::momentumTransportModel::New(U, phi, laminarTransport) ); #include "createFvOptions.H" diff --git a/applications/solvers/incompressible/pimpleFoam/UEqn.H b/applications/solvers/incompressible/pimpleFoam/UEqn.H index 1a6b404885..8a44cdeaf2 100644 --- a/applications/solvers/incompressible/pimpleFoam/UEqn.H +++ b/applications/solvers/incompressible/pimpleFoam/UEqn.H @@ -6,7 +6,7 @@ tmp tUEqn ( fvm::ddt(U) + fvm::div(phi, U) + MRF.DDt(U) - + turbulence->divDevReff(U) + + turbulence->divDevSigma(U) == fvOptions(U) ); diff --git a/applications/solvers/incompressible/pimpleFoam/createFields.H b/applications/solvers/incompressible/pimpleFoam/createFields.H index 4aecb61b06..5555fc054b 100644 --- a/applications/solvers/incompressible/pimpleFoam/createFields.H +++ b/applications/solvers/incompressible/pimpleFoam/createFields.H @@ -39,9 +39,9 @@ mesh.setFluxRequired(p.name()); singlePhaseTransportModel laminarTransport(U, phi); -autoPtr turbulence +autoPtr turbulence ( - incompressible::turbulenceModel::New(U, phi, laminarTransport) + incompressible::momentumTransportModel::New(U, phi, laminarTransport) ); #include "createMRF.H" diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C index b51734b976..566a0e8b1c 100644 --- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C +++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.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 @@ -35,7 +35,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "singlePhaseTransportModel.H" -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "pimpleControl.H" #include "CorrectPhi.H" #include "fvOptions.H" diff --git a/applications/solvers/incompressible/pisoFoam/Make/options b/applications/solvers/incompressible/pisoFoam/Make/options index 9af500124c..3000f6bfe8 100644 --- a/applications/solvers/incompressible/pisoFoam/Make/options +++ b/applications/solvers/incompressible/pisoFoam/Make/options @@ -1,15 +1,14 @@ EXE_INC = \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lincompressibleMomentumTransportModels \ -lincompressibleTransportModels \ -lfiniteVolume \ -lmeshTools \ diff --git a/applications/solvers/incompressible/pisoFoam/UEqn.H b/applications/solvers/incompressible/pisoFoam/UEqn.H index 50865de6bc..ee65b2e0f6 100644 --- a/applications/solvers/incompressible/pisoFoam/UEqn.H +++ b/applications/solvers/incompressible/pisoFoam/UEqn.H @@ -6,7 +6,7 @@ fvVectorMatrix UEqn ( fvm::ddt(U) + fvm::div(phi, U) + MRF.DDt(U) - + turbulence->divDevReff(U) + + turbulence->divDevSigma(U) == fvOptions(U) ); diff --git a/applications/solvers/incompressible/pisoFoam/createFields.H b/applications/solvers/incompressible/pisoFoam/createFields.H index 6485334fec..3f81e6a9dd 100644 --- a/applications/solvers/incompressible/pisoFoam/createFields.H +++ b/applications/solvers/incompressible/pisoFoam/createFields.H @@ -37,9 +37,9 @@ mesh.setFluxRequired(p.name()); singlePhaseTransportModel laminarTransport(U, phi); -autoPtr turbulence +autoPtr turbulence ( - incompressible::turbulenceModel::New(U, phi, laminarTransport) + incompressible::momentumTransportModel::New(U, phi, laminarTransport) ); #include "createMRF.H" diff --git a/applications/solvers/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C index e108ad009a..b59648fe6b 100644 --- a/applications/solvers/incompressible/pisoFoam/pisoFoam.C +++ b/applications/solvers/incompressible/pisoFoam/pisoFoam.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 @@ -36,7 +36,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "pisoControl.H" #include "fvOptions.H" diff --git a/applications/solvers/incompressible/simpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/Make/options index 1d9ded80bf..24c5c258ea 100644 --- a/applications/solvers/incompressible/simpleFoam/Make/options +++ b/applications/solvers/incompressible/simpleFoam/Make/options @@ -1,16 +1,15 @@ EXE_INC = \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lincompressibleMomentumTransportModels \ -lincompressibleTransportModels \ -lfiniteVolume \ -lmeshTools \ diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options index 90df601079..e34b7d93cd 100644 --- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options +++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options @@ -1,17 +1,16 @@ EXE_INC = \ -I.. \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lincompressibleMomentumTransportModels \ -lincompressibleTransportModels \ -lfiniteVolume \ -lmeshTools \ diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C index 0ea5d0f757..fd2717decd 100644 --- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C +++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.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 @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "SRFModel.H" #include "simpleControl.H" #include "fvOptions.H" diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H index 5e1b141030..ee301c12d1 100644 --- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H +++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H @@ -3,7 +3,7 @@ tmp tUrelEqn ( fvm::div(phi, Urel) - + turbulence->divDevReff(Urel) + + turbulence->divDevSigma(Urel) + SRF->Su() == fvOptions(Urel) diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H index b7b0a5d10b..4cc66cb431 100644 --- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H +++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H @@ -64,9 +64,9 @@ volVectorField U singlePhaseTransportModel laminarTransport(U, phi); -autoPtr turbulence +autoPtr turbulence ( - incompressible::turbulenceModel::New(U, phi, laminarTransport) + incompressible::momentumTransportModel::New(U, phi, laminarTransport) ); #include "createFvOptions.H" diff --git a/applications/solvers/incompressible/simpleFoam/UEqn.H b/applications/solvers/incompressible/simpleFoam/UEqn.H index 81e83b55d7..3e1fdc0abb 100644 --- a/applications/solvers/incompressible/simpleFoam/UEqn.H +++ b/applications/solvers/incompressible/simpleFoam/UEqn.H @@ -6,7 +6,7 @@ ( fvm::div(phi, U) + MRF.DDt(U) - + turbulence->divDevReff(U) + + turbulence->divDevSigma(U) == fvOptions(U) ); diff --git a/applications/solvers/incompressible/simpleFoam/createFields.H b/applications/solvers/incompressible/simpleFoam/createFields.H index 3c4971527b..8ad333be38 100644 --- a/applications/solvers/incompressible/simpleFoam/createFields.H +++ b/applications/solvers/incompressible/simpleFoam/createFields.H @@ -37,9 +37,9 @@ mesh.setFluxRequired(p.name()); singlePhaseTransportModel laminarTransport(U, phi); -autoPtr turbulence +autoPtr turbulence ( - incompressible::turbulenceModel::New(U, phi, laminarTransport) + incompressible::momentumTransportModel::New(U, phi, laminarTransport) ); #include "createMRF.H" diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options index 90df601079..e34b7d93cd 100644 --- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options +++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options @@ -1,17 +1,16 @@ EXE_INC = \ -I.. \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lincompressibleMomentumTransportModels \ -lincompressibleTransportModels \ -lfiniteVolume \ -lmeshTools \ diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/UEqn.H b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/UEqn.H index e2c9917d5a..909e7a3e60 100644 --- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/UEqn.H +++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/UEqn.H @@ -6,7 +6,7 @@ ( fvm::div(phi, U) + MRF.DDt(U) - + turbulence->divDevReff(U) + + turbulence->divDevSigma(U) == fvOptions(U) ); diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C index 938dbe2d70..8f1a0f1577 100644 --- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C +++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.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 @@ -33,7 +33,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "simpleControl.H" #include "IOporosityModelList.H" #include "fvOptions.H" diff --git a/applications/solvers/incompressible/simpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/simpleFoam.C index 15d798a3fb..7869ec2c99 100644 --- a/applications/solvers/incompressible/simpleFoam/simpleFoam.C +++ b/applications/solvers/incompressible/simpleFoam/simpleFoam.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 @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "simpleControl.H" #include "fvOptions.H" diff --git a/applications/solvers/lagrangian/DPMFoam/Allwclean b/applications/solvers/lagrangian/DPMFoam/Allwclean index 3c1cb65d84..4575cd0537 100755 --- a/applications/solvers/lagrangian/DPMFoam/Allwclean +++ b/applications/solvers/lagrangian/DPMFoam/Allwclean @@ -1,7 +1,7 @@ #!/bin/sh cd ${0%/*} || exit 1 # Run from this directory -wclean libso DPMTurbulenceModels +wclean libso DPMMomentumTransportModels wclean wclean MPPICFoam diff --git a/applications/solvers/lagrangian/DPMFoam/Allwmake b/applications/solvers/lagrangian/DPMFoam/Allwmake index c43d3b37b7..5ccc25ffe8 100755 --- a/applications/solvers/lagrangian/DPMFoam/Allwmake +++ b/applications/solvers/lagrangian/DPMFoam/Allwmake @@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Parse arguments for library compilation . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments -wmake $targetType DPMTurbulenceModels +wmake $targetType DPMMomentumTransportModels wmake $targetType wmake $targetType MPPICFoam diff --git a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C index 346b3d68ee..f0fb67f3ca 100644 --- a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C +++ b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C @@ -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 @@ -34,7 +34,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "singlePhaseTransportModel.H" -#include "PhaseIncompressibleTurbulenceModel.H" +#include "PhaseIncompressibleMomentumTransportModel.H" #include "pimpleControl.H" #include "CorrectPhi.H" #include "fvOptions.H" diff --git a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C b/applications/solvers/lagrangian/DPMFoam/DPMMomentumTransportModels/DPMMomentumTransportModels.C similarity index 57% rename from applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C rename to applications/solvers/lagrangian/DPMFoam/DPMMomentumTransportModels/DPMMomentumTransportModels.C index b3d0a53dce..563d4903d4 100644 --- a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C +++ b/applications/solvers/lagrangian/DPMFoam/DPMMomentumTransportModels/DPMMomentumTransportModels.C @@ -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 @@ -23,10 +23,10 @@ License \*---------------------------------------------------------------------------*/ -#include "PhaseIncompressibleTurbulenceModel.H" +#include "PhaseIncompressibleMomentumTransportModel.H" #include "singlePhaseTransportModel.H" #include "addToRunTimeSelectionTable.H" -#include "makeTurbulenceModel.H" +#include "makeMomentumTransportModel.H" #include "laminarModel.H" #include "RASModel.H" @@ -34,35 +34,47 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makeTurbulenceModelTypes +makeMomentumTransportModelTypes ( volScalarField, geometricOneField, - incompressibleTurbulenceModel, - PhaseIncompressibleTurbulenceModel, + incompressibleMomentumTransportModel, + PhaseIncompressibleMomentumTransportModel, singlePhaseTransportModel ); -makeBaseTurbulenceModel +makeBaseMomentumTransportModel ( volScalarField, geometricOneField, - incompressibleTurbulenceModel, - PhaseIncompressibleTurbulenceModel, + incompressibleMomentumTransportModel, + PhaseIncompressibleMomentumTransportModel, singlePhaseTransportModel ); #define makeLaminarModel(Type) \ - makeTemplatedTurbulenceModel \ - (singlePhaseTransportModelPhaseIncompressibleTurbulenceModel, laminar, Type) + makeTemplatedMomentumTransportModel \ + ( \ + singlePhaseTransportModelPhaseIncompressibleMomentumTransportModel, \ + laminar, \ + Type \ + ) #define makeRASModel(Type) \ - makeTemplatedTurbulenceModel \ - (singlePhaseTransportModelPhaseIncompressibleTurbulenceModel, RAS, Type) + makeTemplatedMomentumTransportModel \ + ( \ + singlePhaseTransportModelPhaseIncompressibleMomentumTransportModel, \ + RAS, \ + Type \ + ) #define makeLESModel(Type) \ - makeTemplatedTurbulenceModel \ - (singlePhaseTransportModelPhaseIncompressibleTurbulenceModel, LES, Type) + makeTemplatedMomentumTransportModel \ + ( \ + singlePhaseTransportModelPhaseIncompressibleMomentumTransportModel, \ + LES, \ + Type \ + ) #include "Stokes.H" makeLaminarModel(Stokes); diff --git a/applications/solvers/lagrangian/DPMFoam/DPMMomentumTransportModels/Make/files b/applications/solvers/lagrangian/DPMFoam/DPMMomentumTransportModels/Make/files new file mode 100644 index 0000000000..d7245a6438 --- /dev/null +++ b/applications/solvers/lagrangian/DPMFoam/DPMMomentumTransportModels/Make/files @@ -0,0 +1,3 @@ +DPMMomentumTransportModels.C + +LIB = $(FOAM_LIBBIN)/libDPMMomentumTransportModels diff --git a/applications/solvers/lagrangian/DPMFoam/DPMMomentumTransportModels/Make/options b/applications/solvers/lagrangian/DPMFoam/DPMMomentumTransportModels/Make/options new file mode 100644 index 0000000000..d5f766c6a1 --- /dev/null +++ b/applications/solvers/lagrangian/DPMFoam/DPMMomentumTransportModels/Make/options @@ -0,0 +1,8 @@ +EXE_INC = \ + -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseIncompressible/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude diff --git a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/files b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/files deleted file mode 100644 index 3b6b48c2c4..0000000000 --- a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -DPMTurbulenceModels.C - -LIB = $(FOAM_LIBBIN)/libDPMTurbulenceModels diff --git a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/options b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/options deleted file mode 100644 index 902afe59e4..0000000000 --- a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/Make/options +++ /dev/null @@ -1,10 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseIncompressible/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude diff --git a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options index b24c882138..74755c40b2 100644 --- a/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options +++ b/applications/solvers/lagrangian/DPMFoam/MPPICFoam/Make/options @@ -1,18 +1,16 @@ EXE_INC = \ -I.. \ - -I../DPMTurbulenceModels/lnInclude \ + -I../DPMMomentumTransportModels/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/radiationModels/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseIncompressible/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseIncompressible/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -24,9 +22,9 @@ EXE_LIBS = \ -llagrangianIntermediate \ -llagrangianTurbulence \ -lincompressibleTransportModels \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ - -lDPMTurbulenceModels \ + -lmomentumTransportModels \ + -lincompressibleMomentumTransportModels \ + -lDPMMomentumTransportModels \ -lfiniteVolume \ -ldynamicFvMesh \ -ltopoChangerFvMesh \ diff --git a/applications/solvers/lagrangian/DPMFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/Make/options index b6a8737049..8553deca6e 100644 --- a/applications/solvers/lagrangian/DPMFoam/Make/options +++ b/applications/solvers/lagrangian/DPMFoam/Make/options @@ -1,17 +1,15 @@ EXE_INC = \ - -I./DPMTurbulenceModels/lnInclude \ + -I./DPMMomentumTransportModels/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/radiationModels/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseIncompressible/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseIncompressible/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -23,9 +21,9 @@ EXE_LIBS = \ -llagrangianIntermediate \ -llagrangianTurbulence \ -lincompressibleTransportModels \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ - -lDPMTurbulenceModels \ + -lmomentumTransportModels \ + -lincompressibleMomentumTransportModels \ + -lDPMMomentumTransportModels \ -lfiniteVolume \ -ldynamicFvMesh \ -ltopoChangerFvMesh \ diff --git a/applications/solvers/lagrangian/DPMFoam/UcEqn.H b/applications/solvers/lagrangian/DPMFoam/UcEqn.H index 721455e119..12c6f8fbab 100644 --- a/applications/solvers/lagrangian/DPMFoam/UcEqn.H +++ b/applications/solvers/lagrangian/DPMFoam/UcEqn.H @@ -2,7 +2,7 @@ fvVectorMatrix UcEqn ( fvm::ddt(alphac, Uc) + fvm::div(alphaPhic, Uc) - fvm::Sp(fvc::ddt(alphac) + fvc::div(alphaPhic), Uc) - + continuousPhaseTurbulence->divDevRhoReff(Uc) + + continuousPhaseTurbulence->divDevTau(Uc) == (1.0/rhoc)*cloudSU ); diff --git a/applications/solvers/lagrangian/DPMFoam/createFields.H b/applications/solvers/lagrangian/DPMFoam/createFields.H index d8bd000f1c..eefdfd0576 100644 --- a/applications/solvers/lagrangian/DPMFoam/createFields.H +++ b/applications/solvers/lagrangian/DPMFoam/createFields.H @@ -159,10 +159,10 @@ surfaceScalarField alphaPhic alphacf*phic ); -autoPtr> +autoPtr> continuousPhaseTurbulence ( - PhaseIncompressibleTurbulenceModel::New + PhaseIncompressibleMomentumTransportModel::New ( alphac, Uc, diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options index f42e3b53c9..6a007cd77f 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options +++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options @@ -1,15 +1,14 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ @@ -26,15 +25,14 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ -lcoalCombustion\ -lspecie \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lthermophysicalProperties \ -lreactionThermophysicalModels \ diff --git a/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H index 937f0ecc5e..9230617cde 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H @@ -4,7 +4,7 @@ ( fvm::ddt(rho, U) + fvm::div(phi, U) + MRF.DDt(rho, U) - + turbulence->divDevRhoReff(U) + + turbulence->divDevTau(U) == rho()*g + coalParcels.SU(U) diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C index 97499758f2..e1ce816b92 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C +++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C @@ -31,7 +31,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "fluidThermoTransportModel.H" #include "basicThermoCloud.H" #include "coalCloud.H" diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H index 3888266043..4d39ac1f95 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H @@ -96,9 +96,9 @@ volVectorField U mesh.setFluxRequired(p.name()); Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence +autoPtr turbulence ( - compressible::turbulenceModel::New + compressible::momentumTransportModel::New ( rho, U, diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options index 83385b8ab4..78af970334 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options @@ -1,10 +1,9 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ @@ -15,8 +14,8 @@ EXE_LIBS = \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lincompressibleMomentumTransportModels \ -lincompressibleTransportModels \ -lfiniteVolume \ -lregionModels \ diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H index 77287eed87..116163ab20 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H @@ -39,9 +39,9 @@ volScalarField rhoInf rhoInfValue ); -autoPtr turbulence +autoPtr turbulence ( - incompressible::turbulenceModel::New(U, phi, laminarTransport) + incompressible::momentumTransportModel::New(U, phi, laminarTransport) ); volScalarField mu diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C index 02a5cee6c1..2aa793bdf8 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.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 @@ -35,7 +35,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "singlePhaseTransportModel.H" -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "basicKinematicCollidingCloud.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options index 1d6b4f1fe5..f6d3f8b89e 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options @@ -4,12 +4,11 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ @@ -29,11 +28,10 @@ EXE_LIBS = \ -lfvOptions \ -lsampling \ -lmeshTools \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ -lspecie \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ -lSLGThermo \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/UEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/UEqn.H index 0bb6ff7240..f6a9d58ef9 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/UEqn.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/UEqn.H @@ -4,7 +4,7 @@ ( fvm::ddt(rho, U) + fvm::div(phi, U) + MRF.DDt(rho, U) - + turbulence->divDevRhoReff(U) + + turbulence->divDevTau(U) == parcels.SU(U) + fvOptions(rho, U) diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H index a02694bf29..dc27606f76 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H @@ -50,9 +50,9 @@ volVectorField U #include "compressibleCreatePhi.H" Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence +autoPtr turbulence ( - compressible::turbulenceModel::New + compressible::momentumTransportModel::New ( rho, U, diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C index e6ab7c931c..ab2cec038e 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C @@ -31,7 +31,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "fluidThermoTransportModel.H" #include "basicReactingMultiphaseCloud.H" #include "surfaceFilmModel.H" diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options index 799e8fa0ab..45148e303f 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options @@ -2,15 +2,14 @@ EXE_INC = \ -I. \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ @@ -28,14 +27,13 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ -lspecie \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lthermophysicalProperties \ -lreactionThermophysicalModels \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/UEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/UEqn.H index a29d4b8c57..15257112f9 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/UEqn.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/UEqn.H @@ -4,7 +4,7 @@ ( fvm::div(phi, U) + MRF.DDt(rho, U) - + turbulence->divDevRhoReff(U) + + turbulence->divDevTau(U) == rho()*g + parcels.SU(U) diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H index d152b60440..db9b0400f7 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H @@ -73,9 +73,9 @@ dimensionedScalar rhoMin ); Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence +autoPtr turbulence ( - compressible::turbulenceModel::New + compressible::momentumTransportModel::New ( rho, U, diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C index ce110dd6e1..747082f895 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C @@ -31,7 +31,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "fluidThermoTransportModel.H" #include "basicReactingMultiphaseCloud.H" #include "rhoReactionThermo.H" diff --git a/applications/solvers/lagrangian/sprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/Make/options index 1806b4d5a3..9b187387d6 100644 --- a/applications/solvers/lagrangian/sprayFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/Make/options @@ -5,15 +5,14 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/spray/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ @@ -28,15 +27,14 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ -llagrangianSpray \ -lspecie \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lthermophysicalProperties \ -lreactionThermophysicalModels \ diff --git a/applications/solvers/lagrangian/sprayFoam/UEqn.H b/applications/solvers/lagrangian/sprayFoam/UEqn.H index 62490aa92e..cf97416e0b 100644 --- a/applications/solvers/lagrangian/sprayFoam/UEqn.H +++ b/applications/solvers/lagrangian/sprayFoam/UEqn.H @@ -6,7 +6,7 @@ tmp tUEqn ( fvm::ddt(rho, U) + fvm::div(phi, U) + MRF.DDt(rho, U) - + turbulence->divDevRhoReff(U) + + turbulence->divDevTau(U) == rho()*g + parcels.SU(U) diff --git a/applications/solvers/lagrangian/sprayFoam/createFields.H b/applications/solvers/lagrangian/sprayFoam/createFields.H index 957cf9198f..6839373624 100644 --- a/applications/solvers/lagrangian/sprayFoam/createFields.H +++ b/applications/solvers/lagrangian/sprayFoam/createFields.H @@ -75,9 +75,9 @@ dimensionedScalar rhoMin ); Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence +autoPtr turbulence ( - compressible::turbulenceModel::New + compressible::momentumTransportModel::New ( rho, U, diff --git a/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options index c9e089f53c..1fb211632f 100644 --- a/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options @@ -5,15 +5,14 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/spray/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ @@ -31,15 +30,14 @@ EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ -lsampling \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ -llagrangianSpray \ -lspecie \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lthermophysicalProperties \ -lreactionThermophysicalModels \ diff --git a/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C b/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C index 21809e93b8..faa0ecfedc 100644 --- a/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C +++ b/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C @@ -33,7 +33,7 @@ Description #include "fvCFD.H" #include "engineTime.H" #include "engineMesh.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "fluidThermoTransportModel.H" #include "basicSprayCloud.H" #include "psiReactionThermo.H" diff --git a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C index d4fa59cc8d..aa25e78b56 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C +++ b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" -#include "turbulenceModel.H" +#include "momentumTransportModel.H" #include "fluidThermoTransportModel.H" #include "basicSprayCloud.H" #include "psiReactionThermo.H" diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options index 3e79386ab0..ca7fbfcb72 100644 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options +++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options @@ -2,12 +2,11 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/radiationModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ @@ -18,12 +17,11 @@ EXE_LIBS = \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lradiationModels \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lfiniteVolume \ -lfvOptions \ -lmeshTools \ diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H index 9f728049f9..a3215faf6d 100644 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H @@ -38,9 +38,9 @@ volVectorField U #include "compressibleCreatePhi.H" Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence +autoPtr turbulence ( - compressible::turbulenceModel::New + compressible::momentumTransportModel::New ( rho, U, diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C index 304c5ea0b2..73ba02fa5e 100644 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C +++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.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 @@ -34,7 +34,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "psiThermo.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "basicKinematicCloud.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/cavitatingFoam/Make/options b/applications/solvers/multiphase/cavitatingFoam/Make/options index 157057ceb8..1f70be75bd 100644 --- a/applications/solvers/multiphase/cavitatingFoam/Make/options +++ b/applications/solvers/multiphase/cavitatingFoam/Make/options @@ -1,18 +1,19 @@ EXE_INC = \ - -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/incompressibleTwoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/barotropicCompressibilityModel/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lincompressibleTwoPhaseMixture \ + -lincompressibleMomentumTransportModels \ -lbarotropicCompressibilityModel \ -lfiniteVolume \ -ldynamicFvMesh \ diff --git a/applications/solvers/multiphase/cavitatingFoam/UEqn.H b/applications/solvers/multiphase/cavitatingFoam/UEqn.H index 8edf0d3934..8469b869cf 100644 --- a/applications/solvers/multiphase/cavitatingFoam/UEqn.H +++ b/applications/solvers/multiphase/cavitatingFoam/UEqn.H @@ -2,7 +2,7 @@ ( fvm::ddt(rho, U) + fvm::div(rhoPhi, U) - + turbulence->divDevRhoReff(rho, U) + + turbulence->divDevTau(rho, U) ); UEqn.relax(); diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C index 2da3459459..ccfceaf1b8 100644 --- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C +++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.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 @@ -37,7 +37,7 @@ Description #include "dynamicFvMesh.H" #include "barotropicCompressibilityModel.H" #include "incompressibleTwoPhaseMixture.H" -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "CorrectPhi.H" #include "pimpleControl.H" diff --git a/applications/solvers/multiphase/cavitatingFoam/createFields.H b/applications/solvers/multiphase/cavitatingFoam/createFields.H index 0108b8c56a..2fedb2eccc 100644 --- a/applications/solvers/multiphase/cavitatingFoam/createFields.H +++ b/applications/solvers/multiphase/cavitatingFoam/createFields.H @@ -90,7 +90,7 @@ mesh.setFluxRequired(p.name()); mesh.setFluxRequired(rho.name()); // Create incompressible turbulence model -autoPtr turbulence +autoPtr turbulence ( - incompressible::turbulenceModel::New(U, phi, mixture) + incompressible::momentumTransportModel::New(U, phi, mixture) ); diff --git a/applications/solvers/multiphase/compressibleInterFoam/Allwclean b/applications/solvers/multiphase/compressibleInterFoam/Allwclean index 2e9b7fa3d7..6158989fc8 100755 --- a/applications/solvers/multiphase/compressibleInterFoam/Allwclean +++ b/applications/solvers/multiphase/compressibleInterFoam/Allwclean @@ -3,7 +3,7 @@ cd ${0%/*} || exit 1 # Run from this directory wclean libso twoPhaseMixtureThermo wclean libso surfaceTensionModels -wclean libso VoFphaseCompressibleTurbulenceModels +wclean libso VoFphaseCompressibleMomentumTransportModels wclean wclean compressibleInterFilmFoam diff --git a/applications/solvers/multiphase/compressibleInterFoam/Allwmake b/applications/solvers/multiphase/compressibleInterFoam/Allwmake index 5685a23f41..63eb566576 100755 --- a/applications/solvers/multiphase/compressibleInterFoam/Allwmake +++ b/applications/solvers/multiphase/compressibleInterFoam/Allwmake @@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory wmake $targetType twoPhaseMixtureThermo wmake $targetType surfaceTensionModels -wmake $targetType VoFphaseCompressibleTurbulenceModels +wmake $targetType VoFphaseCompressibleMomentumTransportModels wmake $targetType wmake $targetType compressibleInterFilmFoam diff --git a/applications/solvers/multiphase/compressibleInterFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/Make/options index cf5ab1021b..ee94ef3713 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/Make/options @@ -1,15 +1,13 @@ EXE_INC = \ -I. \ - -I../VoF \ -ItwoPhaseMixtureThermo \ - -IVoFphaseCompressibleTurbulenceModels/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ + -IVoFphaseCompressibleMomentumTransportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ - -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ @@ -18,15 +16,14 @@ EXE_INC = \ EXE_LIBS = \ -ltwoPhaseMixtureThermo \ -ltwoPhaseSurfaceTension \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -ltwoPhaseMixture \ -ltwoPhaseProperties \ -linterfaceProperties \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ - -lVoFphaseCompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ + -lVoFphaseCompressibleMomentumTransportModels \ -lfiniteVolume \ -lfvOptions \ -lmeshTools \ diff --git a/applications/solvers/multiphase/compressibleInterFoam/UEqn.H b/applications/solvers/multiphase/compressibleInterFoam/UEqn.H index 899d1140df..13014f3fff 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/UEqn.H +++ b/applications/solvers/multiphase/compressibleInterFoam/UEqn.H @@ -3,7 +3,7 @@ fvm::ddt(rho, U) + fvm::div(rhoPhi, U) - fvm::Sp(contErr, U) + MRF.DDt(rho, U) - + turbulence.divDevRhoReff(U) + + turbulence.divDevTau(U) == fvOptions(rho, U) ); diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/Make/files b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/Make/files new file mode 100644 index 0000000000..29c26315a0 --- /dev/null +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/Make/files @@ -0,0 +1,4 @@ +VoFphaseCompressibleMomentumTransportModels.C +compressibleInterPhaseTransportModel.C + +LIB = $(FOAM_LIBBIN)/libVoFphaseCompressibleMomentumTransportModels diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/Make/options similarity index 51% rename from applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options rename to applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/Make/options index d6736fe7c8..dc8af1ccbe 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/Make/options @@ -1,12 +1,11 @@ EXE_INC = \ -I../twoPhaseMixtureThermo \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ - -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude @@ -18,8 +17,8 @@ LIB_LIBS = \ -ltwoPhaseMixture \ -ltwoPhaseProperties \ -linterfaceProperties \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lincompressibleTransportModels \ -lfiniteVolume \ -lmeshTools diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModel.H b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModel.H similarity index 76% rename from applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModel.H rename to applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModel.H index 87a6314bf7..3bdd8bae77 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModel.H +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModel.H @@ -22,26 +22,26 @@ License along with OpenFOAM. If not, see . Typedef - Foam::VoFphaseCompressibleTurbulenceModel + Foam::VoFphaseCompressibleMomentumTransportModel Description - Typedef for VoFphaseCompressibleTurbulenceModel + Typedef for VoFphaseCompressibleMomentumTransportModel \*---------------------------------------------------------------------------*/ -#ifndef VoFphaseCompressibleTurbulenceModel_H -#define VoFphaseCompressibleTurbulenceModel_H +#ifndef VoFphaseCompressibleMomentumTransportModel_H +#define VoFphaseCompressibleMomentumTransportModel_H -#include "VoFphaseCompressibleTurbulenceModelFwd.H" -#include "PhaseCompressibleTurbulenceModel.H" +#include "VoFphaseCompressibleMomentumTransportModelFwd.H" +#include "PhaseCompressibleMomentumTransportModel.H" #include "fluidThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - typedef PhaseCompressibleTurbulenceModel - VoFphaseCompressibleTurbulenceModel; + typedef PhaseCompressibleMomentumTransportModel + VoFphaseCompressibleMomentumTransportModel; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModelFwd.H b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModelFwd.H similarity index 78% rename from applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModelFwd.H rename to applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModelFwd.H index 49fba94fee..c271a08dbe 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModelFwd.H +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModelFwd.H @@ -22,15 +22,16 @@ License along with OpenFOAM. If not, see . Typedef - Foam::VoFphaseCompressibleTurbulenceModel + Foam::VoFphaseCompressibleMomentumTransportModel Description - Forward declaration of typedef for VoFphaseCompressibleTurbulenceModel + Forward declaration of typedef for + VoFphaseCompressibleMomentumTransportModel \*---------------------------------------------------------------------------*/ -#ifndef VoFphaseCompressibleTurbulenceModelFwd_H -#define VoFphaseCompressibleTurbulenceModelFwd_H +#ifndef VoFphaseCompressibleMomentumTransportModelFwd_H +#define VoFphaseCompressibleMomentumTransportModelFwd_H // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -39,10 +40,10 @@ namespace Foam class fluidThermo; template - class PhaseCompressibleTurbulenceModel; + class PhaseCompressibleMomentumTransportModel; - typedef PhaseCompressibleTurbulenceModel - VoFphaseCompressibleTurbulenceModel; + typedef PhaseCompressibleMomentumTransportModel + VoFphaseCompressibleMomentumTransportModel; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModels.C b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModels.C similarity index 78% rename from applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModels.C rename to applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModels.C index a975261a33..92de054ce1 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/VoFphaseCompressibleTurbulenceModels.C +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModels.C @@ -23,10 +23,10 @@ License \*---------------------------------------------------------------------------*/ -#include "PhaseCompressibleTurbulenceModel.H" +#include "PhaseCompressibleMomentumTransportModel.H" #include "fluidThermo.H" #include "addToRunTimeSelectionTable.H" -#include "makeTurbulenceModel.H" +#include "makeMomentumTransportModel.H" #include "laminarModel.H" #include "RASModel.H" @@ -34,35 +34,35 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makeTurbulenceModelTypes +makeMomentumTransportModelTypes ( volScalarField, volScalarField, - compressibleTurbulenceModel, - PhaseCompressibleTurbulenceModel, + compressibleMomentumTransportModel, + PhaseCompressibleMomentumTransportModel, fluidThermo ); -makeBaseTurbulenceModel +makeBaseMomentumTransportModel ( volScalarField, volScalarField, - compressibleTurbulenceModel, - PhaseCompressibleTurbulenceModel, + compressibleMomentumTransportModel, + PhaseCompressibleMomentumTransportModel, fluidThermo ); #define makeLaminarModel(Type) \ makeTemplatedLaminarModel \ - (fluidThermoPhaseCompressibleTurbulenceModel, laminar, Type) + (fluidThermoPhaseCompressibleMomentumTransportModel, laminar, Type) #define makeRASModel(Type) \ - makeTemplatedTurbulenceModel \ - (fluidThermoPhaseCompressibleTurbulenceModel, RAS, Type) + makeTemplatedMomentumTransportModel \ + (fluidThermoPhaseCompressibleMomentumTransportModel, RAS, Type) #define makeLESModel(Type) \ - makeTemplatedTurbulenceModel \ - (fluidThermoPhaseCompressibleTurbulenceModel, LES, Type) + makeTemplatedMomentumTransportModel \ + (fluidThermoPhaseCompressibleMomentumTransportModel, LES, Type) #include "Stokes.H" makeLaminarModel(Stokes); diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.C b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/compressibleInterPhaseTransportModel.C similarity index 92% rename from applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.C rename to applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/compressibleInterPhaseTransportModel.C index 5696988134..75e59b1477 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.C +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/compressibleInterPhaseTransportModel.C @@ -47,7 +47,7 @@ Foam::compressibleInterPhaseTransportModel::compressibleInterPhaseTransportModel ( IOobject ( - turbulenceModel::typeName, + momentumTransportModel::typeName, U.time().constant(), U.db(), IOobject::MUST_READ, @@ -94,7 +94,7 @@ Foam::compressibleInterPhaseTransportModel::compressibleInterPhaseTransportModel turbulence1_ = ( - PhaseCompressibleTurbulenceModel::New + PhaseCompressibleMomentumTransportModel::New ( alpha1, rho1, @@ -107,7 +107,7 @@ Foam::compressibleInterPhaseTransportModel::compressibleInterPhaseTransportModel turbulence2_ = ( - PhaseCompressibleTurbulenceModel::New + PhaseCompressibleMomentumTransportModel::New ( alpha2, rho2, @@ -120,7 +120,7 @@ Foam::compressibleInterPhaseTransportModel::compressibleInterPhaseTransportModel } else { - turbulence_ = compressible::turbulenceModel::New + turbulence_ = compressible::momentumTransportModel::New ( rho, U, @@ -177,7 +177,7 @@ Foam::compressibleInterPhaseTransportModel::alphaEff() const Foam::tmp -Foam::compressibleInterPhaseTransportModel::divDevRhoReff +Foam::compressibleInterPhaseTransportModel::divDevTau ( volVectorField& U ) const @@ -185,12 +185,12 @@ Foam::compressibleInterPhaseTransportModel::divDevRhoReff if (twoPhaseTransport_) { return - turbulence1_->divDevRhoReff(U) - + turbulence2_->divDevRhoReff(U); + turbulence1_->divDevTau(U) + + turbulence2_->divDevTau(U); } else { - return turbulence_->divDevRhoReff(U); + return turbulence_->divDevTau(U); } } diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.H b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/compressibleInterPhaseTransportModel.H similarity index 91% rename from applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.H rename to applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/compressibleInterPhaseTransportModel.H index dde0c8479a..3f424ca97d 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.H +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/compressibleInterPhaseTransportModel.H @@ -46,8 +46,8 @@ SourceFiles #include "twoPhaseMixture.H" #include "twoPhaseMixtureThermo.H" -#include "turbulentFluidThermoModel.H" -#include "VoFphaseCompressibleTurbulenceModel.H" +#include "fluidThermoMomentumTransportModel.H" +#include "VoFphaseCompressibleMomentumTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -81,13 +81,15 @@ class compressibleInterPhaseTransportModel tmp alphaRhoPhi2_; //- Mixture transport model (constructed for mixture transport) - autoPtr turbulence_; + autoPtr turbulence_; //- Phase-1 transport model (constructed for two-phase transport) - autoPtr> turbulence1_; + autoPtr> + turbulence1_; //- Phase-2 transport model (constructed for two-phase transport) - autoPtr> turbulence2_; + autoPtr> + turbulence2_; public: @@ -118,7 +120,7 @@ public: tmp alphaEff() const; //- Return the effective momentum stress divergence - tmp divDevRhoReff(volVectorField& U) const; + tmp divDevTau(volVectorField& U) const; //- Correct the phase mass-fluxes // (required for the two-phase transport option) diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/files b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/files deleted file mode 100644 index b7835bde20..0000000000 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/files +++ /dev/null @@ -1,4 +0,0 @@ -VoFphaseCompressibleTurbulenceModels.C -compressibleInterPhaseTransportModel.C - -LIB = $(FOAM_LIBBIN)/libVoFphaseCompressibleTurbulenceModels diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options index a192ce05f9..ac3b62b97e 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options @@ -3,16 +3,14 @@ EXE_INC = \ -IVoFPatchTransfer \ -IVoFSolidificationMeltingSource \ -I.. \ - -I../../VoF \ -I../twoPhaseMixtureThermo \ - -I../VoFphaseCompressibleTurbulenceModels/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ + -I../VoFphaseCompressibleMomentumTransportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ - -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ @@ -29,15 +27,14 @@ EXE_INC = \ EXE_LIBS = \ -ltwoPhaseMixtureThermo \ -ltwoPhaseSurfaceTension \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -ltwoPhaseMixture \ -ltwoPhaseProperties \ -linterfaceProperties \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ - -lVoFphaseCompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ + -lVoFphaseCompressibleMomentumTransportModels \ -lSLGThermo \ -lsurfaceFilmModels \ -lsurfaceFilmDerivedFvPatchFields \ diff --git a/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/Make/options b/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/Make/options index 0d8cc30e2d..9005e5f1b1 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/Make/options @@ -1,6 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ @@ -8,7 +7,6 @@ EXE_INC = \ LIB_LIBS = \ -linterfaceProperties \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lthermophysicalProperties \ diff --git a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/Make/options b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/Make/options index aca6fad2c2..1b0966dea7 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/Make/options @@ -1,12 +1,10 @@ EXE_INC = \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ - -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -ltwoPhaseMixture \ diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options index 9df3add9e2..82b4970d4e 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options @@ -1,25 +1,22 @@ EXE_INC = \ -I. \ - -I../VoF \ -I../interFoam \ -ImultiphaseMixtureThermo/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ - -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ -lmultiphaseMixtureThermo \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -linterfaceProperties \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lfiniteVolume \ -lfvOptions \ -lmeshTools diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/UEqn.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/UEqn.H index 436b74e846..ed987ced7a 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/UEqn.H +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/UEqn.H @@ -2,7 +2,7 @@ ( fvm::ddt(rho, U) + fvm::div(mixture.rhoPhi(), U) - + turbulence->divDevRhoReff(U) + + turbulence->divDevTau(U) ); UEqn.relax(); diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C index 4c808570a4..b80fc31e87 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C @@ -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 @@ -37,7 +37,7 @@ Description #include "fvCFD.H" #include "multiphaseMixtureThermo.H" -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" #include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H index dcb89c35b9..f8728472a0 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H @@ -54,9 +54,9 @@ mesh.setFluxRequired(p_rgh.name()); // Construct compressible turbulence model -autoPtr turbulence +autoPtr turbulence ( - compressible::turbulenceModel::New + compressible::momentumTransportModel::New ( rho, U, diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/Make/options b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/Make/options index 9215e76b2e..18cbdd670a 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/Make/options +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/Make/options @@ -1,11 +1,9 @@ EXE_INC = \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lfiniteVolume \ diff --git a/applications/solvers/multiphase/driftFluxFoam/Make/files b/applications/solvers/multiphase/driftFluxFoam/Make/files index 88a3cb1281..234f3f58d4 100644 --- a/applications/solvers/multiphase/driftFluxFoam/Make/files +++ b/applications/solvers/multiphase/driftFluxFoam/Make/files @@ -1,5 +1,5 @@ incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C -compressibleTurbulenceModels.C +compressibleMomentumTransportModels.C driftFluxFoam.C EXE = $(FOAM_APPBIN)/driftFluxFoam diff --git a/applications/solvers/multiphase/driftFluxFoam/Make/options b/applications/solvers/multiphase/driftFluxFoam/Make/options index a92f599820..fe026d96de 100644 --- a/applications/solvers/multiphase/driftFluxFoam/Make/options +++ b/applications/solvers/multiphase/driftFluxFoam/Make/options @@ -5,11 +5,10 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude EXE_LIBS = \ -ldriftFluxTransportModels \ @@ -18,6 +17,5 @@ EXE_LIBS = \ -lmeshTools \ -lsampling \ -lfvOptions \ - -lcompressibleTransportModels \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels diff --git a/applications/solvers/multiphase/driftFluxFoam/UEqn.H b/applications/solvers/multiphase/driftFluxFoam/UEqn.H index e7b0dcc797..85d822055f 100644 --- a/applications/solvers/multiphase/driftFluxFoam/UEqn.H +++ b/applications/solvers/multiphase/driftFluxFoam/UEqn.H @@ -7,7 +7,7 @@ fvm::ddt(rho, U) + fvm::div(rhoPhi, U) + MRF.DDt(rho, U) + fvc::div(UdmModel.tauDm()) - + turbulence->divDevRhoReff(U) + + turbulence->divDevTau(U) == fvOptions(rho, U) ); diff --git a/applications/solvers/multiphase/driftFluxFoam/compressibleTurbulenceModels.C b/applications/solvers/multiphase/driftFluxFoam/compressibleMomentumTransportModels.C similarity index 74% rename from applications/solvers/multiphase/driftFluxFoam/compressibleTurbulenceModels.C rename to applications/solvers/multiphase/driftFluxFoam/compressibleMomentumTransportModels.C index 11b7f7fe14..29cb9f266d 100644 --- a/applications/solvers/multiphase/driftFluxFoam/compressibleTurbulenceModels.C +++ b/applications/solvers/multiphase/driftFluxFoam/compressibleMomentumTransportModels.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,10 +23,10 @@ License \*---------------------------------------------------------------------------*/ -#include "CompressibleTurbulenceModel.H" +#include "CompressibleMomentumTransportModel.H" #include "incompressibleTwoPhaseInteractingMixture.H" #include "addToRunTimeSelectionTable.H" -#include "makeTurbulenceModel.H" +#include "makeMomentumTransportModel.H" #include "laminarModel.H" #include "RASModel.H" @@ -34,44 +34,47 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makeTurbulenceModelTypes +makeMomentumTransportModelTypes ( geometricOneField, volScalarField, - compressibleTurbulenceModel, - CompressibleTurbulenceModel, + compressibleMomentumTransportModel, + CompressibleMomentumTransportModel, incompressibleTwoPhaseInteractingMixture ); -makeBaseTurbulenceModel +makeBaseMomentumTransportModel ( geometricOneField, volScalarField, - compressibleTurbulenceModel, - CompressibleTurbulenceModel, + compressibleMomentumTransportModel, + CompressibleMomentumTransportModel, incompressibleTwoPhaseInteractingMixture ); #define makeLaminarModel(Type) \ - makeTemplatedTurbulenceModel \ + makeTemplatedMomentumTransportModel \ ( \ - incompressibleTwoPhaseInteractingMixtureCompressibleTurbulenceModel, \ + incompressibleTwoPhaseInteractingMixture \ + ##CompressibleMomentumTransportModel, \ laminar, \ Type \ ) #define makeRASModel(Type) \ - makeTemplatedTurbulenceModel \ + makeTemplatedMomentumTransportModel \ ( \ - incompressibleTwoPhaseInteractingMixtureCompressibleTurbulenceModel, \ + incompressibleTwoPhaseInteractingMixture \ + ##CompressibleMomentumTransportModel, \ RAS, \ Type \ ) #define makeLESModel(Type) \ - makeTemplatedTurbulenceModel \ + makeTemplatedMomentumTransportModel \ ( \ - incompressibleTwoPhaseInteractingMixtureCompressibleTurbulenceModel, \ + incompressibleTwoPhaseInteractingMixture \ + ##CompressibleMomentumTransportModel, \ LES, \ Type \ ) diff --git a/applications/solvers/multiphase/driftFluxFoam/createFields.H b/applications/solvers/multiphase/driftFluxFoam/createFields.H index d85ba792ea..5ac579805f 100644 --- a/applications/solvers/multiphase/driftFluxFoam/createFields.H +++ b/applications/solvers/multiphase/driftFluxFoam/createFields.H @@ -77,10 +77,10 @@ autoPtr UdmModelPtr // Construct compressible turbulence model autoPtr < - CompressibleTurbulenceModel + CompressibleMomentumTransportModel > turbulence ( - CompressibleTurbulenceModel + CompressibleMomentumTransportModel ::New(rho, U, rhoPhi, mixture) ); diff --git a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C index a3af71f648..8881fde170 100644 --- a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C +++ b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.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 @@ -38,8 +38,8 @@ Description #include "subCycle.H" #include "incompressibleTwoPhaseInteractingMixture.H" #include "relativeVelocityModel.H" -#include "turbulenceModel.H" -#include "CompressibleTurbulenceModel.H" +#include "momentumTransportModel.H" +#include "CompressibleMomentumTransportModel.H" #include "pimpleControl.H" #include "fvOptions.H" #include "gaussLaplacianScheme.H" diff --git a/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.H b/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.H index cf639547d8..ac8771f6e2 100644 --- a/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.H +++ b/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,8 +37,7 @@ SourceFiles #ifndef incompressibleTwoPhaseInteractingMixture_H #define incompressibleTwoPhaseInteractingMixture_H -#include "compressibleTransportModel.H" -#include "incompressible/viscosityModels/viscosityModel/viscosityModel.H" +#include "viscosityModel.H" #include "mixtureViscosityModel.H" #include "twoPhaseMixture.H" #include "IOdictionary.H" @@ -56,7 +55,6 @@ namespace Foam class incompressibleTwoPhaseInteractingMixture : public IOdictionary, - public compressibleTransportModel, public twoPhaseMixture { protected: diff --git a/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/Make/options b/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/Make/options index 415029e0df..86a25f40e5 100644 --- a/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/Make/options +++ b/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/Make/options @@ -1,9 +1,8 @@ EXE_INC = \ -I../incompressibleTwoPhaseInteractingMixture \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude LIB_LIBS = \ -ltwoPhaseMixture \ diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/Make/options b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/Make/options index 9baf8e7a19..03fbfc7d78 100644 --- a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/Make/options +++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/Make/options @@ -1,9 +1,8 @@ EXE_INC = \ -I../incompressibleTwoPhaseInteractingMixture \ -I../mixtureViscosityModels/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude diff --git a/applications/solvers/multiphase/interFoam/Make/options b/applications/solvers/multiphase/interFoam/Make/options index e9366d55a8..a82a8a5682 100644 --- a/applications/solvers/multiphase/interFoam/Make/options +++ b/applications/solvers/multiphase/interFoam/Make/options @@ -1,12 +1,11 @@ EXE_INC = \ - -I../VoF \ - -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/incompressibleTwoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ @@ -14,8 +13,8 @@ EXE_INC = \ EXE_LIBS = \ -limmiscibleIncompressibleTwoPhaseMixture \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lincompressibleMomentumTransportModels \ -lfiniteVolume \ -ldynamicFvMesh \ -ltopoChangerFvMesh \ diff --git a/applications/solvers/multiphase/interFoam/UEqn.H b/applications/solvers/multiphase/interFoam/UEqn.H index 77d1dcd83e..d6ce1ed4df 100644 --- a/applications/solvers/multiphase/interFoam/UEqn.H +++ b/applications/solvers/multiphase/interFoam/UEqn.H @@ -4,7 +4,7 @@ ( fvm::ddt(rho, U) + fvm::div(rhoPhi, U) + MRF.DDt(rho, U) - + turbulence->divDevRhoReff(rho, U) + + turbulence->divDevTau(rho, U) == fvOptions(rho, U) ); diff --git a/applications/solvers/multiphase/interFoam/createFields.H b/applications/solvers/multiphase/interFoam/createFields.H index dd1f47e8e6..7c0ca261cf 100644 --- a/applications/solvers/multiphase/interFoam/createFields.H +++ b/applications/solvers/multiphase/interFoam/createFields.H @@ -72,9 +72,9 @@ surfaceScalarField rhoPhi // Construct incompressible turbulence model -autoPtr turbulence +autoPtr turbulence ( - incompressible::turbulenceModel::New(U, phi, mixture) + incompressible::momentumTransportModel::New(U, phi, mixture) ); diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C index 68d65c1eeb..6c88a77924 100644 --- a/applications/solvers/multiphase/interFoam/interFoam.C +++ b/applications/solvers/multiphase/interFoam/interFoam.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 @@ -40,7 +40,7 @@ Description #include "CrankNicolsonDdtScheme.H" #include "subCycle.H" #include "immiscibleIncompressibleTwoPhaseMixture.H" -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "pimpleControl.H" #include "fvOptions.H" #include "CorrectPhi.H" diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options index bc2bd05dac..805645e0f3 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options @@ -1,18 +1,17 @@ EXE_INC = \ -I. \ -I.. \ - -I../../VoF \ - -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle \ -IimmiscibleIncompressibleThreePhaseMixture \ -IincompressibleThreePhaseMixture \ -IthreePhaseInterfaceProperties \ - -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ - -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude @@ -20,8 +19,8 @@ EXE_LIBS = \ -ltwoPhaseMixture \ -ltwoPhaseProperties \ -lincompressibleTransportModels \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lincompressibleMomentumTransportModels \ -lfiniteVolume \ -ldynamicFvMesh \ -lmeshTools \ diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H index 7862915150..0e9168c0aa 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H @@ -75,9 +75,9 @@ surfaceScalarField rhoPhi // Construct incompressible turbulence model -autoPtr turbulence +autoPtr turbulence ( - incompressible::turbulenceModel::New(U, phi, mixture) + incompressible::momentumTransportModel::New(U, phi, mixture) ); diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.H b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.H index 7417374839..278debc3d8 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.H +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.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 @@ -34,9 +34,9 @@ SourceFiles #ifndef incompressibleThreePhaseMixture_H #define incompressibleThreePhaseMixture_H -#include "incompressible/transportModel/transportModel.H" +#include "transportModel.H" #include "IOdictionary.H" -#include "incompressible/viscosityModels/viscosityModel/viscosityModel.H" +#include "viscosityModel.H" #include "dimensionedScalar.H" #include "volFields.H" diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C index 71863dfad0..ca2898e563 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.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 @@ -37,7 +37,7 @@ Description #include "localEulerDdtScheme.H" #include "subCycle.H" #include "immiscibleIncompressibleThreePhaseMixture.H" -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "pimpleControl.H" #include "fvOptions.H" #include "CorrectPhi.H" diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/Make/options index 509d511bbd..6a07d632b1 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/Make/options +++ b/applications/solvers/multiphase/interPhaseChangeFoam/Make/options @@ -1,14 +1,13 @@ EXE_INC = \ -I. \ - -I../VoF \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ - -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/incompressibleTwoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \ -IphaseChangeTwoPhaseMixtures/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude @@ -19,8 +18,8 @@ EXE_LIBS = \ -linterfaceProperties \ -ltwoPhaseProperties \ -lincompressibleTransportModels \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lincompressibleMomentumTransportModels \ -lfiniteVolume \ -ldynamicFvMesh \ -ltopoChangerFvMesh \ diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H b/applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H index 622c5a8489..ac127bc731 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H @@ -2,7 +2,7 @@ ( fvm::ddt(rho, U) + fvm::div(rhoPhi, U) - fvm::Sp(fvc::ddt(rho) + fvc::div(rhoPhi), U) - + turbulence->divDevRhoReff(rho, U) + + turbulence->divDevTau(rho, U) == fvOptions(rho, U) ); diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H b/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H index 5838579caf..6f35b4edc3 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H @@ -60,9 +60,9 @@ rho.oldTime(); // Construct incompressible turbulence model -autoPtr turbulence +autoPtr turbulence ( - incompressible::turbulenceModel::New(U, phi, mixture) + incompressible::momentumTransportModel::New(U, phi, mixture) ); diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C index a062a346f5..493525e6ad 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.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 @@ -47,7 +47,7 @@ Description #include "subCycle.H" #include "interfaceProperties.H" #include "phaseChangeTwoPhaseMixture.H" -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "pimpleControl.H" #include "fvOptions.H" #include "CorrectPhi.H" diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/options index b83d5d1d48..90ef926582 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/options +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/options @@ -1,9 +1,9 @@ EXE_INC = \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ - -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/incompressibleTwoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/Make/options index a841d01367..9a8547b64e 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/Make/options @@ -2,12 +2,10 @@ EXE_INC = \ -ImultiphaseSystem/lnInclude \ -ImultiphaseFixedFluxPressure \ -IinterfacialModels/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude @@ -17,8 +15,8 @@ EXE_LIBS = \ -linterfaceProperties \ -lincompressibleTransportModels \ -lcompressibleMultiphaseEulerianInterfacialModels \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lincompressibleMomentumTransportModels \ -lfiniteVolume \ -lfvOptions \ -lmeshTools diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H b/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H index 83637e370c..0ff777fd1c 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/createFields.H @@ -67,9 +67,9 @@ volScalarField rho // Construct incompressible turbulence model -autoPtr turbulence +autoPtr turbulence ( - incompressible::turbulenceModel::New(U, phi, fluid) + incompressible::momentumTransportModel::New(U, phi, fluid) ); diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C index 14db5fdaeb..1613df6f4a 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.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 @@ -36,7 +36,7 @@ Description #include "dragModel.H" #include "heatTransferModel.H" #include "singlePhaseTransportModel.H" -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "pimpleControl.H" #include "IOMRFZoneList.H" #include "CorrectPhi.H" diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/options index b8c50990eb..c6c00b2d3b 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/options @@ -1,9 +1,8 @@ EXE_INC = \ -I../interfacialModels/lnInclude \ -IalphaContactAngle \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H index 041162b9ec..32758f7e31 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H @@ -42,7 +42,7 @@ SourceFiles #ifndef multiphaseSystem_H #define multiphaseSystem_H -#include "incompressible/transportModel/transportModel.H" +#include "transportModel.H" #include "IOdictionary.H" #include "phaseModel.H" #include "PtrDictionary.H" diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Make/options b/applications/solvers/multiphase/multiphaseInterFoam/Make/options index 3b41b5a13b..8ddd48a73c 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/Make/options +++ b/applications/solvers/multiphase/multiphaseInterFoam/Make/options @@ -1,13 +1,12 @@ EXE_INC = \ -I. \ - -I../VoF \ -I../interFoam \ -ImultiphaseMixture/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ @@ -17,8 +16,8 @@ EXE_LIBS = \ -lmultiphaseInterFoam \ -linterfaceProperties \ -lincompressibleTransportModels \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lincompressibleMomentumTransportModels \ -lfiniteVolume \ -ldynamicFvMesh \ -lfvOptions \ diff --git a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H index 201a4def06..a920e87765 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H +++ b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H @@ -45,9 +45,9 @@ volScalarField rho rho.oldTime(); // Construct incompressible turbulence model -autoPtr turbulence +autoPtr turbulence ( - incompressible::turbulenceModel::New(U, phi, mixture) + incompressible::momentumTransportModel::New(U, phi, mixture) ); diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C index a21b41ae3f..bb9d90e026 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.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 @@ -36,7 +36,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "multiphaseMixture.H" -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "pimpleControl.H" #include "fvOptions.H" #include "CorrectPhi.H" diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/Make/options b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/Make/options index f8ffa1cfc7..be24289a0f 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/Make/options +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/Make/options @@ -1,8 +1,7 @@ EXE_INC = \ -IalphaContactAngle \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H index af9f005913..163270e8a5 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H @@ -42,7 +42,7 @@ SourceFiles #ifndef multiphaseMixture_H #define multiphaseMixture_H -#include "incompressible/transportModel/transportModel.H" +#include "transportModel.H" #include "IOdictionary.H" #include "phase.H" #include "PtrDictionary.H" diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.H b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.H index fa72d6b3ae..850e4d41cd 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.H +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.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 @@ -39,7 +39,7 @@ SourceFiles #include "volFields.H" #include "dictionaryEntry.H" -#include "incompressible/viscosityModels/viscosityModel/viscosityModel.H" +#include "viscosityModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options b/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options index a4d71be758..71875b68ed 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options +++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options @@ -1,8 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ @@ -10,8 +9,8 @@ EXE_INC = \ EXE_LIBS = \ -lincompressibleTransportModels \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lincompressibleMomentumTransportModels \ -lfiniteVolume \ -ldynamicFvMesh \ -ltopoChangerFvMesh \ diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/UEqn.H b/applications/solvers/multiphase/potentialFreeSurfaceFoam/UEqn.H index 421e45ae7d..1dd6aeec02 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/UEqn.H +++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/UEqn.H @@ -4,7 +4,7 @@ tmp tUEqn ( fvm::ddt(U) + fvm::div(phi, U) + MRF.DDt(U) - + turbulence->divDevReff(U) + + turbulence->divDevSigma(U) == fvOptions(U) ); diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H b/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H index a9a7807949..c719e07dde 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H +++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H @@ -30,9 +30,9 @@ volVectorField U singlePhaseTransportModel laminarTransport(U, phi); -autoPtr turbulence +autoPtr turbulence ( - incompressible::turbulenceModel::New(U, phi, laminarTransport) + incompressible::momentumTransportModel::New(U, phi, laminarTransport) ); #include "readGravitationalAcceleration.H" diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C index 0cfc3b8776..cb315f1d0d 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C +++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.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 @@ -41,7 +41,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "singlePhaseTransportModel.H" -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "pimpleControl.H" #include "fvOptions.H" #include "CorrectPhi.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/Allwclean b/applications/solvers/multiphase/reactingEulerFoam/Allwclean index fa2a3c55f0..0cc0ffdade 100755 --- a/applications/solvers/multiphase/reactingEulerFoam/Allwclean +++ b/applications/solvers/multiphase/reactingEulerFoam/Allwclean @@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory wclean libso phaseSystems wclean libso interfacialModels wclean libso interfacialCompositionModels -wclean libso phaseCompressibleTurbulenceModels +wclean libso phaseCompressibleMomentumTransportModels wclean libso phaseThermophysicalTransportModels reactingTwoPhaseEulerFoam/Allwclean reactingMultiphaseEulerFoam/Allwclean diff --git a/applications/solvers/multiphase/reactingEulerFoam/Allwmake b/applications/solvers/multiphase/reactingEulerFoam/Allwmake index 311a218f63..0bfc651491 100755 --- a/applications/solvers/multiphase/reactingEulerFoam/Allwmake +++ b/applications/solvers/multiphase/reactingEulerFoam/Allwmake @@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # Run from this directory wmake $targetType phaseSystems wmake $targetType interfacialModels wmake $targetType interfacialCompositionModels -wmake $targetType phaseCompressibleTurbulenceModels +wmake $targetType phaseCompressibleMomentumTransportModels wmake $targetType phaseThermophysicalTransportModels reactingTwoPhaseEulerFoam/Allwmake $targetType $* reactingMultiphaseEulerFoam/Allwmake $targetType $* diff --git a/applications/solvers/multiphase/reactingEulerFoam/functionObjects/Make/options b/applications/solvers/multiphase/reactingEulerFoam/functionObjects/Make/options index 327b3354f8..1da9ca9d33 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/functionObjects/Make/options +++ b/applications/solvers/multiphase/reactingEulerFoam/functionObjects/Make/options @@ -1,7 +1,6 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/functionObjects/field/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \ -I../interfacialModels/lnInclude \ diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options index 15b262e348..061b8032a2 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options @@ -5,11 +5,9 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/options index 1e5f8f0aea..c3bce2a850 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/options +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/options @@ -1,15 +1,12 @@ EXE_INC = \ -I../phaseSystems/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/transportModel \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C index e802b4dd34..43b7816991 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.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 @@ -25,7 +25,7 @@ License #include "Burns.H" #include "phasePair.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" #include "dragModel.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C index 3a0ee811d4..0f83472d16 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.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 @@ -25,7 +25,7 @@ License #include "Gosman.H" #include "phasePair.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" #include "dragModel.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C index 154690b8fd..2fdb678b50 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "LopezDeBertodano.H" #include "phasePair.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C index db3f04578f..35f8a14632 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "constantTurbulentDispersionCoefficient.H" #include "phasePair.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C index fece349e01..0d43c40c3d 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C @@ -28,7 +28,7 @@ License #include "fvcGrad.H" #include "surfaceInterpolate.H" #include "fvcSnGrad.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "BlendedInterfacialModel.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -64,15 +64,18 @@ Foam::turbulentDispersionModel::~turbulentDispersionModel() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -const Foam::phaseCompressibleTurbulenceModel& +const Foam::phaseCompressibleMomentumTransportModel& Foam::turbulentDispersionModel::continuousTurbulence() const { return - pair_.phase1().mesh().lookupObject + pair_.phase1().mesh().lookupObject + < + phaseCompressibleMomentumTransportModel + > ( IOobject::groupName ( - turbulenceModel::typeName, + momentumTransportModel::typeName, pair_.continuous().name() ) ); diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H index 062e103f93..197cb6e678 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H @@ -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 @@ -40,7 +40,7 @@ SourceFiles #include "volFields.H" #include "dictionary.H" #include "runTimeSelectionTables.H" -#include "phaseCompressibleTurbulenceModelFwd.H" +#include "phaseCompressibleMomentumTransportModelFwd.H" namespace Foam { @@ -116,7 +116,8 @@ public: // Member Functions //- Return a reference to the turbulence model for the continuous phase - const phaseCompressibleTurbulenceModel& continuousTurbulence() const; + const phaseCompressibleMomentumTransportModel& + continuousTurbulence() const; //- Turbulent diffusivity // multiplying the gradient of the phase-fraction diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/Make/files b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/Make/files similarity index 97% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/Make/files rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/Make/files index 931cc3826e..a1a24ca10f 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/Make/files +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/Make/files @@ -1,4 +1,4 @@ -phaseCompressibleTurbulenceModels.C +phaseCompressibleMomentumTransportModels.C phasePressureModel/phasePressureModel.C @@ -70,4 +70,4 @@ derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatc derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C -LIB = $(FOAM_LIBBIN)/libphaseReactingTurbulenceModels +LIB = $(FOAM_LIBBIN)/libphaseReactingMomentumTransportModels diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/Make/options similarity index 56% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/Make/options rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/Make/options index 9574f73895..fee6197130 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/Make/options +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/Make/options @@ -2,14 +2,12 @@ EXE_INC = \ -I../phaseSystems/lnInclude \ -I../interfacialModels/lnInclude\ -I../interfacialCompositionModels/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/transportModel \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatFixedDmdtfWallBoilingWallFunction/alphatFixedDmdtfWallBoilingWallFunctionFvPatchScalarField.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C similarity index 97% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C index ee040664fb..5e33a48589 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "alphatPhaseJayatillekeWallFunctionFvPatchScalarField.H" #include "phaseSystem.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -181,10 +181,10 @@ alphatPhaseJayatillekeWallFunctionFvPatchScalarField::calcAlphat const label patchi = patch().index(); // Retrieve turbulence properties from model - const phaseCompressibleTurbulenceModel& turbModel = - db().lookupObject + const phaseCompressibleMomentumTransportModel& turbModel = + db().lookupObject ( - IOobject::groupName(turbulenceModel::typeName, phase.name()) + IOobject::groupName(momentumTransportModel::typeName, phase.name()) ); const nutWallFunctionFvPatchScalarField& nutw = diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C similarity index 97% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C index 441f83ff28..39f77e3bf9 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C @@ -25,8 +25,8 @@ License #include "alphatWallBoilingWallFunctionFvPatchScalarField.H" #include "phaseSystem.H" -#include "compressibleTurbulenceModel.H" -#include "PhaseCompressibleTurbulenceModel.H" +#include "compressibleMomentumTransportModel.H" +#include "PhaseCompressibleMomentumTransportModel.H" #include "saturationModel.H" #include "rhoReactionThermo.H" #include "addToRunTimeSelectionTable.H" @@ -355,21 +355,21 @@ void alphatWallBoilingWallFunctionFvPatchScalarField::updateCoeffs() ) { // Retrieve turbulence properties from models - const phaseCompressibleTurbulenceModel& turbModel = - db().lookupObject + const phaseCompressibleMomentumTransportModel& turbModel = + db().lookupObject ( IOobject::groupName ( - turbulenceModel::typeName, + momentumTransportModel::typeName, liquid.name() ) ); - const phaseCompressibleTurbulenceModel& vaporTurbModel = - db().lookupObject + const phaseCompressibleMomentumTransportModel& vaporTurbModel = + db().lookupObject ( IOobject::groupName ( - turbulenceModel::typeName, + momentumTransportModel::typeName, vapor.name() ) ); diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C similarity index 98% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C index 9d92b70fb2..bc8467b627 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C @@ -28,8 +28,8 @@ License #include "addToRunTimeSelectionTable.H" #include "phaseSystem.H" -#include "compressibleTurbulenceModel.H" -#include "PhaseCompressibleTurbulenceModel.H" +#include "compressibleMomentumTransportModel.H" +#include "PhaseCompressibleMomentumTransportModel.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C similarity index 97% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C index 0f5b3a15fa..0701532098 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.C @@ -26,8 +26,8 @@ License #include "KocamustafaogullariIshiiDepartureDiameter.H" #include "addToRunTimeSelectionTable.H" #include "uniformDimensionedFields.H" -#include "compressibleTurbulenceModel.H" -#include "PhaseCompressibleTurbulenceModel.H" +#include "compressibleMomentumTransportModel.H" +#include "PhaseCompressibleMomentumTransportModel.H" #include "phaseSystem.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshiiDepartureDiameter/KocamustafaogullariIshiiDepartureDiameter.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/newDepartureDiameterModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/newDepartureDiameterModel.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/newDepartureDiameterModel.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/newDepartureDiameterModel.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C similarity index 96% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C index f62656073c..d239e0804c 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C @@ -26,8 +26,8 @@ License #include "Cole.H" #include "addToRunTimeSelectionTable.H" #include "uniformDimensionedFields.H" -#include "compressibleTurbulenceModel.H" -#include "PhaseCompressibleTurbulenceModel.H" +#include "compressibleMomentumTransportModel.H" +#include "PhaseCompressibleMomentumTransportModel.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C similarity index 97% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C index ec4111e1c8..4595a4350a 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.C @@ -26,8 +26,8 @@ License #include "KocamustafaogullariIshiiDepartureFrequency.H" #include "addToRunTimeSelectionTable.H" #include "uniformDimensionedFields.H" -#include "compressibleTurbulenceModel.H" -#include "PhaseCompressibleTurbulenceModel.H" +#include "compressibleMomentumTransportModel.H" +#include "PhaseCompressibleMomentumTransportModel.H" #include "phaseSystem.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/KocamustafaogullariIshiiDepartureFrequency/KocamustafaogullariIshiiDepartureFrequency.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/newDepartureFrequencyModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/newDepartureFrequencyModel.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/newDepartureFrequencyModel.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/newDepartureFrequencyModel.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/KocamustafaogullariIshiiNucleationSite/KocamustafaogullariIshiiNucleationSite.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/newNucleationSiteModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/newNucleationSiteModel.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/newNucleationSiteModel.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/newNucleationSiteModel.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/newPartitioningModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/newPartitioningModel.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/newPartitioningModel.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/newPartitioningModel.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C similarity index 97% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C index acedbc3251..3a3f9ade2e 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -73,7 +73,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel const word& type ) : - eddyViscosity> + eddyViscosity> ( type, alpha, @@ -238,7 +238,7 @@ bool Foam::RASModels::kineticTheoryModel::read() { if ( - eddyViscosity>::read() + eddyViscosity>::read() ) { coeffDict().lookup("equilibrium") >> equilibrium_; @@ -346,7 +346,7 @@ Foam::RASModels::kineticTheoryModel::pPrimef() const Foam::tmp -Foam::RASModels::kineticTheoryModel::devRhoReff() const +Foam::RASModels::kineticTheoryModel::devTau() const { return tmp ( @@ -354,7 +354,7 @@ Foam::RASModels::kineticTheoryModel::devRhoReff() const ( IOobject ( - IOobject::groupName("devRhoReff", U_.group()), + IOobject::groupName("devTau", U_.group()), runTime_.timeName(), mesh_, IOobject::NO_READ, @@ -369,7 +369,7 @@ Foam::RASModels::kineticTheoryModel::devRhoReff() const Foam::tmp -Foam::RASModels::kineticTheoryModel::divDevRhoReff +Foam::RASModels::kineticTheoryModel::divDevTau ( volVectorField& U ) const diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H similarity index 96% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H index d9f51a5967..e502476133 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H @@ -47,7 +47,7 @@ SourceFiles #include "RASModel.H" #include "eddyViscosity.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "phaseModel.H" #include "dragModel.H" #include "viscosityModel.H" @@ -70,7 +70,7 @@ namespace RASModels class kineticTheoryModel : - public eddyViscosity> + public eddyViscosity> { // Private Data @@ -215,10 +215,10 @@ public: virtual tmp pPrimef() const; //- Return the effective stress tensor - virtual tmp devRhoReff() const; + virtual tmp devTau() const; //- Return the source term for the momentum equation - virtual tmp divDevRhoReff(volVectorField& U) const; + virtual tmp divDevTau(volVectorField& U) const; //- Solve the kinetic theory equations and correct the viscosity virtual void correct(); diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H similarity index 100% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/phaseCompressibleMomentumTransportModels.C similarity index 75% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/phaseCompressibleMomentumTransportModels.C index cee127e241..6d79ec2c2f 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/phaseCompressibleMomentumTransportModels.C @@ -23,9 +23,9 @@ License \*---------------------------------------------------------------------------*/ -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" -#include "makeTurbulenceModel.H" +#include "makeMomentumTransportModel.H" #include "laminarModel.H" #include "RASModel.H" @@ -33,35 +33,35 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makeTurbulenceModelTypes +makeMomentumTransportModelTypes ( volScalarField, volScalarField, - compressibleTurbulenceModel, - PhaseCompressibleTurbulenceModel, + compressibleMomentumTransportModel, + PhaseCompressibleMomentumTransportModel, phaseModel ); -makeBaseTurbulenceModel +makeBaseMomentumTransportModel ( volScalarField, volScalarField, - compressibleTurbulenceModel, - PhaseCompressibleTurbulenceModel, + compressibleMomentumTransportModel, + PhaseCompressibleMomentumTransportModel, phaseModel ); #define makeLaminarModel(Type) \ makeTemplatedLaminarModel \ - (phaseModelPhaseCompressibleTurbulenceModel, laminar, Type) + (phaseModelPhaseCompressibleMomentumTransportModel, laminar, Type) #define makeRASModel(Type) \ - makeTemplatedTurbulenceModel \ - (phaseModelPhaseCompressibleTurbulenceModel, RAS, Type) + makeTemplatedMomentumTransportModel \ + (phaseModelPhaseCompressibleMomentumTransportModel, RAS, Type) #define makeLESModel(Type) \ - makeTemplatedTurbulenceModel \ - (phaseModelPhaseCompressibleTurbulenceModel, LES, Type) + makeTemplatedMomentumTransportModel \ + (phaseModelPhaseCompressibleMomentumTransportModel, LES, Type) #include "Stokes.H" makeLaminarModel(Stokes); @@ -85,12 +85,12 @@ makeLESModel(Smagorinsky); makeLESModel(kEqn); #include "kineticTheoryModel.H" -makeTurbulenceModel -(phaseModelPhaseCompressibleTurbulenceModel, RAS, kineticTheoryModel); +makeMomentumTransportModel +(phaseModelPhaseCompressibleMomentumTransportModel, RAS, kineticTheoryModel); #include "phasePressureModel.H" -makeTurbulenceModel -(phaseModelPhaseCompressibleTurbulenceModel, RAS, phasePressureModel); +makeMomentumTransportModel +(phaseModelPhaseCompressibleMomentumTransportModel, RAS, phasePressureModel); // ************************************************************************* // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.C similarity index 94% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.C index bf4b5561bd..e226087da0 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.C @@ -38,7 +38,7 @@ Foam::RASModels::phasePressureModel::phasePressureModel const word& type ) : - eddyViscosity> + eddyViscosity> ( type, alpha, @@ -80,7 +80,8 @@ bool Foam::RASModels::phasePressureModel::read() { if ( - eddyViscosity>::read()) + eddyViscosity> + ::read()) { coeffDict().lookup("alphaMax") >> alphaMax_; coeffDict().lookup("preAlphaExp") >> preAlphaExp_; @@ -196,7 +197,7 @@ Foam::RASModels::phasePressureModel::pPrimef() const Foam::tmp -Foam::RASModels::phasePressureModel::devRhoReff() const +Foam::RASModels::phasePressureModel::devTau() const { return tmp ( @@ -204,7 +205,7 @@ Foam::RASModels::phasePressureModel::devRhoReff() const ( IOobject ( - IOobject::groupName("devRhoReff", U_.group()), + IOobject::groupName("devTau", U_.group()), runTime_.timeName(), mesh_, IOobject::NO_READ, @@ -223,7 +224,7 @@ Foam::RASModels::phasePressureModel::devRhoReff() const Foam::tmp -Foam::RASModels::phasePressureModel::divDevRhoReff +Foam::RASModels::phasePressureModel::divDevTau ( volVectorField& U ) const diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.H similarity index 95% rename from applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.H index cfa6120a54..b96cfa0fac 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.H @@ -53,7 +53,7 @@ SourceFiles #include "RASModel.H" #include "eddyViscosity.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "phaseModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -69,7 +69,7 @@ namespace RASModels class phasePressureModel : - public eddyViscosity> + public eddyViscosity> { // Private Data @@ -157,10 +157,10 @@ public: virtual tmp pPrimef() const; //- Return the effective stress tensor - virtual tmp devRhoReff() const; + virtual tmp devTau() const; //- Return the source term for the momentum equation - virtual tmp divDevRhoReff(volVectorField& U) const; + virtual tmp divDevTau(volVectorField& U) const; //- Solve the kinetic theory equations and correct the viscosity virtual void correct(); diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/Make/options b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/Make/options index dd3cc03747..6f093a2c38 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/Make/options +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/Make/options @@ -1,14 +1,13 @@ EXE_INC = \ -I../interfacialModels/lnInclude \ -I../interfacialCompositionModels/lnInclude \ - -I../phaseCompressibleTurbulenceModels/lnInclude \ + -I../phaseCompressibleMomentumTransportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/combustionModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C index 4341cba256..70f65d615f 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C @@ -25,7 +25,7 @@ License #include "MovingPhaseModel.H" #include "phaseSystem.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "phaseThermophysicalTransportModel.H" #include "fixedValueFvPatchFields.H" #include "slipFvPatchFields.H" @@ -165,7 +165,7 @@ Foam::MovingPhaseModel::MovingPhaseModel divU_(nullptr), turbulence_ ( - phaseCompressibleTurbulenceModel::New + phaseCompressibleMomentumTransportModel::New ( *this, this->thermo().rho(), @@ -265,8 +265,6 @@ template void Foam::MovingPhaseModel::correctEnergyTransport() { BasePhaseModel::correctEnergyTransport(); - - turbulence_->correctEnergyTransport(); thermophysicalTransport_->correct(); } @@ -291,7 +289,7 @@ Foam::MovingPhaseModel::UEqn() + fvm::div(alphaRhoPhi_, U_) + fvm::SuSp(-this->continuityError(), U_) + this->fluid().MRF().DDt(alpha*rho, U_) - + turbulence_->divDevRhoReff(U_) + + turbulence_->divDevTau(U_) ); } @@ -310,7 +308,7 @@ Foam::MovingPhaseModel::UfEqn() fvm::div(alphaRhoPhi_, U_) + fvm::SuSp(fvc::ddt(*this, rho) - this->continuityError(), U_) + this->fluid().MRF().DDt(alpha*rho, U_) - + turbulence_->divDevRhoReff(U_) + + turbulence_->divDevTau(U_) ); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H index b370de1ba6..234af18287 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H @@ -45,7 +45,7 @@ SourceFiles #define MovingPhaseModel_H #include "phaseModel.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "phaseThermophysicalTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -88,7 +88,7 @@ protected: tmp divU_; //- Turbulence model - autoPtr turbulence_; + autoPtr turbulence_; //- Thermophysical transport model autoPtr thermophysicalTransport_; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleMomentumTransportModel.H similarity index 77% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModel.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleMomentumTransportModel.H index 02d7bb41e3..71cecaf441 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleMomentumTransportModel.H @@ -22,26 +22,26 @@ License along with OpenFOAM. If not, see . Typedef - Foam::phaseCompressibleTurbulenceModel + Foam::phaseCompressibleMomentumTransportModel Description - Typedef for phaseCompressibleTurbulenceModel + Typedef for phaseCompressibleMomentumTransportModel \*---------------------------------------------------------------------------*/ -#ifndef phaseCompressibleTurbulenceModel_H -#define phaseCompressibleTurbulenceModel_H +#ifndef phaseCompressibleMomentumTransportModel_H +#define phaseCompressibleMomentumTransportModel_H -#include "phaseCompressibleTurbulenceModelFwd.H" -#include "PhaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModelFwd.H" +#include "PhaseCompressibleMomentumTransportModel.H" #include "phaseModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - typedef PhaseCompressibleTurbulenceModel - phaseCompressibleTurbulenceModel; + typedef PhaseCompressibleMomentumTransportModel + phaseCompressibleMomentumTransportModel; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModelFwd.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleMomentumTransportModelFwd.H similarity index 79% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModelFwd.H rename to applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleMomentumTransportModelFwd.H index 189a64fdfa..c3c607f42e 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModelFwd.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleMomentumTransportModelFwd.H @@ -22,15 +22,15 @@ License along with OpenFOAM. If not, see . Typedef - Foam::phaseCompressibleTurbulenceModel + Foam::phaseCompressibleMomentumTransportModel Description - Forward declaration of typedef for phaseCompressibleTurbulenceModel + Forward declaration of typedef for phaseCompressibleMomentumTransportModel \*---------------------------------------------------------------------------*/ -#ifndef phaseCompressibleTurbulenceModelFwd_H -#define phaseCompressibleTurbulenceModelFwd_H +#ifndef phaseCompressibleMomentumTransportModelFwd_H +#define phaseCompressibleMomentumTransportModelFwd_H // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -39,10 +39,10 @@ namespace Foam class phaseModel; template - class PhaseCompressibleTurbulenceModel; + class PhaseCompressibleMomentumTransportModel; - typedef PhaseCompressibleTurbulenceModel - phaseCompressibleTurbulenceModel; + typedef PhaseCompressibleMomentumTransportModel + phaseCompressibleMomentumTransportModel; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseThermophysicalTransportModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseThermophysicalTransportModel.H index 3410668ddd..d338aa509f 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseThermophysicalTransportModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseThermophysicalTransportModel.H @@ -33,7 +33,7 @@ Description #define phaseThermophysicalTransportModel_H #include "PhaseThermophysicalTransportModel.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -41,7 +41,7 @@ namespace Foam { typedef PhaseThermophysicalTransportModel < - phaseCompressibleTurbulenceModel + phaseCompressibleMomentumTransportModel > phaseThermophysicalTransportModel; } diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H index bd85748ad1..f16a6719f0 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H @@ -38,7 +38,7 @@ SourceFiles #include "surfaceFields.H" #include "fvMatricesFwd.H" #include "rhoThermo.H" -#include "phaseCompressibleTurbulenceModelFwd.H" +#include "phaseCompressibleMomentumTransportModelFwd.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C index 917f00d0a1..cd9d3fbc4c 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "LehrMilliesMewes.H" #include "addToRunTimeSelectionTable.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "mathematicalConstants.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C index 3aaa762cac..ad89b4aff9 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "LuoSvendsen.H" #include "addToRunTimeSelectionTable.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "linearInterpolationWeights.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C index 355f217e8b..156b7174f6 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C @@ -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 @@ -25,7 +25,7 @@ License #include "LaakkonenAlopaeusAittamaa.H" #include "addToRunTimeSelectionTable.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C index 705aa95fc6..a6821406e4 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C @@ -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 @@ -25,7 +25,7 @@ License #include "CoulaloglouTavlaridesCoalescence.H" #include "addToRunTimeSelectionTable.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C index 536cf497ff..63f5e4fbc9 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,7 +26,7 @@ License #include "LehrMilliesMewesCoalescence.H" #include "addToRunTimeSelectionTable.H" #include "mathematicalConstants.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C index 3894d833f4..e137eb117e 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,7 +26,7 @@ License #include "Luo.H" #include "addToRunTimeSelectionTable.H" #include "mathematicalConstants.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "virtualMassModel.H" #include "phaseSystem.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C index 7200a3cdc3..3033f6899e 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C @@ -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 @@ -26,7 +26,7 @@ License #include "PrinceBlanch.H" #include "addToRunTimeSelectionTable.H" #include "mathematicalConstants.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "fvcGrad.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.C index e7a4278418..a83626bcbe 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "turbulentShear.H" #include "addToRunTimeSelectionTable.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C index 9ca04bae9b..031fb3768a 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C @@ -36,7 +36,7 @@ License #include "fvmSup.H" #include "fvcSup.H" #include "fvcDiv.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "shapeModel.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -1237,15 +1237,15 @@ Foam::diameterModels::populationBalanceModel::sigmaWithContinuousPhase } -const Foam::phaseCompressibleTurbulenceModel& +const Foam::phaseCompressibleMomentumTransportModel& Foam::diameterModels::populationBalanceModel::continuousTurbulence() const { return - mesh_.lookupObject + mesh_.lookupObject ( IOobject::groupName ( - turbulenceModel::typeName, + momentumTransportModel::typeName, continuousPhase_.name() ) ); diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H index b41ff3f1b4..94808a0143 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -152,7 +152,7 @@ SourceFiles #include "sizeGroup.H" #include "phasePair.H" #include "pimpleControl.H" -#include "phaseCompressibleTurbulenceModelFwd.H" +#include "phaseCompressibleMomentumTransportModelFwd.H" #include "HashPtrTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -450,7 +450,8 @@ public: ) const; //- Return reference to turbulence model of the continuous phase - const phaseCompressibleTurbulenceModel& continuousTurbulence() const; + const phaseCompressibleMomentumTransportModel& + continuousTurbulence() const; //- Solve the population balance equation void solve(); diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseThermophysicalTransportModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/phaseThermophysicalTransportModels/Make/options index f99d16456f..733d5aa5c1 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseThermophysicalTransportModels/Make/options +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseThermophysicalTransportModels/Make/options @@ -2,18 +2,16 @@ EXE_INC = \ -I../phaseSystems/lnInclude \ -I../interfacialModels/lnInclude\ -I../interfacialCompositionModels/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/transportModel \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ - -lphaseReactingTurbulenceModels \ + -lphaseReactingMomentumTransportModels \ -lthermophysicalTransportModels diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseThermophysicalTransportModels/phaseThermophysicalTransportModels.C b/applications/solvers/multiphase/reactingEulerFoam/phaseThermophysicalTransportModels/phaseThermophysicalTransportModels.C index 9109db897b..dea583c143 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseThermophysicalTransportModels/phaseThermophysicalTransportModels.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseThermophysicalTransportModels/phaseThermophysicalTransportModels.C @@ -25,7 +25,7 @@ License #include "PhaseThermophysicalTransportModel.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" #include "makeThermophysicalTransportModel.H" @@ -38,14 +38,14 @@ License makeThermophysicalTransportModelTypes ( PhaseThermophysicalTransportModel, - phaseCompressibleTurbulenceModel + phaseCompressibleMomentumTransportModel ); makeThermophysicalTransportModel ( PhaseThermophysicalTransportModel, - phaseCompressibleTurbulenceModel + phaseCompressibleMomentumTransportModel ); @@ -53,7 +53,7 @@ makeThermophysicalTransportModel makeTemplatedThermophysicalTransportModel \ ( \ PhaseThermophysicalTransportModel, \ - phaseCompressibleTurbulenceModel, \ + phaseCompressibleMomentumTransportModel, \ laminar, \ Type \ ) @@ -62,7 +62,7 @@ makeThermophysicalTransportModel makeTemplatedThermophysicalTransportModel \ ( \ PhaseThermophysicalTransportModel, \ - phaseCompressibleTurbulenceModel, \ + phaseCompressibleMomentumTransportModel, \ RAS, \ Type \ ) @@ -71,7 +71,7 @@ makeThermophysicalTransportModel makeTemplatedThermophysicalTransportModel \ ( \ PhaseThermophysicalTransportModel, \ - phaseCompressibleTurbulenceModel, \ + phaseCompressibleMomentumTransportModel, \ LES, \ Type \ ) diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options index 8acb5d61c0..0005c14230 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Make/options @@ -5,10 +5,9 @@ EXE_INC = \ -I../interfacialModels/lnInclude \ -I../interfacialCompositionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude @@ -18,7 +17,7 @@ EXE_LIBS = \ -lreactingMultiphaseSystem \ -lreactingEulerianInterfacialModels \ -lreactingEulerianInterfacialCompositionModels \ - -lphaseReactingTurbulenceModels \ + -lphaseReactingMomentumTransportModels \ -lphaseReactingTherophysicalTransportModels \ -lthermophysicalTransportModels \ -lfiniteVolume \ diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options index feb07d86a5..3396272cce 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/Make/options @@ -2,15 +2,14 @@ EXE_INC = \ -I../../interfacialModels/lnInclude \ -I../../interfacialCompositionModels/lnInclude \ -I../../phaseSystems/lnInclude \ - -I../../phaseCompressibleTurbulenceModels/lnInclude \ + -I../../phaseCompressibleMomentumTransportModels/lnInclude \ -IalphaContactAngle \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/combustionModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C index 3dd55ccd4c..729aa4fe2a 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C @@ -35,7 +35,7 @@ Description #include "fvCFD.H" #include "multiphaseSystem.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "pimpleControl.H" #include "localEulerDdtScheme.H" #include "fvcSmooth.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwclean b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwclean index 2d0f2fde9e..20b40a9e12 100755 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwclean +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwclean @@ -2,7 +2,7 @@ cd ${0%/*} || exit 1 # Run from this directory wclean libso twoPhaseSystem -wclean libso twoPhaseCompressibleTurbulenceModels +wclean libso twoPhaseCompressibleMomentumTransportModels wclean #------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake index 49c983288e..360201affa 100755 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake @@ -5,7 +5,7 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments wmake $targetType twoPhaseSystem -wmake $targetType twoPhaseCompressibleTurbulenceModels +wmake $targetType twoPhaseCompressibleMomentumTransportModels wmake $targetType #------------------------------------------------------------------------------ diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options index dbf0a2c702..c0bb663f03 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Make/options @@ -5,10 +5,9 @@ EXE_INC = \ -I../interfacialModels/lnInclude \ -I../interfacialCompositionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude @@ -18,9 +17,9 @@ EXE_LIBS = \ -lreactingTwoPhaseSystem \ -lreactingEulerianInterfacialModels \ -lreactingEulerianInterfacialCompositionModels \ - -lphaseReactingTurbulenceModels \ + -lphaseReactingMomentumTransportModels \ -lphaseReactingTherophysicalTransportModels \ - -ltwoPhaseReactingTurbulenceModels \ + -ltwoPhaseReactingMomentumTransportModels \ -lthermophysicalTransportModels \ -lfiniteVolume \ -lfvOptions \ diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C index fff2b9eb97..feab05e8b3 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C @@ -35,7 +35,7 @@ Description #include "fvCFD.H" #include "twoPhaseSystem.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "pimpleControl.H" #include "localEulerDdtScheme.H" #include "fvcSmooth.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleMomentumTransportModels/Make/files b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleMomentumTransportModels/Make/files new file mode 100644 index 0000000000..580c246732 --- /dev/null +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleMomentumTransportModels/Make/files @@ -0,0 +1,3 @@ +twoPhaseCompressibleMomentumTransportModels.C + +LIB = $(FOAM_LIBBIN)/libtwoPhaseReactingMomentumTransportModels diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleMomentumTransportModels/Make/options similarity index 63% rename from applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleMomentumTransportModels/Make/options index 1b997f032c..784006d189 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/options +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleMomentumTransportModels/Make/options @@ -3,12 +3,10 @@ EXE_INC = \ -I../../phaseSystems/lnInclude \ -I../../interfacialModels/lnInclude\ -I../../interfacialCompositionModels/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/transportModel \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/twoPhaseCompressibleTurbulenceModels.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleMomentumTransportModels/twoPhaseCompressibleMomentumTransportModels.C similarity index 80% rename from applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/twoPhaseCompressibleTurbulenceModels.C rename to applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleMomentumTransportModels/twoPhaseCompressibleMomentumTransportModels.C index 6a51e1e202..8dfa3238c2 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/twoPhaseCompressibleTurbulenceModels.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleMomentumTransportModels/twoPhaseCompressibleMomentumTransportModels.C @@ -23,9 +23,9 @@ License \*---------------------------------------------------------------------------*/ -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" -#include "makeTurbulenceModel.H" +#include "makeMomentumTransportModel.H" #include "laminarModel.H" #include "RASModel.H" @@ -33,26 +33,26 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makeTurbulenceModelTypes +makeMomentumTransportModelTypes ( volScalarField, volScalarField, - compressibleTurbulenceModel, - PhaseCompressibleTurbulenceModel, + compressibleMomentumTransportModel, + PhaseCompressibleMomentumTransportModel, phaseModel ); #define makeLaminarModel(Type) \ makeTemplatedLaminarModel \ - (phaseModelPhaseCompressibleTurbulenceModel, laminar, Type) + (phaseModelPhaseCompressibleMomentumTransportModel, laminar, Type) #define makeRASModel(Type) \ - makeTemplatedTurbulenceModel \ - (phaseModelPhaseCompressibleTurbulenceModel, RAS, Type) + makeTemplatedMomentumTransportModel \ + (phaseModelPhaseCompressibleMomentumTransportModel, RAS, Type) #define makeLESModel(Type) \ - makeTemplatedTurbulenceModel \ - (phaseModelPhaseCompressibleTurbulenceModel, LES, Type) + makeTemplatedMomentumTransportModel \ + (phaseModelPhaseCompressibleMomentumTransportModel, LES, Type) #include "mixtureKEpsilon.H" makeRASModel(mixtureKEpsilon); diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/files b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/files deleted file mode 100644 index 962935b6fd..0000000000 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -twoPhaseCompressibleTurbulenceModels.C - -LIB = $(FOAM_LIBBIN)/libtwoPhaseReactingTurbulenceModels diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options index e30d07519e..e2791568d2 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/Make/options @@ -2,15 +2,14 @@ EXE_INC = \ -I../../interfacialModels/lnInclude \ -I../../interfacialCompositionModels/lnInclude \ -I../../phaseSystems/lnInclude \ - -I../../phaseCompressibleTurbulenceModels/lnInclude \ - -I../twoPhaseCompressibleTurbulenceModels/lnInclude \ + -I../../phaseCompressibleMomentumTransportModels/lnInclude \ + -I../twoPhaseCompressibleMomentumTransportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/combustionModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C index ac3aed80cb..0b77e1741c 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.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 @@ -25,7 +25,7 @@ License #include "IATEsource.H" #include "fvMatrix.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "uniformDimensionedFields.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options index e9549744ce..2249ddf0ee 100644 --- a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options +++ b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options @@ -1,19 +1,18 @@ EXE_INC = \ -I. \ - -I../VoF \ - -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/incompressibleTwoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -ltwoPhaseMixture \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ + -lincompressibleTwoPhaseMixture \ + -lmomentumTransportModels \ + -lincompressibleMomentumTransportModels \ -lfiniteVolume \ -lfvOptions \ -lmeshTools diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H b/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H index 7afd323dd0..dbc6043545 100644 --- a/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H +++ b/applications/solvers/multiphase/twoLiquidMixingFoam/UEqn.H @@ -2,7 +2,7 @@ ( fvm::ddt(rho, U) + fvm::div(rhoPhi, U) - + turbulence->divDevRhoReff(rho, U) + + turbulence->divDevTau(rho, U) ); UEqn.relax(); diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H index c38f7e2959..44bceec6e1 100644 --- a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H +++ b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H @@ -64,9 +64,9 @@ surfaceScalarField rhoPhi ); // Construct incompressible turbulence model -autoPtr turbulence +autoPtr turbulence ( - incompressible::turbulenceModel::New(U, phi, mixture) + incompressible::momentumTransportModel::New(U, phi, mixture) ); diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C index ff2406a287..5b4cc63b42 100644 --- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C +++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.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 @@ -35,7 +35,7 @@ Description #include "MULES.H" #include "subCycle.H" #include "incompressibleTwoPhaseMixture.H" -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean index bf154ca7ce..d781ff3b19 100755 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwclean @@ -3,7 +3,7 @@ cd ${0%/*} || exit 1 # Run from this directory wclean libso twoPhaseSystem wclean libso interfacialModels -wclean libso phaseCompressibleTurbulenceModels +wclean libso phaseCompressibleMomentumTransportModels wclean libso phaseThermophysicalTransportModels wclean diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake index 3414cc4d5b..d5088a2c79 100755 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake @@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory wmake $targetType twoPhaseSystem wmake $targetType interfacialModels -wmake $targetType phaseCompressibleTurbulenceModels +wmake $targetType phaseCompressibleMomentumTransportModels wmake $targetType phaseThermophysicalTransportModels wmake $targetType diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options index c443d63f15..56de56dbc2 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options @@ -1,11 +1,9 @@ EXE_INC = \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ - -IphaseCompressibleTurbulenceModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ + -IphaseCompressibleMomentumTransportModels/lnInclude \ -IinterfacialModels/lnInclude \ -ItwoPhaseSystem/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -13,12 +11,11 @@ EXE_INC = \ -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ - -lturbulenceModels \ - -lphaseCompressibleTurbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lphaseCompressibleMomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lthermophysicalTransportModels \ -lincompressibleTransportModels \ -lcompressibleTwoPhaseSystem \ diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/options index ff6d9b0ef0..864ed03af8 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/options +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/Make/options @@ -1,16 +1,13 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/transportModel \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ -I../twoPhaseSystem/lnInclude LIB_LIBS = \ -lcompressibleTwoPhaseSystem \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C index 96a227fc4d..f1c17e660d 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "Burns.H" #include "phasePair.H" -#include "PhaseCompressibleTurbulenceModel.H" +#include "PhaseCompressibleMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" #include "dragModel.H" diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C index ed776691c1..9d6829c6ef 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "Gosman.H" #include "phasePair.H" -#include "PhaseCompressibleTurbulenceModel.H" +#include "PhaseCompressibleMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" #include "dragModel.H" diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C index f56942af72..7e65485c24 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "LopezDeBertodano.H" #include "phasePair.H" -#include "PhaseCompressibleTurbulenceModel.H" +#include "PhaseCompressibleMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C index e8071d9ef2..71abaca323 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "constantTurbulentDispersionCoefficient.H" #include "phasePair.H" -#include "PhaseCompressibleTurbulenceModel.H" +#include "PhaseCompressibleMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pU/UEqns.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pU/UEqns.H index bc8ad0f556..051ea5f814 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/pU/UEqns.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pU/UEqns.H @@ -18,7 +18,7 @@ volScalarField Kd(fluid.Kd()); fvm::ddt(alpha1, rho1, U1) + fvm::div(alphaRhoPhi1, U1) - fvm::Sp(contErr1, U1) + MRF.DDt(alpha1*rho1 + Vm, U1) - + phase1.turbulence().divDevRhoReff(U1) + + phase1.turbulence().divDevTau(U1) == - Vm *( @@ -42,7 +42,7 @@ volScalarField Kd(fluid.Kd()); fvm::ddt(alpha2, rho2, U2) + fvm::div(alphaRhoPhi2, U2) - fvm::Sp(contErr2, U2) + MRF.DDt(alpha2*rho2 + Vm, U2) - + phase2.turbulence().divDevRhoReff(U2) + + phase2.turbulence().divDevTau(U2) == - Vm *( diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/UEqns.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/UEqns.H index 0f46ae5b85..f22e309c71 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/UEqns.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/UEqns.H @@ -28,7 +28,7 @@ fvVectorMatrix U2Eqn(U2, rho2.dimensions()*U2.dimensions()*dimVol/dimTime); ( fvm::div(alphaRhoPhi1, U1) - fvm::Sp(fvc::div(alphaRhoPhi1), U1) + MRF.DDt(alpha1*rho1, U1) - + phase1.turbulence().divDevRhoReff(U1) + + phase1.turbulence().divDevTau(U1) + Vm*(UgradU1 - (UgradU2 & U2)) - fvOptions(alpha1, rho1, U1) ); @@ -43,7 +43,7 @@ fvVectorMatrix U2Eqn(U2, rho2.dimensions()*U2.dimensions()*dimVol/dimTime); ( fvm::div(alphaRhoPhi2, U2) - fvm::Sp(fvc::div(alphaRhoPhi2), U2) + MRF.DDt(alpha2*rho2, U2) - + phase2.turbulence().divDevRhoReff(U2) + + phase2.turbulence().divDevTau(U2) + Vm*(UgradU2 - (UgradU1 & U1)) - fvOptions(alpha2, rho2, U2) ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/files b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/Make/files similarity index 95% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/files rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/Make/files index f6510d618c..b6fd9c1a53 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/files +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/Make/files @@ -1,4 +1,4 @@ -phaseCompressibleTurbulenceModels.C +phaseCompressibleMomentumTransportModels.C phasePressureModel/phasePressureModel.C kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -36,4 +36,4 @@ kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJackson kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C -LIB = $(FOAM_LIBBIN)/libphaseCompressibleTurbulenceModels +LIB = $(FOAM_LIBBIN)/libphaseCompressibleMomentumTransportModels diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/Make/options similarity index 57% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/Make/options index c4176c1eea..ca437f1f29 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/Make/options +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/Make/options @@ -1,12 +1,10 @@ EXE_INC = \ -I../twoPhaseSystem/lnInclude \ -I../interfacialModels/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/transportModel \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude @@ -14,8 +12,8 @@ LIB_LIBS = \ -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lincompressibleTransportModels \ -lcompressibleTwoPhaseSystem \ -lcompressibleEulerianInterfacialModels \ diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C index 56b1ebd8e5..9d7c706b19 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H index 6928db95da..bd5846013a 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C similarity index 98% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C index 413c6de433..59b92d87a4 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H index 04bbf7583b..1795d07d5c 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C index 885bf85722..36ad3d2b67 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H index 38e6baebd6..75f2e8cd6a 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C similarity index 96% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C index a5d8477319..d50703def8 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H similarity index 98% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H index f78b7297db..dad6d78431 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C index 21e20a830a..9a8c6324b2 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H similarity index 98% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H index 4c1be9d173..3a4bd76c37 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.H @@ -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 diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C similarity index 100% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H similarity index 98% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H index 09a96f332f..3f0da18966 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.H @@ -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 diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C similarity index 98% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C index 305bc1a01f..083d2955c3 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H similarity index 98% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H index 39f6460a06..7641560903 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C similarity index 98% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C index e0a8e9c9ef..0829e4fb21 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C @@ -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 diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H similarity index 98% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H index 362382655d..dfc177d45d 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C similarity index 98% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C index 70dd79e623..c05e5a7f4e 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H similarity index 98% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H index 3c9192ccb2..fca2efe8a1 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C similarity index 96% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C index e90a3bdaa9..1a1659c474 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H similarity index 98% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H index 27e21f1f37..9ee134af6f 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C index 8b0e6ab683..981ef36ccc 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C index 9fdeab089e..7fb213ab98 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H index 3b73419e7d..71b8e3a892 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C index 1527c8729c..144daec324 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H index 1dbddd3ccf..12397b7d0c 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C similarity index 96% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C index 1623a6f85f..37fd91f9c7 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H similarity index 98% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H index 7989e8ed4a..14a0d70194 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C index 354053e065..07440f7241 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C index 71e627c8b9..0ddb206128 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -37,11 +37,11 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& phase, + const phaseModel& phase, const word& type ) : - eddyViscosity> + eddyViscosity> ( type, alpha, @@ -201,7 +201,7 @@ bool Foam::RASModels::kineticTheoryModel::read() { if ( - eddyViscosity>::read() + eddyViscosity>::read() ) { coeffDict().lookup("equilibrium") >> equilibrium_; @@ -299,11 +299,11 @@ Foam::RASModels::kineticTheoryModel::pPrimef() const Foam::tmp -Foam::RASModels::kineticTheoryModel::devRhoReff() const +Foam::RASModels::kineticTheoryModel::devTau() const { return volSymmTensorField::New ( - IOobject::groupName("devRhoReff", U_.group()), + IOobject::groupName("devTau", U_.group()), - (rho_*nut_) *dev(twoSymm(fvc::grad(U_))) - ((rho_*lambda_)*fvc::div(phi_))*symmTensor::I @@ -312,7 +312,7 @@ Foam::RASModels::kineticTheoryModel::devRhoReff() const Foam::tmp -Foam::RASModels::kineticTheoryModel::divDevRhoReff +Foam::RASModels::kineticTheoryModel::divDevTau ( volVectorField& U ) const diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H similarity index 96% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H index 4593ecb93d..4196648aca 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H @@ -47,7 +47,7 @@ SourceFiles #include "RASModel.H" #include "eddyViscosity.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "phaseModel.H" #include "dragModel.H" #include "viscosityModel.H" @@ -70,7 +70,7 @@ namespace RASModels class kineticTheoryModel : - public eddyViscosity> + public eddyViscosity> { // Private Data @@ -207,10 +207,10 @@ public: virtual tmp pPrimef() const; //- Return the effective stress tensor - virtual tmp devRhoReff() const; + virtual tmp devTau() const; //- Return the source term for the momentum equation - virtual tmp divDevRhoReff(volVectorField& U) const; + virtual tmp divDevTau(volVectorField& U) const; //- Solve the kinetic theory equations and correct the viscosity virtual void correct(); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C index 3828d61532..117d5159c0 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H index 21243defde..ef8cf03774 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C index 8c84019164..57f2f98287 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H index 96e7265ae1..72b234971c 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C index 280ae07eba..bb690f147c 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H index 14d11fdfaf..e00469aec6 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C index 72aaf27e3f..0a57e62379 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/newRadialModel.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.C similarity index 96% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.C index 5749b11aec..5ec4a31a6b 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.H similarity index 98% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.H index c69406ec44..e20f51345a 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/radialModel/radialModel/radialModel.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C index 7a960862c5..a925bf8a86 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H index 4f25b6b015..8f4143d179 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C similarity index 98% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C index 7f876538d8..dae043156e 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H index be62b2ac56..fde3e04283 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C index 4c08aa33cf..a5aa5fb4ae 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H index b494314fe5..0d9b819dc1 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C index ba4b963427..3e267d6ec8 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H index 63a7a5decc..a37f59d606 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C similarity index 97% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C index bb08671143..cd98323d50 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/newViscosityModel.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C similarity index 96% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C index c008c2449c..66047a1abd 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.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/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H similarity index 98% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H index 76f731ba8a..e11d0590b5 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.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/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/phaseCompressibleMomentumTransportModel.H similarity index 77% rename from applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/phaseCompressibleMomentumTransportModel.H index 02d7bb41e3..71cecaf441 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/phaseCompressibleMomentumTransportModel.H @@ -22,26 +22,26 @@ License along with OpenFOAM. If not, see . Typedef - Foam::phaseCompressibleTurbulenceModel + Foam::phaseCompressibleMomentumTransportModel Description - Typedef for phaseCompressibleTurbulenceModel + Typedef for phaseCompressibleMomentumTransportModel \*---------------------------------------------------------------------------*/ -#ifndef phaseCompressibleTurbulenceModel_H -#define phaseCompressibleTurbulenceModel_H +#ifndef phaseCompressibleMomentumTransportModel_H +#define phaseCompressibleMomentumTransportModel_H -#include "phaseCompressibleTurbulenceModelFwd.H" -#include "PhaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModelFwd.H" +#include "PhaseCompressibleMomentumTransportModel.H" #include "phaseModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - typedef PhaseCompressibleTurbulenceModel - phaseCompressibleTurbulenceModel; + typedef PhaseCompressibleMomentumTransportModel + phaseCompressibleMomentumTransportModel; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/phaseCompressibleMomentumTransportModelFwd.H similarity index 79% rename from applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/phaseCompressibleMomentumTransportModelFwd.H index da2c08808c..18d0365849 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleTurbulenceModelFwd.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/phaseCompressibleMomentumTransportModelFwd.H @@ -22,15 +22,15 @@ License along with OpenFOAM. If not, see . Typedef - Foam::phaseCompressibleTurbulenceModel + Foam::phaseCompressibleMomentumTransportModel Description - Forward declaration of typedef for phaseCompressibleTurbulenceModel + Forward declaration of typedef for phaseCompressibleMomentumTransportModel \*---------------------------------------------------------------------------*/ -#ifndef phaseCompressibleTurbulenceModelFwd_H -#define phaseCompressibleTurbulenceModelFwd_H +#ifndef phaseCompressibleMomentumTransportModelFwd_H +#define phaseCompressibleMomentumTransportModelFwd_H // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -39,10 +39,10 @@ namespace Foam class phaseModel; template - class PhaseCompressibleTurbulenceModel; + class PhaseCompressibleMomentumTransportModel; - typedef PhaseCompressibleTurbulenceModel - phaseCompressibleTurbulenceModel; + typedef PhaseCompressibleMomentumTransportModel + phaseCompressibleMomentumTransportModel; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/phaseCompressibleMomentumTransportModels.C similarity index 77% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/phaseCompressibleMomentumTransportModels.C index 6f0ccee8dd..5b9cffe1c6 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/phaseCompressibleMomentumTransportModels.C @@ -23,11 +23,11 @@ License \*---------------------------------------------------------------------------*/ -#include "PhaseCompressibleTurbulenceModel.H" +#include "PhaseCompressibleMomentumTransportModel.H" #include "phaseModel.H" #include "twoPhaseSystem.H" #include "addToRunTimeSelectionTable.H" -#include "makeTurbulenceModel.H" +#include "makeMomentumTransportModel.H" #include "laminarModel.H" #include "RASModel.H" @@ -35,35 +35,35 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makeTurbulenceModelTypes +makeMomentumTransportModelTypes ( volScalarField, volScalarField, - compressibleTurbulenceModel, - PhaseCompressibleTurbulenceModel, + compressibleMomentumTransportModel, + PhaseCompressibleMomentumTransportModel, phaseModel ); -makeBaseTurbulenceModel +makeBaseMomentumTransportModel ( volScalarField, volScalarField, - compressibleTurbulenceModel, - PhaseCompressibleTurbulenceModel, + compressibleMomentumTransportModel, + PhaseCompressibleMomentumTransportModel, phaseModel ); #define makeLaminarModel(Type) \ makeTemplatedLaminarModel \ - (phaseModelPhaseCompressibleTurbulenceModel, laminar, Type) + (phaseModelPhaseCompressibleMomentumTransportModel, laminar, Type) #define makeRASModel(Type) \ - makeTemplatedTurbulenceModel \ - (phaseModelPhaseCompressibleTurbulenceModel, RAS, Type) + makeTemplatedMomentumTransportModel \ + (phaseModelPhaseCompressibleMomentumTransportModel, RAS, Type) #define makeLESModel(Type) \ - makeTemplatedTurbulenceModel \ - (phaseModelPhaseCompressibleTurbulenceModel, LES, Type) + makeTemplatedMomentumTransportModel \ + (phaseModelPhaseCompressibleMomentumTransportModel, LES, Type) #include "Stokes.H" makeLaminarModel(Stokes); @@ -99,11 +99,11 @@ makeLESModel(NicenoKEqn); makeLESModel(continuousGasKEqn); #include "kineticTheoryModel.H" -makeTurbulenceModel -(phaseModelPhaseCompressibleTurbulenceModel, RAS, kineticTheoryModel); +makeMomentumTransportModel +(phaseModelPhaseCompressibleMomentumTransportModel, RAS, kineticTheoryModel); #include "phasePressureModel.H" -makeTurbulenceModel -(phaseModelPhaseCompressibleTurbulenceModel, RAS, phasePressureModel); +makeMomentumTransportModel +(phaseModelPhaseCompressibleMomentumTransportModel, RAS, phasePressureModel); // ************************************************************************* // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.C similarity index 92% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.C index ceda0040f8..91709e0340 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.C @@ -35,11 +35,11 @@ Foam::RASModels::phasePressureModel::phasePressureModel const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& phase, + const phaseModel& phase, const word& type ) : - eddyViscosity>> + eddyViscosity>> ( type, alpha, @@ -81,8 +81,10 @@ bool Foam::RASModels::phasePressureModel::read() { if ( - eddyViscosity>> - ::read() + eddyViscosity + < + RASModel> + >::read() ) { coeffDict().lookup("alphaMax") >> alphaMax_; @@ -184,11 +186,11 @@ Foam::RASModels::phasePressureModel::pPrimef() const Foam::tmp -Foam::RASModels::phasePressureModel::devRhoReff() const +Foam::RASModels::phasePressureModel::devTau() const { return volSymmTensorField::New ( - IOobject::groupName("devRhoReff", U_.group()), + IOobject::groupName("devTau", U_.group()), mesh_, dimensioned ( @@ -200,7 +202,7 @@ Foam::RASModels::phasePressureModel::devRhoReff() const Foam::tmp -Foam::RASModels::phasePressureModel::divDevRhoReff +Foam::RASModels::phasePressureModel::divDevTau ( volVectorField& U ) const diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.H similarity index 94% rename from applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H rename to applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.H index e7609ae4a8..1c4fe28818 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.H @@ -53,7 +53,7 @@ SourceFiles #include "RASModel.H" #include "eddyViscosity.H" -#include "PhaseCompressibleTurbulenceModel.H" +#include "PhaseCompressibleMomentumTransportModel.H" #include "phaseModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -69,7 +69,10 @@ namespace RASModels class phasePressureModel : - public eddyViscosity>> + public eddyViscosity + < + RASModel> + > { // Private Data @@ -157,10 +160,10 @@ public: virtual tmp pPrimef() const; //- Return the effective stress tensor - virtual tmp devRhoReff() const; + virtual tmp devTau() const; //- Return the source term for the momentum equation - virtual tmp divDevRhoReff(volVectorField& U) const; + virtual tmp divDevTau(volVectorField& U) const; //- Solve the kinetic theory equations and correct the viscosity virtual void correct(); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseThermophysicalTransportModels/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseThermophysicalTransportModels/Make/options index 1854016a6a..6843760d54 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseThermophysicalTransportModels/Make/options +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseThermophysicalTransportModels/Make/options @@ -1,18 +1,16 @@ EXE_INC = \ -I../twoPhaseSystem/lnInclude \ -I../interfacialModels/lnInclude \ - -I../phaseCompressibleTurbulenceModels/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ + -I../phaseCompressibleMomentumTransportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/transportModel \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ - -lphaseCompressibleTurbulenceModels \ + -lphaseCompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -lfiniteVolume diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseThermophysicalTransportModels/phaseThermophysicalTransportModels.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseThermophysicalTransportModels/phaseThermophysicalTransportModels.C index 9109db897b..dea583c143 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseThermophysicalTransportModels/phaseThermophysicalTransportModels.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseThermophysicalTransportModels/phaseThermophysicalTransportModels.C @@ -25,7 +25,7 @@ License #include "PhaseThermophysicalTransportModel.H" -#include "phaseCompressibleTurbulenceModel.H" +#include "phaseCompressibleMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" #include "makeThermophysicalTransportModel.H" @@ -38,14 +38,14 @@ License makeThermophysicalTransportModelTypes ( PhaseThermophysicalTransportModel, - phaseCompressibleTurbulenceModel + phaseCompressibleMomentumTransportModel ); makeThermophysicalTransportModel ( PhaseThermophysicalTransportModel, - phaseCompressibleTurbulenceModel + phaseCompressibleMomentumTransportModel ); @@ -53,7 +53,7 @@ makeThermophysicalTransportModel makeTemplatedThermophysicalTransportModel \ ( \ PhaseThermophysicalTransportModel, \ - phaseCompressibleTurbulenceModel, \ + phaseCompressibleMomentumTransportModel, \ laminar, \ Type \ ) @@ -62,7 +62,7 @@ makeThermophysicalTransportModel makeTemplatedThermophysicalTransportModel \ ( \ PhaseThermophysicalTransportModel, \ - phaseCompressibleTurbulenceModel, \ + phaseCompressibleMomentumTransportModel, \ RAS, \ Type \ ) @@ -71,7 +71,7 @@ makeThermophysicalTransportModel makeTemplatedThermophysicalTransportModel \ ( \ PhaseThermophysicalTransportModel, \ - phaseCompressibleTurbulenceModel, \ + phaseCompressibleMomentumTransportModel, \ LES, \ Type \ ) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C index 2bd012bece..c1040924f3 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.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 @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "twoPhaseSystem.H" -#include "PhaseCompressibleTurbulenceModel.H" +#include "PhaseCompressibleMomentumTransportModel.H" #include "pimpleControl.H" #include "fvOptions.H" #include "fixedValueFvsPatchFields.H" diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/options index 7c0e7485a9..85d7b698e4 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/options +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/options @@ -1,18 +1,14 @@ EXE_INC = \ - -I../twoPhaseSystem \ -I../interfacialModels/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude LIB_LIBS = \ -lincompressibleTransportModels \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C index 92739b77e2..459389209d 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.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 @@ -26,7 +26,7 @@ License #include "IATEsource.H" #include "twoPhaseSystem.H" #include "fvMatrix.H" -#include "PhaseCompressibleTurbulenceModel.H" +#include "PhaseCompressibleMomentumTransportModel.H" #include "uniformDimensionedFields.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C index 9e712a73f6..87caac8515 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.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 @@ -27,7 +27,7 @@ License #include "twoPhaseSystem.H" #include "diameterModel.H" #include "fvMatrix.H" -#include "PhaseCompressibleTurbulenceModel.H" +#include "PhaseCompressibleMomentumTransportModel.H" #include "dragModel.H" #include "heatTransferModel.H" #include "fixedValueFvsPatchFields.H" @@ -189,7 +189,7 @@ Foam::phaseModel::phaseModel ); turbulence_ = - PhaseCompressibleTurbulenceModel::New + PhaseCompressibleMomentumTransportModel::New ( *this, thermo_->rho(), @@ -221,14 +221,14 @@ Foam::tmp Foam::phaseModel::d() const } -Foam::PhaseCompressibleTurbulenceModel& +Foam::PhaseCompressibleMomentumTransportModel& Foam::phaseModel::turbulence() { return turbulence_(); } -const Foam::PhaseCompressibleTurbulenceModel& +const Foam::PhaseCompressibleMomentumTransportModel& Foam::phaseModel::turbulence() const { return turbulence_(); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H index b993b6b8b2..d8dacbf899 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H @@ -36,7 +36,6 @@ SourceFiles #include "dimensionedScalar.H" #include "volFields.H" #include "surfaceFields.H" -#include "transportModel.H" #include "rhoThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -49,7 +48,7 @@ class twoPhaseSystem; class diameterModel; template -class PhaseCompressibleTurbulenceModel; +class PhaseCompressibleMomentumTransportModel; /*---------------------------------------------------------------------------*\ @@ -58,8 +57,7 @@ class PhaseCompressibleTurbulenceModel; class phaseModel : - public volScalarField, - public transportModel + public volScalarField { // Private Data @@ -97,7 +95,8 @@ class phaseModel autoPtr dPtr_; //- Turbulence model - autoPtr> turbulence_; + autoPtr> + turbulence_; public: @@ -151,12 +150,12 @@ public: tmp d() const; //- Return the turbulence model - const PhaseCompressibleTurbulenceModel& + const PhaseCompressibleMomentumTransportModel& turbulence() const; //- Return non-const access to the turbulence model // for correction - PhaseCompressibleTurbulenceModel& + PhaseCompressibleMomentumTransportModel& turbulence(); //- Return the thermophysical model @@ -351,12 +350,6 @@ public: //- Read phaseProperties dictionary virtual bool read(const dictionary& phaseProperties); - - //- Dummy Read for transportModel - virtual bool read() - { - return true; - } }; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C index 2c0b317fce..41a305d4fa 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C @@ -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 @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "twoPhaseSystem.H" -#include "PhaseCompressibleTurbulenceModel.H" +#include "PhaseCompressibleMomentumTransportModel.H" #include "BlendedInterfacialModel.H" #include "virtualMassModel.H" #include "heatTransferModel.H" diff --git a/applications/utilities/mesh/advanced/PDRMesh/Make/options b/applications/utilities/mesh/advanced/PDRMesh/Make/options index 4e7c20058c..b70147c399 100644 --- a/applications/utilities/mesh/advanced/PDRMesh/Make/options +++ b/applications/utilities/mesh/advanced/PDRMesh/Make/options @@ -4,9 +4,8 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ - -lcompressibleTransportModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lfluidThermophysicalModels \ -lmeshTools \ -ldynamicMesh \ diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/Make/options b/applications/utilities/postProcessing/dataConversion/foamToGMV/Make/options index 8116475148..f60daa3c7a 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToGMV/Make/options +++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude diff --git a/applications/utilities/postProcessing/postProcess/Make/options b/applications/utilities/postProcessing/postProcess/Make/options index d3bb9a2b6d..c22c51b71e 100644 --- a/applications/utilities/postProcessing/postProcess/Make/options +++ b/applications/utilities/postProcessing/postProcess/Make/options @@ -1,10 +1,8 @@ EXE_INC = \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/fvOptions/lnInclude \ @@ -12,11 +10,10 @@ EXE_INC = \ -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lincompressibleMomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lincompressibleTransportModels \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lfiniteVolume \ diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/Make/options b/applications/utilities/preProcessing/applyBoundaryLayer/Make/options index c0efa09363..28ffc80850 100644 --- a/applications/utilities/preProcessing/applyBoundaryLayer/Make/options +++ b/applications/utilities/preProcessing/applyBoundaryLayer/Make/options @@ -1,14 +1,13 @@ EXE_INC = \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lincompressibleMomentumTransportModels \ -lincompressibleTransportModels \ -lgenericPatchFields \ -lfiniteVolume \ diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C index 220d6f0232..8b72ee141c 100644 --- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C +++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.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 @@ -37,7 +37,7 @@ Description #include "fvCFD.H" #include "singlePhaseTransportModel.H" -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "wallDist.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -123,9 +123,9 @@ int main(int argc, char *argv[]) singlePhaseTransportModel laminarTransport(U, phi); - autoPtr turbulence + autoPtr turbulence ( - incompressible::turbulenceModel::New(U, phi, laminarTransport) + incompressible::momentumTransportModel::New(U, phi, laminarTransport) ); if (isA(turbulence())) diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options index 7672e4c94e..f2f054690d 100644 --- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options +++ b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options @@ -3,8 +3,8 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lturbulenceModels \ - -lcompressibleTurbulenceModels \ + -lmomentumTransportModels \ + -lfluidThermoMomentumTransportModels \ -lfiniteVolume \ -lfvOptions \ -lmeshTools diff --git a/applications/utilities/thermophysical/chemkinToFoam/Make/options b/applications/utilities/thermophysical/chemkinToFoam/Make/options index 74e82fb7e2..f46ca72707 100644 --- a/applications/utilities/thermophysical/chemkinToFoam/Make/options +++ b/applications/utilities/thermophysical/chemkinToFoam/Make/options @@ -5,6 +5,5 @@ EXE_INC = \ EXE_LIBS = \ -lreactionThermophysicalModels \ - -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lchemistryModel diff --git a/etc/caseDicts/postProcessing/solvers/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud b/etc/caseDicts/postProcessing/solvers/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud deleted file mode 100644 index 3dc43d0c65..0000000000 --- a/etc/caseDicts/postProcessing/solvers/icoUncoupledKinematicCloud/icoUncoupledKinematicCloud +++ /dev/null @@ -1,20 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -------------------------------------------------------------------------------- -Description - Tracks a cloud of parcels driven by the flow of the continuous phase. - - The cloud is specified by a kinematicCloudProperties file in the constant - directory. A template file is provided in: - $FOAM_ETC/caseDicts/solvers/lagrangian - -\*---------------------------------------------------------------------------*/ - -type icoUncoupledKinematicCloud; -libs ("liblagrangianFunctionObjects.so"); - -// ************************************************************************* // diff --git a/etc/config.sh/bash_completion b/etc/config.sh/bash_completion index e94432a043..4dbbaf794f 100644 --- a/etc/config.sh/bash_completion +++ b/etc/config.sh/bash_completion @@ -56,7 +56,7 @@ _adjointShapeOptimizationFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -233,7 +233,7 @@ _boundaryFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -srcDoc" + opts="-case -doc -fileHandler -help -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -279,7 +279,7 @@ _buoyantPimpleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -304,7 +304,7 @@ _buoyantSimpleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -329,7 +329,7 @@ _cavitatingDyMFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -354,7 +354,7 @@ _cavitatingFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -509,7 +509,7 @@ _chtMultiRegionFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -534,7 +534,7 @@ _coalChemistryFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -559,7 +559,7 @@ _coldEngineFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -638,7 +638,7 @@ _compressibleInterDyMFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -663,7 +663,7 @@ _compressibleInterFilmFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -688,7 +688,7 @@ _compressibleInterFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -713,7 +713,7 @@ _compressibleMultiphaseInterFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -1098,7 +1098,7 @@ _engineFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -1321,7 +1321,7 @@ _fireFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -1907,7 +1907,7 @@ _icoUncoupledKinematicParcelDyMFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -cloudName -doc -fileHandler -help -hostRoots -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -cloudName -doc -fileHandler -help -hostRoots -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -1932,7 +1932,7 @@ _icoUncoupledKinematicParcelFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -cloudName -doc -fileHandler -help -hostRoots -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -cloudName -doc -fileHandler -help -hostRoots -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2015,7 +2015,7 @@ _interFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2040,7 +2040,7 @@ _interMixingFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2065,7 +2065,7 @@ _interPhaseChangeDyMFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2090,7 +2090,7 @@ _interPhaseChangeFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2628,7 +2628,7 @@ _multiphaseEulerFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2653,7 +2653,7 @@ _multiphaseInterFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2885,7 +2885,7 @@ _PDRFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2935,7 +2935,7 @@ _pimpleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -2960,7 +2960,7 @@ _pisoFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3039,7 +3039,7 @@ _porousSimpleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3143,7 +3143,7 @@ _potentialFreeSurfaceDyMFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3168,7 +3168,7 @@ _potentialFreeSurfaceFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3193,7 +3193,7 @@ _reactingFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3243,7 +3243,7 @@ _reactingParcelFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3528,7 +3528,7 @@ _rhoCentralDyMFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3553,7 +3553,7 @@ _rhoCentralFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3578,7 +3578,7 @@ _rhoPimpleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3603,7 +3603,7 @@ _rhoPorousSimpleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3628,7 +3628,7 @@ _rhoReactingBuoyantFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3653,7 +3653,7 @@ _rhoReactingFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3678,7 +3678,7 @@ _rhoSimpleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3936,7 +3936,7 @@ _simpleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -3961,7 +3961,7 @@ _simpleReactingParcelFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -4119,7 +4119,7 @@ _sonicFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -4244,7 +4244,7 @@ _sprayDyMFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -4269,7 +4269,7 @@ _sprayFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -4294,7 +4294,7 @@ _SRFPimpleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -4319,7 +4319,7 @@ _SRFSimpleFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -5269,7 +5269,7 @@ _thermoFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -5348,7 +5348,7 @@ _twoLiquidMixingFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -5398,7 +5398,7 @@ _uncoupledKinematicParcelDyMFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -cloudName -doc -fileHandler -help -hostRoots -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -cloudName -doc -fileHandler -help -hostRoots -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -5423,7 +5423,7 @@ _uncoupledKinematicParcelFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -cloudName -doc -fileHandler -help -hostRoots -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -cloudName -doc -fileHandler -help -hostRoots -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -5554,7 +5554,7 @@ _XiEngineFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" @@ -5579,7 +5579,7 @@ _XiFoam_ () local line=${COMP_LINE} local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" + opts="-case -doc -fileHandler -help -hostRoots -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listMomentumTransportModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" for o in $used ; do opts="${opts/$o/}" ; done extra="" diff --git a/etc/controlDict b/etc/controlDict index 82e5ab27d1..27e849ddbf 100644 --- a/etc/controlDict +++ b/etc/controlDict @@ -856,7 +856,7 @@ DebugSwitches treeNode 0; triSurface 0; triSurfaceMesh 0; - turbulenceModel 0; + momentumTransportModel 0; turbulentInlet 0; turbulentIntensityKineticEnergyInlet 0; turbulentMixingLengthDissipationRateInlet 0; diff --git a/src/Allwmake b/src/Allwmake index 69d637be3a..33773eccc1 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -53,9 +53,10 @@ parallel/Allwmake $targetType $* wmake $targetType ODE wmake $targetType randomProcesses -transportModels/Allwmake $targetType $* +wmake $targetType transportModels +twoPhaseModels/Allwmake $targetType $* thermophysicalModels/Allwmake $targetType $* -TurbulenceModels/Allwmake $targetType $* +MomentumTransportModels/Allwmake $targetType $* wmake $targetType ThermophysicalTransportModels wmake $targetType radiationModels wmake $targetType combustionModels diff --git a/src/TurbulenceModels/Allwmake b/src/MomentumTransportModels/Allwmake similarity index 89% rename from src/TurbulenceModels/Allwmake rename to src/MomentumTransportModels/Allwmake index 9691a8b1cb..3cc394a5d0 100755 --- a/src/TurbulenceModels/Allwmake +++ b/src/MomentumTransportModels/Allwmake @@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Parse arguments for library compilation . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments -wmake $targetType turbulenceModels +wmake $targetType momentumTransportModels wmake $targetType incompressible wmake $targetType compressible wmakeLnInclude phaseIncompressible diff --git a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C b/src/MomentumTransportModels/compressible/CompressibleMomentumTransportModel/CompressibleMomentumTransportModel.C similarity index 81% rename from src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C rename to src/MomentumTransportModels/compressible/CompressibleMomentumTransportModel/CompressibleMomentumTransportModel.C index 169ff4f243..5e996b8ec6 100644 --- a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.C +++ b/src/MomentumTransportModels/compressible/CompressibleMomentumTransportModel/CompressibleMomentumTransportModel.C @@ -23,13 +23,13 @@ License \*---------------------------------------------------------------------------*/ -#include "CompressibleTurbulenceModel.H" +#include "CompressibleMomentumTransportModel.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -Foam::CompressibleTurbulenceModel:: -CompressibleTurbulenceModel +Foam::CompressibleMomentumTransportModel:: +CompressibleMomentumTransportModel ( const word& type, const geometricOneField& alpha, @@ -40,11 +40,11 @@ CompressibleTurbulenceModel const transportModel& transport ) : - TurbulenceModel + MomentumTransportModel < geometricOneField, volScalarField, - compressibleTurbulenceModel, + compressibleMomentumTransportModel, transportModel > ( @@ -61,8 +61,8 @@ CompressibleTurbulenceModel // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * // template -Foam::autoPtr> -Foam::CompressibleTurbulenceModel::New +Foam::autoPtr> +Foam::CompressibleMomentumTransportModel::New ( const volScalarField& rho, const volVectorField& U, @@ -70,14 +70,14 @@ Foam::CompressibleTurbulenceModel::New const transportModel& transport ) { - return autoPtr + return autoPtr ( - static_cast( - TurbulenceModel + static_cast( + MomentumTransportModel < geometricOneField, volScalarField, - compressibleTurbulenceModel, + compressibleMomentumTransportModel, transportModel >::New ( diff --git a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H b/src/MomentumTransportModels/compressible/CompressibleMomentumTransportModel/CompressibleMomentumTransportModel.H similarity index 86% rename from src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H rename to src/MomentumTransportModels/compressible/CompressibleMomentumTransportModel/CompressibleMomentumTransportModel.H index bd85ebb682..3ce94ae055 100644 --- a/src/TurbulenceModels/compressible/CompressibleTurbulenceModel/CompressibleTurbulenceModel.H +++ b/src/MomentumTransportModels/compressible/CompressibleMomentumTransportModel/CompressibleMomentumTransportModel.H @@ -22,22 +22,22 @@ License along with OpenFOAM. If not, see . Class - Foam::CompressibleTurbulenceModel + Foam::CompressibleMomentumTransportModel Description Templated abstract base class for single-phase compressible turbulence models. SourceFiles - CompressibleTurbulenceModel.C + CompressibleMomentumTransportModel.C \*---------------------------------------------------------------------------*/ -#ifndef CompressibleTurbulenceModel_H -#define CompressibleTurbulenceModel_H +#ifndef CompressibleMomentumTransportModel_H +#define CompressibleMomentumTransportModel_H -#include "TurbulenceModel.H" -#include "compressibleTurbulenceModel.H" +#include "MomentumTransportModel.H" +#include "compressibleMomentumTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,17 +45,17 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class CompressibleTurbulenceModel Declaration + Class CompressibleMomentumTransportModel Declaration \*---------------------------------------------------------------------------*/ template -class CompressibleTurbulenceModel +class CompressibleMomentumTransportModel : - public TurbulenceModel + public MomentumTransportModel < geometricOneField, volScalarField, - compressibleTurbulenceModel, + compressibleMomentumTransportModel, TransportModel > { @@ -70,7 +70,7 @@ public: // Constructors //- Construct - CompressibleTurbulenceModel + CompressibleMomentumTransportModel ( const word& type, const geometricOneField& alpha, @@ -85,7 +85,7 @@ public: // Selectors //- Return a reference to the selected turbulence model - static autoPtr New + static autoPtr New ( const volScalarField& rho, const volVectorField& U, @@ -95,7 +95,7 @@ public: //- Destructor - virtual ~CompressibleTurbulenceModel() + virtual ~CompressibleMomentumTransportModel() {} @@ -159,7 +159,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "CompressibleTurbulenceModel.C" + #include "CompressibleMomentumTransportModel.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/MomentumTransportModels/compressible/Make/files b/src/MomentumTransportModels/compressible/Make/files new file mode 100644 index 0000000000..cd4a2c2073 --- /dev/null +++ b/src/MomentumTransportModels/compressible/Make/files @@ -0,0 +1,4 @@ +compressibleMomentumTransportModel.C +fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModels.C + +LIB = $(FOAM_LIBBIN)/libfluidThermoMomentumTransportModels diff --git a/src/TurbulenceModels/compressible/Make/options b/src/MomentumTransportModels/compressible/Make/options similarity index 80% rename from src/TurbulenceModels/compressible/Make/options rename to src/MomentumTransportModels/compressible/Make/options index db20dce097..41661ccc07 100644 --- a/src/TurbulenceModels/compressible/Make/options +++ b/src/MomentumTransportModels/compressible/Make/options @@ -1,6 +1,5 @@ EXE_INC = \ - -I../turbulenceModels/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ + -I../momentumTransportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ @@ -12,7 +11,7 @@ LIB_LIBS = \ -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lsolidThermo \ - -lturbulenceModels \ + -lmomentumTransportModels \ -lspecie \ -lfiniteVolume \ -lmeshTools diff --git a/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C b/src/MomentumTransportModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C similarity index 82% rename from src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C rename to src/MomentumTransportModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C index fb58c27321..b1e18e5f6f 100644 --- a/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C +++ b/src/MomentumTransportModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.C @@ -37,8 +37,8 @@ namespace RASModels // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -buoyantKEpsilon::buoyantKEpsilon +template +buoyantKEpsilon::buoyantKEpsilon ( const alphaField& alpha, const rhoField& rho, @@ -49,7 +49,7 @@ buoyantKEpsilon::buoyantKEpsilon const word& type ) : - kEpsilon + kEpsilon ( alpha, rho, @@ -79,10 +79,10 @@ buoyantKEpsilon::buoyantKEpsilon // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool buoyantKEpsilon::read() +template +bool buoyantKEpsilon::read() { - if (kEpsilon::read()) + if (kEpsilon::read()) { Cg_.readIfPresent(this->coeffDict()); @@ -95,9 +95,9 @@ bool buoyantKEpsilon::read() } -template +template tmp -buoyantKEpsilon::Gcoef() const +buoyantKEpsilon::Gcoef() const { const uniformDimensionedVectorField& g = this->mesh_.objectRegistry::template @@ -109,9 +109,9 @@ buoyantKEpsilon::Gcoef() const } -template +template tmp -buoyantKEpsilon::kSource() const +buoyantKEpsilon::kSource() const { const uniformDimensionedVectorField& g = this->mesh_.objectRegistry::template @@ -123,14 +123,14 @@ buoyantKEpsilon::kSource() const } else { - return kEpsilon::kSource(); + return kEpsilon::kSource(); } } -template +template tmp -buoyantKEpsilon::epsilonSource() const +buoyantKEpsilon::epsilonSource() const { const uniformDimensionedVectorField& g = this->mesh_.objectRegistry::template @@ -151,7 +151,7 @@ buoyantKEpsilon::epsilonSource() const } else { - return kEpsilon::epsilonSource(); + return kEpsilon::epsilonSource(); } } diff --git a/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H b/src/MomentumTransportModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H similarity index 93% rename from src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H rename to src/MomentumTransportModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H index 533ef34f2d..37c755bb15 100644 --- a/src/TurbulenceModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H +++ b/src/MomentumTransportModels/compressible/RAS/buoyantKEpsilon/buoyantKEpsilon.H @@ -74,10 +74,10 @@ namespace RASModels Class buoyantKEpsilon Declaration \*---------------------------------------------------------------------------*/ -template +template class buoyantKEpsilon : - public kEpsilon + public kEpsilon { protected: @@ -98,9 +98,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.C b/src/MomentumTransportModels/compressible/compressibleMomentumTransportModel.C similarity index 86% rename from src/TurbulenceModels/compressible/compressibleTurbulenceModel.C rename to src/MomentumTransportModels/compressible/compressibleMomentumTransportModel.C index 0c1f78f215..9cd66b8473 100644 --- a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.C +++ b/src/MomentumTransportModels/compressible/compressibleMomentumTransportModel.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "compressibleTurbulenceModel.H" +#include "compressibleMomentumTransportModel.H" #include "surfaceInterpolate.H" #include "surfaceFields.H" @@ -31,13 +31,13 @@ License namespace Foam { - defineTypeNameAndDebug(compressibleTurbulenceModel, 0); + defineTypeNameAndDebug(compressibleMomentumTransportModel, 0); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::compressibleTurbulenceModel::compressibleTurbulenceModel +Foam::compressibleMomentumTransportModel::compressibleMomentumTransportModel ( const volScalarField& rho, const volVectorField& U, @@ -45,7 +45,7 @@ Foam::compressibleTurbulenceModel::compressibleTurbulenceModel const surfaceScalarField& phi ) : - turbulenceModel + momentumTransportModel ( U, alphaRhoPhi, @@ -58,7 +58,7 @@ Foam::compressibleTurbulenceModel::compressibleTurbulenceModel // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // Foam::tmp -Foam::compressibleTurbulenceModel::phi() const +Foam::compressibleMomentumTransportModel::phi() const { if (phi_.dimensions() == dimensionSet(0, 3, -1, 0, 0)) { @@ -71,8 +71,4 @@ Foam::compressibleTurbulenceModel::phi() const } -void Foam::compressibleTurbulenceModel::correctEnergyTransport() -{} - - // ************************************************************************* // diff --git a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H b/src/MomentumTransportModels/compressible/compressibleMomentumTransportModel.H similarity index 72% rename from src/TurbulenceModels/compressible/compressibleTurbulenceModel.H rename to src/MomentumTransportModels/compressible/compressibleMomentumTransportModel.H index 5e1f77b326..964ddc719f 100644 --- a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H +++ b/src/MomentumTransportModels/compressible/compressibleMomentumTransportModel.H @@ -22,20 +22,20 @@ License along with OpenFOAM. If not, see . Class - Foam::compressibleTurbulenceModel + Foam::compressibleMomentumTransportModel Description Abstract base class for turbulence models (RAS, LES and laminar). SourceFiles - compressibleTurbulenceModel.C + compressibleMomentumTransportModel.C \*---------------------------------------------------------------------------*/ -#ifndef compressibleTurbulenceModel_H -#define compressibleTurbulenceModel_H +#ifndef compressibleMomentumTransportModel_H +#define compressibleMomentumTransportModel_H -#include "turbulenceModel.H" +#include "momentumTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -46,12 +46,12 @@ namespace Foam class fvMesh; /*---------------------------------------------------------------------------*\ - Class compressibleTurbulenceModel Declaration + Class compressibleMomentumTransportModel Declaration \*---------------------------------------------------------------------------*/ -class compressibleTurbulenceModel +class compressibleMomentumTransportModel : - public turbulenceModel + public momentumTransportModel { protected: @@ -61,24 +61,16 @@ protected: const volScalarField& rho_; - // Protected member functions - - //- ***HGW Temporary function to be removed when the run-time selectable - // thermal transport layer is complete - virtual void correctNut() - {} - - public: //- Runtime type information - TypeName(turbulenceModel::typeName_()); + TypeName(momentumTransportModel::typeName_()); // Constructors //- Construct from components - compressibleTurbulenceModel + compressibleMomentumTransportModel ( const volScalarField& rho, const volVectorField& U, @@ -87,14 +79,14 @@ public: ); //- Disallow default bitwise copy construction - compressibleTurbulenceModel + compressibleMomentumTransportModel ( - const compressibleTurbulenceModel& + const compressibleMomentumTransportModel& ) = delete; //- Destructor - virtual ~compressibleTurbulenceModel() + virtual ~compressibleMomentumTransportModel() {} @@ -110,19 +102,16 @@ public: virtual tmp phi() const; //- Return the effective stress tensor including the laminar stress - virtual tmp devRhoReff() const = 0; + virtual tmp devTau() const = 0; //- Return the source term for the momentum equation - virtual tmp divDevRhoReff(volVectorField& U) const = 0; - - //- Correct the turbulence thermal diffusivity for energy transport - virtual void correctEnergyTransport(); + virtual tmp divDevTau(volVectorField& U) const = 0; // Member Operators //- Disallow default bitwise assignment - void operator=(const compressibleTurbulenceModel&) = delete; + void operator=(const compressibleMomentumTransportModel&) = delete; }; diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.C b/src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModel.C similarity index 83% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.C rename to src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModel.C index 4e78e05f16..e074364620 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.C +++ b/src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModel.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "turbulentFluidThermoModel.H" +#include "fluidThermoMomentumTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -31,17 +31,17 @@ namespace Foam { namespace compressible { - template - autoPtr New + template + autoPtr New ( const volScalarField& rho, const volVectorField& U, const surfaceScalarField& phi, - const typename BasicCompressibleTurbulenceModel::transportModel& - transport + const typename BasicCompressibleMomentumTransportModel:: + transportModel& transport ) { - return BasicCompressibleTurbulenceModel::New + return BasicCompressibleMomentumTransportModel::New ( geometricOneField(), rho, diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H b/src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModel.H similarity index 71% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H rename to src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModel.H index 5f229bdfab..af553ad97c 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H +++ b/src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModel.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Typedef - Foam::compressible::turbulenceModel + Foam::compressible::momentumTransportModel Typedef Foam::compressible::laminarModel @@ -38,15 +38,15 @@ Description based on the standard laminar transport package. SourceFiles - turbulentFluidThermoModel.C - turbulentFluidThermoModels.C + fluidThermoMomentumTransportModel.C + fluidThermoMomentumTransportModels.C \*---------------------------------------------------------------------------*/ -#ifndef turbulentFluidThermoModel_H -#define turbulentFluidThermoModel_H +#ifndef fluidThermoMomentumTransportModel_H +#define fluidThermoMomentumTransportModel_H -#include "CompressibleTurbulenceModel.H" +#include "CompressibleMomentumTransportModel.H" #include "laminarModel.H" #include "RASModel.H" #include "LESModel.H" @@ -58,19 +58,20 @@ namespace Foam { namespace compressible { - typedef CompressibleTurbulenceModel turbulenceModel; - typedef laminarModel laminarModel; - typedef RASModel RASModel; - typedef LESModel LESModel; + typedef CompressibleMomentumTransportModel + momentumTransportModel; + typedef laminarModel laminarModel; + typedef RASModel RASModel; + typedef LESModel LESModel; - template - autoPtr New + template + autoPtr New ( const volScalarField& rho, const volVectorField& U, const surfaceScalarField& phi, - const typename BasicCompressibleTurbulenceModel::transportModel& - transport + const typename BasicCompressibleMomentumTransportModel:: + transportModel& transport ); } } @@ -79,7 +80,7 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "turbulentFluidThermoModel.C" + #include "fluidThermoMomentumTransportModel.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C b/src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModels.C similarity index 95% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C rename to src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModels.C index 46543c3bbc..2a35e47c9a 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.C +++ b/src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModels.C @@ -23,16 +23,16 @@ License \*---------------------------------------------------------------------------*/ -#include "turbulentFluidThermoModels.H" +#include "fluidThermoMomentumTransportModels.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makeBaseTurbulenceModel +makeBaseMomentumTransportModel ( geometricOneField, volScalarField, - compressibleTurbulenceModel, - CompressibleTurbulenceModel, + compressibleMomentumTransportModel, + CompressibleMomentumTransportModel, fluidThermo ); diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.H b/src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModels.H similarity index 78% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.H rename to src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModels.H index 30a067ee91..b2ec19f0aa 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModels.H +++ b/src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModels.H @@ -23,11 +23,10 @@ License \*---------------------------------------------------------------------------*/ -#include "CompressibleTurbulenceModel.H" -#include "compressibleTransportModel.H" +#include "CompressibleMomentumTransportModel.H" #include "fluidThermo.H" #include "addToRunTimeSelectionTable.H" -#include "makeTurbulenceModel.H" +#include "makeMomentumTransportModel.H" #include "laminarModel.H" #include "RASModel.H" @@ -35,26 +34,26 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makeTurbulenceModelTypes +makeMomentumTransportModelTypes ( geometricOneField, volScalarField, - compressibleTurbulenceModel, - CompressibleTurbulenceModel, + compressibleMomentumTransportModel, + CompressibleMomentumTransportModel, fluidThermo ); #define makeLaminarModel(Type) \ makeTemplatedLaminarModel \ - (fluidThermoCompressibleTurbulenceModel, laminar, Type) + (fluidThermoCompressibleMomentumTransportModel, laminar, Type) #define makeRASModel(Type) \ - makeTemplatedTurbulenceModel \ - (fluidThermoCompressibleTurbulenceModel, RAS, Type) + makeTemplatedMomentumTransportModel \ + (fluidThermoCompressibleMomentumTransportModel, RAS, Type) #define makeLESModel(Type) \ - makeTemplatedTurbulenceModel \ - (fluidThermoCompressibleTurbulenceModel, LES, Type) + makeTemplatedMomentumTransportModel \ + (fluidThermoCompressibleMomentumTransportModel, LES, Type) // ************************************************************************* // diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H b/src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/makeMomentumTransportModel.H similarity index 97% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H rename to src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/makeMomentumTransportModel.H index 1280e6b561..1a31014a18 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/makeTurbulenceModel.H +++ b/src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/makeMomentumTransportModel.H @@ -25,7 +25,7 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#define makeTurbulenceModelTypes( \ +#define makeMomentumTransportModelTypes( \ Alpha, Rho, baseModel, BaseModel, Transport) \ \ namespace Foam \ @@ -41,12 +41,12 @@ License } -#define makeBaseTurbulenceModel( \ +#define makeBaseMomentumTransportModel( \ Alpha, Rho, baseModel, BaseModel, Transport) \ \ namespace Foam \ { \ - typedef TurbulenceModel \ + typedef MomentumTransportModel \ < \ Alpha, \ Rho, \ @@ -134,7 +134,7 @@ License } -#define makeTemplatedTurbulenceModel(BaseModel, SType, Type) \ +#define makeTemplatedMomentumTransportModel(BaseModel, SType, Type) \ typedef Foam::SType##Models::Type \ Type##SType##BaseModel; \ defineNamedTemplateTypeNameAndDebug(Type##SType##BaseModel, 0); \ @@ -155,7 +155,7 @@ License } -#define makeTurbulenceModel(BaseModel, SType, Type) \ +#define makeMomentumTransportModel(BaseModel, SType, Type) \ namespace Foam \ { \ namespace SType##Models \ diff --git a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C b/src/MomentumTransportModels/incompressible/IncompressibleMomentumTransportModel/IncompressibleMomentumTransportModel.C similarity index 73% rename from src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C rename to src/MomentumTransportModels/incompressible/IncompressibleMomentumTransportModel/IncompressibleMomentumTransportModel.C index 0ea276a629..8c707005d5 100644 --- a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.C +++ b/src/MomentumTransportModels/incompressible/IncompressibleMomentumTransportModel/IncompressibleMomentumTransportModel.C @@ -23,13 +23,13 @@ License \*---------------------------------------------------------------------------*/ -#include "IncompressibleTurbulenceModel.H" +#include "IncompressibleMomentumTransportModel.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -Foam::IncompressibleTurbulenceModel:: -IncompressibleTurbulenceModel +Foam::IncompressibleMomentumTransportModel:: +IncompressibleMomentumTransportModel ( const word& type, const geometricOneField& alpha, @@ -40,11 +40,11 @@ IncompressibleTurbulenceModel const TransportModel& transport ) : - TurbulenceModel + MomentumTransportModel < geometricOneField, geometricOneField, - incompressibleTurbulenceModel, + incompressibleMomentumTransportModel, TransportModel > ( @@ -61,22 +61,22 @@ IncompressibleTurbulenceModel // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * // template -Foam::autoPtr> -Foam::IncompressibleTurbulenceModel::New +Foam::autoPtr> +Foam::IncompressibleMomentumTransportModel::New ( const volVectorField& U, const surfaceScalarField& phi, const TransportModel& transport ) { - return autoPtr + return autoPtr ( - static_cast( - TurbulenceModel + static_cast( + MomentumTransportModel < geometricOneField, geometricOneField, - incompressibleTurbulenceModel, + incompressibleMomentumTransportModel, TransportModel >::New ( @@ -95,52 +95,52 @@ Foam::IncompressibleTurbulenceModel::New template Foam::tmp -Foam::IncompressibleTurbulenceModel::devReff() const +Foam::IncompressibleMomentumTransportModel::devSigma() const { - return devRhoReff(); + return devTau(); } template Foam::tmp -Foam::IncompressibleTurbulenceModel::divDevReff +Foam::IncompressibleMomentumTransportModel::divDevSigma ( volVectorField& U ) const { - return divDevRhoReff(U); + return divDevTau(U); } template Foam::tmp -Foam::IncompressibleTurbulenceModel:: -devRhoReff() const +Foam::IncompressibleMomentumTransportModel:: +devTau() const { NotImplemented; - return devReff(); + return devSigma(); } template Foam::tmp -Foam::IncompressibleTurbulenceModel:: -divDevRhoReff +Foam::IncompressibleMomentumTransportModel:: +divDevTau ( volVectorField& U ) const { NotImplemented; - return divDevReff(U); + return divDevSigma(U); } template Foam::tmp -Foam::IncompressibleTurbulenceModel:: -divDevRhoReff +Foam::IncompressibleMomentumTransportModel:: +divDevTau ( const volScalarField& rho, volVectorField& U @@ -148,7 +148,7 @@ divDevRhoReff { NotImplemented; - return divDevReff(U); + return divDevSigma(U); } diff --git a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H b/src/MomentumTransportModels/incompressible/IncompressibleMomentumTransportModel/IncompressibleMomentumTransportModel.H similarity index 76% rename from src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H rename to src/MomentumTransportModels/incompressible/IncompressibleMomentumTransportModel/IncompressibleMomentumTransportModel.H index d12d2b5751..be49362f04 100644 --- a/src/TurbulenceModels/incompressible/IncompressibleTurbulenceModel/IncompressibleTurbulenceModel.H +++ b/src/MomentumTransportModels/incompressible/IncompressibleMomentumTransportModel/IncompressibleMomentumTransportModel.H @@ -22,22 +22,22 @@ License along with OpenFOAM. If not, see . Class - Foam::IncompressibleTurbulenceModel + Foam::IncompressibleMomentumTransportModel Description Templated abstract base class for single-phase incompressible turbulence models. SourceFiles - IncompressibleTurbulenceModel.C + IncompressibleMomentumTransportModel.C \*---------------------------------------------------------------------------*/ -#ifndef IncompressibleTurbulenceModel_H -#define IncompressibleTurbulenceModel_H +#ifndef IncompressibleMomentumTransportModel_H +#define IncompressibleMomentumTransportModel_H -#include "TurbulenceModel.H" -#include "incompressibleTurbulenceModel.H" +#include "MomentumTransportModel.H" +#include "incompressibleMomentumTransportModel.H" #include "fvMatrix.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -46,17 +46,17 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class IncompressibleTurbulenceModel Declaration + Class IncompressibleMomentumTransportModel Declaration \*---------------------------------------------------------------------------*/ template -class IncompressibleTurbulenceModel +class IncompressibleMomentumTransportModel : - public TurbulenceModel + public MomentumTransportModel < geometricOneField, geometricOneField, - incompressibleTurbulenceModel, + incompressibleMomentumTransportModel, TransportModel > { @@ -71,7 +71,7 @@ public: // Constructors //- Construct - IncompressibleTurbulenceModel + IncompressibleMomentumTransportModel ( const word& type, const geometricOneField& alpha, @@ -86,7 +86,7 @@ public: // Selectors //- Return a reference to the selected turbulence model - static autoPtr New + static autoPtr New ( const volVectorField& U, const surfaceScalarField& phi, @@ -95,26 +95,26 @@ public: //- Destructor - virtual ~IncompressibleTurbulenceModel() + virtual ~IncompressibleMomentumTransportModel() {} // Member Functions //- Return the effective stress tensor - virtual tmp devReff() const; + virtual tmp devSigma() const; //- Return the source term for the momentum equation - virtual tmp divDevReff(volVectorField& U) const; + virtual tmp divDevSigma(volVectorField& U) const; //- Return the effective stress tensor - virtual tmp devRhoReff() const; + virtual tmp devTau() const; //- Return the source term for the momentum equation - virtual tmp divDevRhoReff(volVectorField& U) const; + virtual tmp divDevTau(volVectorField& U) const; //- Return the source term for the momentum equation - virtual tmp divDevRhoReff + virtual tmp divDevTau ( const volScalarField& rho, volVectorField& U @@ -129,7 +129,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "IncompressibleTurbulenceModel.C" + #include "IncompressibleMomentumTransportModel.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/MomentumTransportModels/incompressible/Make/files b/src/MomentumTransportModels/incompressible/Make/files new file mode 100644 index 0000000000..5394d3ae51 --- /dev/null +++ b/src/MomentumTransportModels/incompressible/Make/files @@ -0,0 +1,11 @@ +incompressibleMomentumTransportModel.C + +kinematicMomentumTransportModels/kinematicMomentumTransportModels.C +kinematicMomentumTransportModels/RAS/qZeta/qZeta.C +kinematicMomentumTransportModels/RAS/kkLOmega/kkLOmega.C +kinematicMomentumTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C +kinematicMomentumTransportModels/RAS/LienLeschziner/LienLeschziner.C +kinematicMomentumTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C +kinematicMomentumTransportModels/RAS/LienCubicKE/LienCubicKE.C + +LIB = $(FOAM_LIBBIN)/libincompressibleMomentumTransportModels diff --git a/src/TurbulenceModels/incompressible/Make/options b/src/MomentumTransportModels/incompressible/Make/options similarity index 59% rename from src/TurbulenceModels/incompressible/Make/options rename to src/MomentumTransportModels/incompressible/Make/options index c44e9ae61c..113571d983 100644 --- a/src/TurbulenceModels/incompressible/Make/options +++ b/src/MomentumTransportModels/incompressible/Make/options @@ -1,11 +1,11 @@ EXE_INC = \ - -I../turbulenceModels/lnInclude \ - -I$(LIB_SRC)/transportModels \ + -I../momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ LIB_LIBS = \ -lincompressibleTransportModels \ - -lturbulenceModels \ + -lmomentumTransportModels \ -lfiniteVolume \ -lmeshTools diff --git a/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.C b/src/MomentumTransportModels/incompressible/incompressibleMomentumTransportModel.C similarity index 76% rename from src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.C rename to src/MomentumTransportModels/incompressible/incompressibleMomentumTransportModel.C index b3384ee634..0f24f3d979 100644 --- a/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.C +++ b/src/MomentumTransportModels/incompressible/incompressibleMomentumTransportModel.C @@ -23,19 +23,19 @@ License \*---------------------------------------------------------------------------*/ -#include "incompressibleTurbulenceModel.H" +#include "incompressibleMomentumTransportModel.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - defineTypeNameAndDebug(incompressibleTurbulenceModel, 0); + defineTypeNameAndDebug(incompressibleMomentumTransportModel, 0); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::incompressibleTurbulenceModel::incompressibleTurbulenceModel +Foam::incompressibleMomentumTransportModel::incompressibleMomentumTransportModel ( const geometricOneField&, const volVectorField& U, @@ -43,7 +43,7 @@ Foam::incompressibleTurbulenceModel::incompressibleTurbulenceModel const surfaceScalarField& phi ) : - turbulenceModel + momentumTransportModel ( U, alphaRhoPhi, @@ -53,42 +53,42 @@ Foam::incompressibleTurbulenceModel::incompressibleTurbulenceModel Foam::tmp -Foam::incompressibleTurbulenceModel::mu() const +Foam::incompressibleMomentumTransportModel::mu() const { return nu(); } Foam::tmp -Foam::incompressibleTurbulenceModel::mu(const label patchi) const +Foam::incompressibleMomentumTransportModel::mu(const label patchi) const { return nu(patchi); } Foam::tmp -Foam::incompressibleTurbulenceModel::mut() const +Foam::incompressibleMomentumTransportModel::mut() const { return nut(); } Foam::tmp -Foam::incompressibleTurbulenceModel::mut(const label patchi) const +Foam::incompressibleMomentumTransportModel::mut(const label patchi) const { return nut(patchi); } Foam::tmp -Foam::incompressibleTurbulenceModel::muEff() const +Foam::incompressibleMomentumTransportModel::muEff() const { return nuEff(); } Foam::tmp -Foam::incompressibleTurbulenceModel::muEff(const label patchi) const +Foam::incompressibleMomentumTransportModel::muEff(const label patchi) const { return nuEff(patchi); } diff --git a/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.H b/src/MomentumTransportModels/incompressible/incompressibleMomentumTransportModel.H similarity index 77% rename from src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.H rename to src/MomentumTransportModels/incompressible/incompressibleMomentumTransportModel.H index a74d6dc4fa..b7e54d08f1 100644 --- a/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.H +++ b/src/MomentumTransportModels/incompressible/incompressibleMomentumTransportModel.H @@ -22,20 +22,20 @@ License along with OpenFOAM. If not, see . Class - Foam::incompressibleTurbulenceModel + Foam::incompressibleMomentumTransportModel Description Abstract base class for turbulence models (RAS, LES and laminar). SourceFiles - incompressibleTurbulenceModel.C + incompressibleMomentumTransportModel.C \*---------------------------------------------------------------------------*/ -#ifndef incompressibleTurbulenceModel_H -#define incompressibleTurbulenceModel_H +#ifndef incompressibleMomentumTransportModel_H +#define incompressibleMomentumTransportModel_H -#include "turbulenceModel.H" +#include "momentumTransportModel.H" #include "geometricOneField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -47,12 +47,12 @@ namespace Foam class fvMesh; /*---------------------------------------------------------------------------*\ - Class incompressibleTurbulenceModel Declaration + Class incompressibleMomentumTransportModel Declaration \*---------------------------------------------------------------------------*/ -class incompressibleTurbulenceModel +class incompressibleMomentumTransportModel : - public turbulenceModel + public momentumTransportModel { protected: @@ -61,24 +61,16 @@ protected: geometricOneField rho_; - // Protected member functions - - //- ***HGW Temporary function to be removed when the run-time selectable - // thermal transport layer is complete - virtual void correctNut() - {} - - public: //- Runtime type information - TypeName(turbulenceModel::typeName_()); + TypeName(momentumTransportModel::typeName_()); // Constructors //- Construct from components - incompressibleTurbulenceModel + incompressibleMomentumTransportModel ( const geometricOneField& rho, const volVectorField& U, @@ -87,14 +79,14 @@ public: ); //- Disallow default bitwise copy construction - incompressibleTurbulenceModel + incompressibleMomentumTransportModel ( - const incompressibleTurbulenceModel& + const incompressibleMomentumTransportModel& ) = delete; //- Destructor - virtual ~incompressibleTurbulenceModel() + virtual ~incompressibleMomentumTransportModel() {} @@ -119,16 +111,16 @@ public: virtual tmp muEff(const label patchi) const; //- Return the effective stress tensor including the laminar stress - virtual tmp devReff() const = 0; + virtual tmp devSigma() const = 0; //- Return the source term for the momentum equation - virtual tmp divDevReff(volVectorField& U) const = 0; + virtual tmp divDevSigma(volVectorField& U) const = 0; // Member Operators //- Disallow default bitwise assignment - void operator=(const incompressibleTurbulenceModel&) = delete; + void operator=(const incompressibleMomentumTransportModel&) = delete; }; diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C similarity index 100% rename from src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C rename to src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.C diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H similarity index 99% rename from src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H rename to src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H index 9f21d060c1..6381c42983 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H +++ b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H @@ -43,7 +43,7 @@ SourceFiles #ifndef LamBremhorstKE_H #define LamBremhorstKE_H -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "eddyViscosity.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/LienCubicKE/LienCubicKE.C similarity index 100% rename from src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C rename to src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/LienCubicKE/LienCubicKE.C diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.H b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/LienCubicKE/LienCubicKE.H similarity index 99% rename from src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.H rename to src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/LienCubicKE/LienCubicKE.H index 3eb33564ea..984845738f 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.H +++ b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/LienCubicKE/LienCubicKE.H @@ -56,7 +56,7 @@ SourceFiles #ifndef LienCubicKE_H #define LienCubicKE_H -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "nonlinearEddyViscosity.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/LienLeschziner/LienLeschziner.C similarity index 100% rename from src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C rename to src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/LienLeschziner/LienLeschziner.C diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.H b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/LienLeschziner/LienLeschziner.H similarity index 99% rename from src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.H rename to src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/LienLeschziner/LienLeschziner.H index 6923e74c22..c1aca9cd30 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.H +++ b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/LienLeschziner/LienLeschziner.H @@ -54,7 +54,7 @@ SourceFiles #ifndef LienLeschziner_H #define LienLeschziner_H -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "eddyViscosity.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C similarity index 100% rename from src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C rename to src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.H b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.H similarity index 99% rename from src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.H rename to src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.H index 873c5f472b..f956393116 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.H +++ b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.H @@ -48,7 +48,7 @@ SourceFiles #ifndef ShihQuadraticKE_H #define ShihQuadraticKE_H -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "nonlinearEddyViscosity.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/kkLOmega/kkLOmega.C similarity index 100% rename from src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.C rename to src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/kkLOmega/kkLOmega.C diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/kkLOmega/kkLOmega.H similarity index 99% rename from src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H rename to src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/kkLOmega/kkLOmega.H index 4656d9c669..04b93408df 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/kkLOmega/kkLOmega.H +++ b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/kkLOmega/kkLOmega.H @@ -89,7 +89,7 @@ SourceFiles #ifndef kkLOmega_H #define kkLOmega_H -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "eddyViscosity.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/qZeta/qZeta.C similarity index 100% rename from src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.C rename to src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/qZeta/qZeta.C diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.H b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/qZeta/qZeta.H similarity index 99% rename from src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.H rename to src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/qZeta/qZeta.H index a9ed628401..acbb0bc482 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.H +++ b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/RAS/qZeta/qZeta.H @@ -52,7 +52,7 @@ SourceFiles #ifndef qZeta_H #define qZeta_H -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" #include "eddyViscosity.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.C b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModel.C similarity index 82% rename from src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.C rename to src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModel.C index 9375c11685..eb075b833f 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.C +++ b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModel.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "turbulentTransportModel.H" +#include "kinematicMomentumTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -31,16 +31,16 @@ namespace Foam { namespace incompressible { - template - autoPtr New + template + autoPtr New ( const volVectorField& U, const surfaceScalarField& phi, - const typename BasicIncompressibleTurbulenceModel::transportModel& - transport + const typename BasicIncompressibleMomentumTransportModel:: + transportModel& transport ) { - return BasicIncompressibleTurbulenceModel::New + return BasicIncompressibleMomentumTransportModel::New ( geometricOneField(), geometricOneField(), diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModel.H similarity index 70% rename from src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H rename to src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModel.H index 538cae8f6c..0d0848af30 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModel.H +++ b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModel.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Typedef - Foam::incompressible::turbulenceModel + Foam::incompressible::momentumTransportModel Typedef Foam::incompressible::RASModel @@ -35,19 +35,19 @@ Description based on the standard laminar transport package. SourceFiles - turbulentTransportModel.C - turbulentTransportModels.C + kinematicMomentumTransportModel.C + kinematicMomentumTransportModels.C \*---------------------------------------------------------------------------*/ -#ifndef turbulentTransportModel_H -#define turbulentTransportModel_H +#ifndef kinematicMomentumTransportModel_H +#define kinematicMomentumTransportModel_H -#include "IncompressibleTurbulenceModel.H" +#include "IncompressibleMomentumTransportModel.H" #include "laminarModel.H" #include "RASModel.H" #include "LESModel.H" -#include "incompressible/transportModel/transportModel.H" +#include "transportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,19 +55,20 @@ namespace Foam { namespace incompressible { - typedef IncompressibleTurbulenceModel turbulenceModel; + typedef IncompressibleMomentumTransportModel + momentumTransportModel; - typedef laminarModel laminarModel; - typedef RASModel RASModel; - typedef LESModel LESModel; + typedef laminarModel laminarModel; + typedef RASModel RASModel; + typedef LESModel LESModel; - template - autoPtr New + template + autoPtr New ( const volVectorField& U, const surfaceScalarField& phi, - const typename BasicIncompressibleTurbulenceModel::transportModel& - transport + const typename BasicIncompressibleMomentumTransportModel:: + transportModel& transport ); } } @@ -76,7 +77,7 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "turbulentTransportModel.C" + #include "kinematicMomentumTransportModel.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModels.C similarity index 95% rename from src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C rename to src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModels.C index 8918a00189..f1af418f04 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.C +++ b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModels.C @@ -23,16 +23,16 @@ License \*---------------------------------------------------------------------------*/ -#include "turbulentTransportModels.H" +#include "kinematicMomentumTransportModels.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makeBaseTurbulenceModel +makeBaseMomentumTransportModel ( geometricOneField, geometricOneField, - incompressibleTurbulenceModel, - IncompressibleTurbulenceModel, + incompressibleMomentumTransportModel, + IncompressibleMomentumTransportModel, transportModel ); diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.H b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModels.H similarity index 71% rename from src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.H rename to src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModels.H index 34d7159753..83a6bb870b 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/turbulentTransportModels.H +++ b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModels.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 @@ -23,10 +23,10 @@ License \*---------------------------------------------------------------------------*/ -#include "IncompressibleTurbulenceModel.H" -#include "incompressible/transportModel/transportModel.H" +#include "IncompressibleMomentumTransportModel.H" +#include "transportModel.H" #include "addToRunTimeSelectionTable.H" -#include "makeTurbulenceModel.H" +#include "makeMomentumTransportModel.H" #include "laminarModel.H" #include "RASModel.H" @@ -34,26 +34,26 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makeTurbulenceModelTypes +makeMomentumTransportModelTypes ( geometricOneField, geometricOneField, - incompressibleTurbulenceModel, - IncompressibleTurbulenceModel, + incompressibleMomentumTransportModel, + IncompressibleMomentumTransportModel, transportModel ); #define makeLaminarModel(Type) \ - makeTemplatedTurbulenceModel \ - (transportModelIncompressibleTurbulenceModel, laminar, Type) + makeTemplatedMomentumTransportModel \ + (transportModelIncompressibleMomentumTransportModel, laminar, Type) #define makeRASModel(Type) \ - makeTemplatedTurbulenceModel \ - (transportModelIncompressibleTurbulenceModel, RAS, Type) + makeTemplatedMomentumTransportModel \ + (transportModelIncompressibleMomentumTransportModel, RAS, Type) #define makeLESModel(Type) \ - makeTemplatedTurbulenceModel \ - (transportModelIncompressibleTurbulenceModel, LES, Type) + makeTemplatedMomentumTransportModel \ + (transportModelIncompressibleMomentumTransportModel, LES, Type) // ************************************************************************* // diff --git a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C b/src/MomentumTransportModels/momentumTransportModels/Base/kOmegaSST/kOmegaSSTBase.C similarity index 82% rename from src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C rename to src/MomentumTransportModels/momentumTransportModels/Base/kOmegaSST/kOmegaSSTBase.C index eebbe1b3f6..adb9fe277e 100644 --- a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C +++ b/src/MomentumTransportModels/momentumTransportModels/Base/kOmegaSST/kOmegaSSTBase.C @@ -35,9 +35,9 @@ namespace Foam // * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * * // -template +template tmp -kOmegaSST::kOmegaSST::F1 +kOmegaSST::kOmegaSST::F1 ( const volScalarField& CDkOmega ) const @@ -65,9 +65,10 @@ kOmegaSST::kOmegaSST::F1 return tanh(pow4(arg1)); } -template +template tmp -kOmegaSST::kOmegaSST::F2() const +kOmegaSST::kOmegaSST:: +F2() const { tmp arg2 = min ( @@ -82,9 +83,10 @@ kOmegaSST::kOmegaSST::F2() const return tanh(sqr(arg2)); } -template +template tmp -kOmegaSST::kOmegaSST::F3() const +kOmegaSST::kOmegaSST:: +F3() const { tmp arg3 = min ( @@ -95,9 +97,10 @@ kOmegaSST::kOmegaSST::F3() const return 1 - tanh(pow4(arg3)); } -template +template tmp -kOmegaSST::kOmegaSST::F23() const +kOmegaSST::kOmegaSST:: +F23() const { tmp f23(F2()); @@ -110,8 +113,8 @@ kOmegaSST::kOmegaSST::F23() const } -template -void kOmegaSST::correctNut +template +void kOmegaSST::correctNut ( const volScalarField& S2, const volScalarField& F2 @@ -120,23 +123,22 @@ void kOmegaSST::correctNut this->nut_ = a1_*k_/max(a1_*omega_, b1_*F2*sqrt(S2)); this->nut_.correctBoundaryConditions(); fv::options::New(this->mesh_).correct(this->nut_); - - BasicTurbulenceModel::correctNut(); } // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template -void kOmegaSST::correctNut() +template +void kOmegaSST:: +correctNut() { correctNut(2*magSqr(symm(fvc::grad(this->U_))), F23()); } -template +template tmp -kOmegaSST::Pk +kOmegaSST::Pk ( const volScalarField::Internal& G ) const @@ -145,9 +147,9 @@ kOmegaSST::Pk } -template +template tmp -kOmegaSST::epsilonByk +kOmegaSST::epsilonByk ( const volScalarField::Internal& F1, const volScalarField::Internal& F2 @@ -157,9 +159,9 @@ kOmegaSST::epsilonByk } -template +template tmp -kOmegaSST::kSource() const +kOmegaSST::kSource() const { return tmp ( @@ -172,9 +174,10 @@ kOmegaSST::kSource() const } -template +template tmp -kOmegaSST::omegaSource() const +kOmegaSST:: +omegaSource() const { return tmp ( @@ -187,8 +190,9 @@ kOmegaSST::omegaSource() const } -template -tmp kOmegaSST::Qsas +template +tmp +kOmegaSST::Qsas ( const volScalarField::Internal& S2, const volScalarField::Internal& gamma, @@ -208,8 +212,8 @@ tmp kOmegaSST::Qsas // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -kOmegaSST::kOmegaSST +template +kOmegaSST::kOmegaSST ( const word& type, const alphaField& alpha, @@ -220,7 +224,7 @@ kOmegaSST::kOmegaSST const transportModel& transport ) : - TurbulenceModel + MomentumTransportModel ( type, alpha, @@ -383,10 +387,10 @@ kOmegaSST::kOmegaSST // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool kOmegaSST::read() +template +bool kOmegaSST::read() { - if (TurbulenceModel::read()) + if (MomentumTransportModel::read()) { alphaK1_.readIfPresent(this->coeffDict()); alphaK2_.readIfPresent(this->coeffDict()); @@ -411,8 +415,8 @@ bool kOmegaSST::read() } -template -void kOmegaSST::correct() +template +void kOmegaSST::correct() { if (!this->turbulence_) { @@ -427,7 +431,7 @@ void kOmegaSST::correct() volScalarField& nut = this->nut_; fv::options& fvOptions(fv::options::New(this->mesh_)); - BasicTurbulenceModel::correct(); + BasicMomentumTransportModel::correct(); volScalarField::Internal divU ( diff --git a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H b/src/MomentumTransportModels/momentumTransportModels/Base/kOmegaSST/kOmegaSSTBase.H similarity index 96% rename from src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H rename to src/MomentumTransportModels/momentumTransportModels/Base/kOmegaSST/kOmegaSSTBase.H index f47ff5147d..7577d99cb0 100644 --- a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H +++ b/src/MomentumTransportModels/momentumTransportModels/Base/kOmegaSST/kOmegaSSTBase.H @@ -109,10 +109,10 @@ namespace Foam Class kOmegaSST Declaration \*---------------------------------------------------------------------------*/ -template +template class kOmegaSST : - public TurbulenceModel + public MomentumTransportModel { protected: @@ -240,9 +240,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; // Constructors diff --git a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/MomentumTransportModels/momentumTransportModels/LES/DeardorffDiffStress/DeardorffDiffStress.C similarity index 85% rename from src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C rename to src/MomentumTransportModels/momentumTransportModels/LES/DeardorffDiffStress/DeardorffDiffStress.C index a70bcd5359..deb1d07db2 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/DeardorffDiffStress/DeardorffDiffStress.C @@ -35,21 +35,19 @@ namespace LESModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template -void DeardorffDiffStress::correctNut() +template +void DeardorffDiffStress::correctNut() { this->nut_ = Ck_*sqrt(this->k())*this->delta(); this->nut_.correctBoundaryConditions(); fv::options::New(this->mesh_).correct(this->nut_); - - BasicTurbulenceModel::correctNut(); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -DeardorffDiffStress::DeardorffDiffStress +template +DeardorffDiffStress::DeardorffDiffStress ( const alphaField& alpha, const rhoField& rho, @@ -60,7 +58,7 @@ DeardorffDiffStress::DeardorffDiffStress const word& type ) : - ReynoldsStress> + ReynoldsStress> ( type, alpha, @@ -118,10 +116,10 @@ DeardorffDiffStress::DeardorffDiffStress // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool DeardorffDiffStress::read() +template +bool DeardorffDiffStress::read() { - if (ReynoldsStress>::read()) + if (ReynoldsStress>::read()) { Ck_.readIfPresent(this->coeffDict()); Cm_.readIfPresent(this->coeffDict()); @@ -137,8 +135,9 @@ bool DeardorffDiffStress::read() } -template -tmp DeardorffDiffStress::epsilon() const +template +tmp +DeardorffDiffStress::epsilon() const { volScalarField k(this->k()); @@ -150,8 +149,8 @@ tmp DeardorffDiffStress::epsilon() const } -template -void DeardorffDiffStress::correct() +template +void DeardorffDiffStress::correct() { if (!this->turbulence_) { @@ -166,7 +165,7 @@ void DeardorffDiffStress::correct() volSymmTensorField& R = this->R_; fv::options& fvOptions(fv::options::New(this->mesh_)); - ReynoldsStress>::correct(); + ReynoldsStress>::correct(); tmp tgradU(fvc::grad(U)); const volTensorField& gradU = tgradU(); diff --git a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H b/src/MomentumTransportModels/momentumTransportModels/LES/DeardorffDiffStress/DeardorffDiffStress.H similarity index 93% rename from src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H rename to src/MomentumTransportModels/momentumTransportModels/LES/DeardorffDiffStress/DeardorffDiffStress.H index 16abc982f7..1e9299620a 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/DeardorffDiffStress/DeardorffDiffStress.H @@ -76,10 +76,10 @@ namespace LESModels Class DeardorffDiffStress Declaration \*---------------------------------------------------------------------------*/ -template +template class DeardorffDiffStress : - public ReynoldsStress> + public ReynoldsStress> { protected: @@ -101,9 +101,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C b/src/MomentumTransportModels/momentumTransportModels/LES/LESModel/LESModel.C similarity index 86% rename from src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C rename to src/MomentumTransportModels/momentumTransportModels/LES/LESModel/LESModel.C index ef7fb5a30b..57939cabc4 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESModel/LESModel.C @@ -27,8 +27,8 @@ License // * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // -template -void Foam::LESModel::printCoeffs(const word& type) +template +void Foam::LESModel::printCoeffs(const word& type) { if (printCoeffs_) { @@ -39,8 +39,8 @@ void Foam::LESModel::printCoeffs(const word& type) // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::LESModel::LESModel +template +Foam::LESModel::LESModel ( const word& type, const alphaField& alpha, @@ -51,7 +51,7 @@ Foam::LESModel::LESModel const transportModel& transport ) : - BasicTurbulenceModel + BasicMomentumTransportModel ( type, alpha, @@ -118,9 +118,9 @@ Foam::LESModel::LESModel // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -template -Foam::autoPtr> -Foam::LESModel::New +template +Foam::autoPtr> +Foam::LESModel::New ( const alphaField& alpha, const rhoField& rho, @@ -132,7 +132,7 @@ Foam::LESModel::New { const IOdictionary modelDict ( - turbulenceModel::readModelDict + momentumTransportModel::readModelDict ( U.db(), alphaRhoPhi.group() @@ -170,10 +170,10 @@ Foam::LESModel::New // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool Foam::LESModel::read() +template +bool Foam::LESModel::read() { - if (BasicTurbulenceModel::read()) + if (BasicMomentumTransportModel::read()) { LESDict_ <<= this->subDict("LES"); LESDict_.lookup("turbulence") >> turbulence_; @@ -193,11 +193,11 @@ bool Foam::LESModel::read() } -template -void Foam::LESModel::correct() +template +void Foam::LESModel::correct() { delta_().correct(); - BasicTurbulenceModel::correct(); + BasicMomentumTransportModel::correct(); } diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H b/src/MomentumTransportModels/momentumTransportModels/LES/LESModel/LESModel.H similarity index 94% rename from src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H rename to src/MomentumTransportModels/momentumTransportModels/LES/LESModel/LESModel.H index efefac5a4f..8d4a350e10 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESModel/LESModel.H @@ -41,7 +41,7 @@ SourceFiles #ifndef LESModel_H #define LESModel_H -#include "TurbulenceModel.H" +#include "MomentumTransportModel.H" #include "LESdelta.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,10 +53,10 @@ namespace Foam Class LESModel Declaration \*---------------------------------------------------------------------------*/ -template +template class LESModel : - public BasicTurbulenceModel + public BasicMomentumTransportModel { protected: @@ -96,9 +96,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C similarity index 95% rename from src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C rename to src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C index 8011e369d2..fcbe1cb73f 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/IDDESDelta/IDDESDelta.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 @@ -44,7 +44,7 @@ namespace LESModels void Foam::LESModels::IDDESDelta::calcDelta() { const volScalarField& hmax = hmax_; - const fvMesh& mesh = turbulenceModel_.mesh(); + const fvMesh& mesh = momentumTransportModel_.mesh(); // Wall-normal vectors const volVectorField& n = wallDist::New(mesh).n(); @@ -128,7 +128,7 @@ void Foam::LESModels::IDDESDelta::calcDelta() Foam::LESModels::IDDESDelta::IDDESDelta ( const word& name, - const turbulenceModel& turbulence, + const momentumTransportModel& turbulence, const dictionary& dict ) : @@ -166,7 +166,7 @@ void Foam::LESModels::IDDESDelta::read(const dictionary& dict) void Foam::LESModels::IDDESDelta::correct() { - if (turbulenceModel_.mesh().changing()) + if (momentumTransportModel_.mesh().changing()) { hmax_.correct(); calcDelta(); diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H similarity index 96% rename from src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H rename to src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H index d8df2051ea..0ec4e61243 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/IDDESDelta/IDDESDelta.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 @@ -79,7 +79,7 @@ public: IDDESDelta ( const word& name, - const turbulenceModel& turbulence, + const momentumTransportModel& turbulence, const dictionary& ); diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/LESdelta/LESdelta.C similarity index 94% rename from src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C rename to src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/LESdelta/LESdelta.C index 647a0b0c02..873bc08d3e 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/LESdelta/LESdelta.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 @@ -39,10 +39,10 @@ namespace Foam Foam::LESdelta::LESdelta ( const word& name, - const turbulenceModel& turbulence + const momentumTransportModel& turbulence ) : - turbulenceModel_(turbulence), + momentumTransportModel_(turbulence), delta_ ( IOobject @@ -65,7 +65,7 @@ Foam::LESdelta::LESdelta Foam::autoPtr Foam::LESdelta::New ( const word& name, - const turbulenceModel& turbulence, + const momentumTransportModel& turbulence, const dictionary& dict ) { @@ -93,7 +93,7 @@ Foam::autoPtr Foam::LESdelta::New Foam::autoPtr Foam::LESdelta::New ( const word& name, - const turbulenceModel& turbulence, + const momentumTransportModel& turbulence, const dictionary& dict, const dictionaryConstructorTable& additionalConstructors ) diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/LESdelta/LESdelta.H similarity index 85% rename from src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H rename to src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/LESdelta/LESdelta.H index 92d0259a14..14c481ac7e 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/LESdelta/LESdelta.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 @@ -35,7 +35,7 @@ SourceFiles #ifndef LESdelta_H #define LESdelta_H -#include "turbulenceModel.H" +#include "momentumTransportModel.H" #include "volFields.H" #include "runTimeSelectionTables.H" @@ -54,7 +54,7 @@ protected: // Protected data - const turbulenceModel& turbulenceModel_; + const momentumTransportModel& momentumTransportModel_; volScalarField delta_; @@ -74,7 +74,7 @@ public: dictionary, ( const word& name, - const turbulenceModel& turbulence, + const momentumTransportModel& turbulence, const dictionary& dict ), (name, turbulence, dict) @@ -83,11 +83,11 @@ public: // Constructors - //- Construct from name, turbulenceModel and dictionary + //- Construct from name, momentumTransportModel and dictionary LESdelta ( const word& name, - const turbulenceModel& turbulence + const momentumTransportModel& turbulence ); //- Disallow default bitwise copy construction @@ -100,7 +100,7 @@ public: static autoPtr New ( const word& name, - const turbulenceModel& turbulence, + const momentumTransportModel& turbulence, const dictionary& dict ); @@ -108,7 +108,7 @@ public: static autoPtr New ( const word& name, - const turbulenceModel& turbulence, + const momentumTransportModel& turbulence, const dictionary& dict, const dictionaryConstructorTable& ); @@ -121,10 +121,10 @@ public: // Member Functions - //- Return turbulenceModel reference - const turbulenceModel& turbulence() const + //- Return momentumTransportModel reference + const momentumTransportModel& turbulence() const { - return turbulenceModel_; + return momentumTransportModel_; } //- Read the LESdelta dictionary diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C similarity index 92% rename from src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C rename to src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C index 26117bec8a..e5de908681 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.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 @@ -46,7 +46,7 @@ void Foam::LESModels::PrandtlDelta::calcDelta() delta_ = min ( static_cast(geometricDelta_()), - (kappa_/Cdelta_)*wallDist::New(turbulenceModel_.mesh()).y() + (kappa_/Cdelta_)*wallDist::New(momentumTransportModel_.mesh()).y() ); } @@ -56,7 +56,7 @@ void Foam::LESModels::PrandtlDelta::calcDelta() Foam::LESModels::PrandtlDelta::PrandtlDelta ( const word& name, - const turbulenceModel& turbulence, + const momentumTransportModel& turbulence, const dictionary& dict ) : @@ -101,7 +101,7 @@ void Foam::LESModels::PrandtlDelta::correct() { geometricDelta_().correct(); - if (turbulenceModel_.mesh().changing()) + if (momentumTransportModel_.mesh().changing()) { calcDelta(); } diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H similarity index 96% rename from src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H rename to src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H index 05984f3d4f..3558112304 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H @@ -97,11 +97,11 @@ public: // Constructors - //- Construct from name, turbulenceModel and dictionary + //- Construct from name, momentumTransportModel and dictionary PrandtlDelta ( const word& name, - const turbulenceModel& turbulence, + const momentumTransportModel& turbulence, const dictionary& ); diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C similarity index 93% rename from src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C rename to src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C index 469bc48e86..e2315dfb36 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.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 @@ -42,7 +42,7 @@ namespace LESModels void Foam::LESModels::cubeRootVolDelta::calcDelta() { - const fvMesh& mesh = turbulenceModel_.mesh(); + const fvMesh& mesh = momentumTransportModel_.mesh(); label nD = mesh.nGeometricD(); @@ -84,7 +84,7 @@ void Foam::LESModels::cubeRootVolDelta::calcDelta() Foam::LESModels::cubeRootVolDelta::cubeRootVolDelta ( const word& name, - const turbulenceModel& turbulence, + const momentumTransportModel& turbulence, const dictionary& dict ) : @@ -118,7 +118,7 @@ void Foam::LESModels::cubeRootVolDelta::read(const dictionary& dict) void Foam::LESModels::cubeRootVolDelta::correct() { - if (turbulenceModel_.mesh().changing()) + if (momentumTransportModel_.mesh().changing()) { calcDelta(); } diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H similarity index 93% rename from src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H rename to src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H index 0b92cbffa6..ba53361d5c 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.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 @@ -71,11 +71,11 @@ public: // Constructors - //- Construct from name, turbulenceModel and dictionary + //- Construct from name, momentumTransportModel and dictionary cubeRootVolDelta ( const word& name, - const turbulenceModel& turbulence, + const momentumTransportModel& turbulence, const dictionary& ); diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C similarity index 94% rename from src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C rename to src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C index fdafbe1dfa..6a88f47b74 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.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 @@ -42,7 +42,7 @@ namespace LESModels void Foam::LESModels::maxDeltaxyz::calcDelta() { - const fvMesh& mesh = turbulenceModel_.mesh(); + const fvMesh& mesh = momentumTransportModel_.mesh(); label nD = mesh.nGeometricD(); @@ -95,7 +95,7 @@ void Foam::LESModels::maxDeltaxyz::calcDelta() Foam::LESModels::maxDeltaxyz::maxDeltaxyz ( const word& name, - const turbulenceModel& turbulence, + const momentumTransportModel& turbulence, const dictionary& dict ) : @@ -127,7 +127,7 @@ void Foam::LESModels::maxDeltaxyz::read(const dictionary& dict) void Foam::LESModels::maxDeltaxyz::correct() { - if (turbulenceModel_.mesh().changing()) + if (momentumTransportModel_.mesh().changing()) { calcDelta(); } diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H similarity index 94% rename from src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H rename to src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H index 9f4b41f0c3..0a72a7463f 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.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 @@ -75,11 +75,11 @@ public: // Constructors - //- Construct from name, turbulenceModel and dictionary + //- Construct from name, momentumTransportModel and dictionary maxDeltaxyz ( const word& name, - const turbulenceModel& turbulence, + const momentumTransportModel& turbulence, const dictionary& ); diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/smoothDelta/smoothDelta.C similarity index 95% rename from src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C rename to src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/smoothDelta/smoothDelta.C index ab8688bcc5..e55c1f26a9 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/smoothDelta/smoothDelta.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 @@ -96,7 +96,7 @@ void Foam::LESModels::smoothDelta::setChangedFaces void Foam::LESModels::smoothDelta::calcDelta() { - const fvMesh& mesh = turbulenceModel_.mesh(); + const fvMesh& mesh = momentumTransportModel_.mesh(); const volScalarField& geometricDelta = geometricDelta_(); @@ -142,7 +142,7 @@ void Foam::LESModels::smoothDelta::calcDelta() Foam::LESModels::smoothDelta::smoothDelta ( const word& name, - const turbulenceModel& turbulence, + const momentumTransportModel& turbulence, const dictionary& dict ) : @@ -181,7 +181,7 @@ void Foam::LESModels::smoothDelta::correct() { geometricDelta_().correct(); - if (turbulenceModel_.mesh().changing()) + if (momentumTransportModel_.mesh().changing()) { calcDelta(); } diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/smoothDelta/smoothDelta.H similarity index 97% rename from src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H rename to src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/smoothDelta/smoothDelta.H index cecc5266d7..2223512549 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/smoothDelta/smoothDelta.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 @@ -253,11 +253,11 @@ public: // Constructors - //- Construct from name, turbulenceModel and dictionary + //- Construct from name, momentumTransportModel and dictionary smoothDelta ( const word& name, - const turbulenceModel& turbulence, + const momentumTransportModel& turbulence, const dictionary& ); diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H rename to src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H index bfddc2dc7b..c2136060d9 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/smoothDelta/smoothDeltaDeltaDataI.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/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C similarity index 91% rename from src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C rename to src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C index e9e43f476c..1d71084000 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.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 @@ -44,12 +44,12 @@ namespace LESModels void Foam::LESModels::vanDriestDelta::calcDelta() { - const fvMesh& mesh = turbulenceModel_.mesh(); + const fvMesh& mesh = momentumTransportModel_.mesh(); - const volVectorField& U = turbulenceModel_.U(); - const tmp tnu = turbulenceModel_.nu(); + const volVectorField& U = momentumTransportModel_.U(); + const tmp tnu = momentumTransportModel_.nu(); const volScalarField& nu = tnu(); - tmp nuSgs = turbulenceModel_.nut(); + tmp nuSgs = momentumTransportModel_.nut(); volScalarField ystar ( @@ -97,7 +97,7 @@ void Foam::LESModels::vanDriestDelta::calcDelta() Foam::LESModels::vanDriestDelta::vanDriestDelta ( const word& name, - const turbulenceModel& turbulence, + const momentumTransportModel& turbulence, const dictionary& dict ) : @@ -159,7 +159,7 @@ void Foam::LESModels::vanDriestDelta::read(const dictionary& dict) void Foam::LESModels::vanDriestDelta::correct() { - if (turbulenceModel_.mesh().time().timeIndex() % calcInterval_ == 0) + if (momentumTransportModel_.mesh().time().timeIndex() % calcInterval_ == 0) { geometricDelta_().correct(); calcDelta(); diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.H b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.H similarity index 94% rename from src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.H rename to src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.H index f72c25d20e..1bb9d0a43f 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESdeltas/vanDriestDelta/vanDriestDelta.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 @@ -76,11 +76,11 @@ public: // Constructors - //- Construct from name, turbulenceModel and dictionary + //- Construct from name, momentumTransportModel and dictionary vanDriestDelta ( const word& name, - const turbulenceModel& turbulence, + const momentumTransportModel& turbulence, const dictionary& ); diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C b/src/MomentumTransportModels/momentumTransportModels/LES/LESeddyViscosity/LESeddyViscosity.C similarity index 84% rename from src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C rename to src/MomentumTransportModels/momentumTransportModels/LES/LESeddyViscosity/LESeddyViscosity.C index 54fdbd976e..fc09ca4d3e 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESeddyViscosity/LESeddyViscosity.C @@ -34,8 +34,8 @@ namespace LESModels // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -LESeddyViscosity::LESeddyViscosity +template +LESeddyViscosity::LESeddyViscosity ( const word& type, const alphaField& alpha, @@ -46,7 +46,7 @@ LESeddyViscosity::LESeddyViscosity const transportModel& transport ) : - eddyViscosity> + eddyViscosity> ( type, alpha, @@ -71,10 +71,10 @@ LESeddyViscosity::LESeddyViscosity // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool LESeddyViscosity::read() +template +bool LESeddyViscosity::read() { - if (eddyViscosity>::read()) + if (eddyViscosity>::read()) { Ce_.readIfPresent(this->coeffDict()); @@ -87,8 +87,9 @@ bool LESeddyViscosity::read() } -template -tmp LESeddyViscosity::epsilon() const +template +tmp +LESeddyViscosity::epsilon() const { tmp tk(this->k()); diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H b/src/MomentumTransportModels/momentumTransportModels/LES/LESeddyViscosity/LESeddyViscosity.H similarity index 90% rename from src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H rename to src/MomentumTransportModels/momentumTransportModels/LES/LESeddyViscosity/LESeddyViscosity.H index 63b7c0166f..02e90a27e1 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESeddyViscosity/LESeddyViscosity.H @@ -49,10 +49,10 @@ namespace LESModels Class LESeddyViscosity Declaration \*---------------------------------------------------------------------------*/ -template +template class LESeddyViscosity : - public eddyViscosity> + public eddyViscosity> { protected: @@ -63,9 +63,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; // Constructors diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C b/src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/LESfilter/LESfilter.C similarity index 97% rename from src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C rename to src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/LESfilter/LESfilter.C index 1634aa6bf1..58408a2766 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/LESfilter/LESfilter.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/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H b/src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/LESfilter/LESfilter.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H rename to src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/LESfilter/LESfilter.H index 4ceb641d7a..ddd02907ae 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/LESfilter/LESfilter.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/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C b/src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C similarity index 98% rename from src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C rename to src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C index 1d54794fa5..645072bae2 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.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/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.H b/src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.H rename to src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.H index b2a0d2c046..71c5090793 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.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/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C b/src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/laplaceFilter/laplaceFilter.C similarity index 98% rename from src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C rename to src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/laplaceFilter/laplaceFilter.C index f3e07085f4..0c40f73f73 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/laplaceFilter/laplaceFilter.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/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.H b/src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/laplaceFilter/laplaceFilter.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.H rename to src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/laplaceFilter/laplaceFilter.H index f463c73832..47b865e96e 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/laplaceFilter/laplaceFilter.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/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.C b/src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/simpleFilter/simpleFilter.C similarity index 98% rename from src/TurbulenceModels/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.C rename to src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/simpleFilter/simpleFilter.C index 2b662c909a..fb07b55674 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/simpleFilter/simpleFilter.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/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.H b/src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/simpleFilter/simpleFilter.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.H rename to src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/simpleFilter/simpleFilter.H index 18555c8b35..bf7bb14bde 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/LESfilters/simpleFilter/simpleFilter.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/turbulenceModels/LES/Smagorinsky/Smagorinsky.C b/src/MomentumTransportModels/momentumTransportModels/LES/Smagorinsky/Smagorinsky.C similarity index 80% rename from src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C rename to src/MomentumTransportModels/momentumTransportModels/LES/Smagorinsky/Smagorinsky.C index 3ba684ad65..6cf69460d9 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/Smagorinsky/Smagorinsky.C @@ -35,8 +35,8 @@ namespace LESModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template -tmp Smagorinsky::k +template +tmp Smagorinsky::k ( const tmp& gradU ) const @@ -55,23 +55,21 @@ tmp Smagorinsky::k } -template -void Smagorinsky::correctNut() +template +void Smagorinsky::correctNut() { volScalarField k(this->k(fvc::grad(this->U_))); this->nut_ = Ck_*this->delta()*sqrt(k); this->nut_.correctBoundaryConditions(); fv::options::New(this->mesh_).correct(this->nut_); - - BasicTurbulenceModel::correctNut(); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Smagorinsky::Smagorinsky +template +Smagorinsky::Smagorinsky ( const alphaField& alpha, const rhoField& rho, @@ -82,7 +80,7 @@ Smagorinsky::Smagorinsky const word& type ) : - LESeddyViscosity + LESeddyViscosity ( type, alpha, @@ -112,10 +110,10 @@ Smagorinsky::Smagorinsky // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool Smagorinsky::read() +template +bool Smagorinsky::read() { - if (LESeddyViscosity::read()) + if (LESeddyViscosity::read()) { Ck_.readIfPresent(this->coeffDict()); @@ -128,8 +126,8 @@ bool Smagorinsky::read() } -template -tmp Smagorinsky::epsilon() const +template +tmp Smagorinsky::epsilon() const { volScalarField k(this->k(fvc::grad(this->U_))); @@ -141,10 +139,10 @@ tmp Smagorinsky::epsilon() const } -template -void Smagorinsky::correct() +template +void Smagorinsky::correct() { - LESeddyViscosity::correct(); + LESeddyViscosity::correct(); correctNut(); } diff --git a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H b/src/MomentumTransportModels/momentumTransportModels/LES/Smagorinsky/Smagorinsky.H similarity index 93% rename from src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H rename to src/MomentumTransportModels/momentumTransportModels/LES/Smagorinsky/Smagorinsky.H index 3ecdb4a244..d6665c462d 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/Smagorinsky/Smagorinsky.H @@ -83,10 +83,10 @@ namespace LESModels Class Smagorinsky Declaration \*---------------------------------------------------------------------------*/ -template +template class Smagorinsky : - public LESeddyViscosity + public LESeddyViscosity { protected: @@ -107,9 +107,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C similarity index 85% rename from src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C rename to src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C index adf96d33cd..5d37371dcf 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C @@ -34,8 +34,9 @@ namespace LESModels // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // -template -tmp SpalartAllmarasDDES::rd +template +tmp +SpalartAllmarasDDES::rd ( const volScalarField::Internal& magGradU ) const @@ -60,8 +61,9 @@ tmp SpalartAllmarasDDES::rd } -template -tmp SpalartAllmarasDDES::fd +template +tmp +SpalartAllmarasDDES::fd ( const volScalarField::Internal& magGradU ) const @@ -76,8 +78,9 @@ tmp SpalartAllmarasDDES::fd // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template -tmp SpalartAllmarasDDES::dTilda +template +tmp +SpalartAllmarasDDES::dTilda ( const volScalarField::Internal& chi, const volScalarField::Internal& fv1, @@ -104,8 +107,8 @@ tmp SpalartAllmarasDDES::dTilda // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -SpalartAllmarasDDES::SpalartAllmarasDDES +template +SpalartAllmarasDDES::SpalartAllmarasDDES ( const alphaField& alpha, const rhoField& rho, @@ -116,7 +119,7 @@ SpalartAllmarasDDES::SpalartAllmarasDDES const word& type ) : - SpalartAllmarasDES + SpalartAllmarasDES ( alpha, rho, diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H similarity index 92% rename from src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H rename to src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H index bf302124a9..608bb1784c 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H @@ -58,10 +58,10 @@ namespace LESModels Class SpalartAllmarasDDES Declaration \*---------------------------------------------------------------------------*/ -template +template class SpalartAllmarasDDES : - public SpalartAllmarasDES + public SpalartAllmarasDES { // Private Member Functions @@ -93,9 +93,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C similarity index 82% rename from src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C rename to src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C index ab2c1c3fe9..b68b53162a 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C @@ -35,8 +35,8 @@ namespace LESModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template -tmp SpalartAllmarasDES::chi() const +template +tmp SpalartAllmarasDES::chi() const { return volScalarField::New ( @@ -46,8 +46,8 @@ tmp SpalartAllmarasDES::chi() const } -template -tmp SpalartAllmarasDES::fv1 +template +tmp SpalartAllmarasDES::fv1 ( const volScalarField& chi ) const @@ -61,8 +61,9 @@ tmp SpalartAllmarasDES::fv1 } -template -tmp SpalartAllmarasDES::fv2 +template +tmp +SpalartAllmarasDES::fv2 ( const volScalarField::Internal& chi, const volScalarField::Internal& fv1 @@ -76,8 +77,9 @@ tmp SpalartAllmarasDES::fv2 } -template -tmp SpalartAllmarasDES::Omega +template +tmp +SpalartAllmarasDES::Omega ( const volTensorField::Internal& gradU ) const @@ -90,8 +92,9 @@ tmp SpalartAllmarasDES::Omega } -template -tmp SpalartAllmarasDES::Stilda +template +tmp +SpalartAllmarasDES::Stilda ( const volScalarField::Internal& chi, const volScalarField::Internal& fv1, @@ -112,8 +115,8 @@ tmp SpalartAllmarasDES::Stilda } -template -tmp SpalartAllmarasDES::r +template +tmp SpalartAllmarasDES::r ( const volScalarField::Internal& nur, const volScalarField::Internal& Omega, @@ -140,8 +143,9 @@ tmp SpalartAllmarasDES::r } -template -tmp SpalartAllmarasDES::fw +template +tmp +SpalartAllmarasDES::fw ( const volScalarField::Internal& Omega, const volScalarField::Internal& dTilda @@ -158,8 +162,9 @@ tmp SpalartAllmarasDES::fw } -template -tmp SpalartAllmarasDES::dTilda +template +tmp +SpalartAllmarasDES::dTilda ( const volScalarField::Internal& chi, const volScalarField::Internal& fv1, @@ -174,8 +179,8 @@ tmp SpalartAllmarasDES::dTilda } -template -void SpalartAllmarasDES::cacheLESRegion +template +void SpalartAllmarasDES::cacheLESRegion ( const volScalarField::Internal& dTilda ) const @@ -191,8 +196,8 @@ void SpalartAllmarasDES::cacheLESRegion } -template -void SpalartAllmarasDES::correctNut +template +void SpalartAllmarasDES::correctNut ( const volScalarField& fv1 ) @@ -200,13 +205,11 @@ void SpalartAllmarasDES::correctNut this->nut_ = nuTilda_*fv1; this->nut_.correctBoundaryConditions(); fv::options::New(this->mesh_).correct(this->nut_); - - BasicTurbulenceModel::correctNut(); } -template -void SpalartAllmarasDES::correctNut() +template +void SpalartAllmarasDES::correctNut() { correctNut(fv1(this->chi())); } @@ -214,8 +217,8 @@ void SpalartAllmarasDES::correctNut() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -SpalartAllmarasDES::SpalartAllmarasDES +template +SpalartAllmarasDES::SpalartAllmarasDES ( const alphaField& alpha, const rhoField& rho, @@ -226,7 +229,7 @@ SpalartAllmarasDES::SpalartAllmarasDES const word& type ) : - LESeddyViscosity + LESeddyViscosity ( type, alpha, @@ -353,10 +356,10 @@ SpalartAllmarasDES::SpalartAllmarasDES // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool SpalartAllmarasDES::read() +template +bool SpalartAllmarasDES::read() { - if (LESeddyViscosity::read()) + if (LESeddyViscosity::read()) { sigmaNut_.readIfPresent(this->coeffDict()); kappa_.readIfPresent(*this); @@ -381,8 +384,8 @@ bool SpalartAllmarasDES::read() } -template -tmp SpalartAllmarasDES:: +template +tmp SpalartAllmarasDES:: DnuTildaEff() const { return volScalarField::New @@ -393,8 +396,8 @@ DnuTildaEff() const } -template -tmp SpalartAllmarasDES::k() const +template +tmp SpalartAllmarasDES::k() const { const volScalarField chi(this->chi()); const volScalarField fv1(this->fv1(chi)); @@ -438,8 +441,8 @@ tmp SpalartAllmarasDES::k() const } -template -void SpalartAllmarasDES::correct() +template +void SpalartAllmarasDES::correct() { if (!this->turbulence_) { @@ -453,7 +456,7 @@ void SpalartAllmarasDES::correct() const volVectorField& U = this->U_; fv::options& fvOptions(fv::options::New(this->mesh_)); - LESeddyViscosity::correct(); + LESeddyViscosity::correct(); const volScalarField chi(this->chi()); const volScalarField fv1(this->fv1(chi)); diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H similarity index 95% rename from src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H rename to src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H index bae36f96eb..831b93ce0e 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H @@ -57,10 +57,10 @@ namespace LESModels Class SpalartAllmarasDES Declaration \*---------------------------------------------------------------------------*/ -template +template class SpalartAllmarasDES : - public LESeddyViscosity + public LESeddyViscosity { protected: @@ -151,9 +151,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C similarity index 85% rename from src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C rename to src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C index 603093e008..197d07bf9c 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C @@ -34,9 +34,9 @@ namespace LESModels // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // -template +template tmp -SpalartAllmarasIDDES::IDDESalpha() const +SpalartAllmarasIDDES::IDDESalpha() const { return volScalarField::Internal::New ( @@ -46,8 +46,9 @@ SpalartAllmarasIDDES::IDDESalpha() const } -template -tmp SpalartAllmarasIDDES::ft +template +tmp +SpalartAllmarasIDDES::ft ( const volScalarField::Internal& magGradU ) const @@ -60,8 +61,9 @@ tmp SpalartAllmarasIDDES::ft } -template -tmp SpalartAllmarasIDDES::fl +template +tmp +SpalartAllmarasIDDES::fl ( const volScalarField::Internal& magGradU ) const @@ -74,8 +76,9 @@ tmp SpalartAllmarasIDDES::fl } -template -tmp SpalartAllmarasIDDES::rd +template +tmp +SpalartAllmarasIDDES::rd ( const volScalarField::Internal& nur, const volScalarField::Internal& magGradU @@ -100,8 +103,9 @@ tmp SpalartAllmarasIDDES::rd } -template -tmp SpalartAllmarasIDDES::fd +template +tmp +SpalartAllmarasIDDES::fd ( const volScalarField::Internal& magGradU ) const @@ -116,9 +120,9 @@ tmp SpalartAllmarasIDDES::fd // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template +template tmp -SpalartAllmarasIDDES::dTilda +SpalartAllmarasIDDES::dTilda ( const volScalarField::Internal& chi, const volScalarField::Internal& fv1, @@ -210,8 +214,8 @@ SpalartAllmarasIDDES::dTilda // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -SpalartAllmarasIDDES::SpalartAllmarasIDDES +template +SpalartAllmarasIDDES::SpalartAllmarasIDDES ( const alphaField& alpha, const rhoField& rho, @@ -222,7 +226,7 @@ SpalartAllmarasIDDES::SpalartAllmarasIDDES const word& type ) : - SpalartAllmarasDES + SpalartAllmarasDES ( alpha, rho, @@ -264,10 +268,10 @@ SpalartAllmarasIDDES::SpalartAllmarasIDDES // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool SpalartAllmarasIDDES::read() +template +bool SpalartAllmarasIDDES::read() { - if (SpalartAllmarasDES::read()) + if (SpalartAllmarasDES::read()) { fwStar_.readIfPresent(this->coeffDict()); cl_.readIfPresent(this->coeffDict()); diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H similarity index 93% rename from src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H rename to src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H index f52ca209f7..8526bbc344 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H @@ -58,10 +58,10 @@ namespace LESModels Class SpalartAllmarasIDDES Declaration \*---------------------------------------------------------------------------*/ -template +template class SpalartAllmarasIDDES : - public SpalartAllmarasDES + public SpalartAllmarasDES { // Private Data @@ -120,9 +120,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C b/src/MomentumTransportModels/momentumTransportModels/LES/WALE/WALE.C similarity index 81% rename from src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C rename to src/MomentumTransportModels/momentumTransportModels/LES/WALE/WALE.C index 69c0cb005e..dca276f0bc 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/WALE/WALE.C @@ -35,8 +35,8 @@ namespace LESModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template -tmp WALE::Sd +template +tmp WALE::Sd ( const volTensorField& gradU ) const @@ -45,8 +45,8 @@ tmp WALE::Sd } -template -tmp WALE::k +template +tmp WALE::k ( const volTensorField& gradU ) const @@ -77,21 +77,19 @@ tmp WALE::k } -template -void WALE::correctNut() +template +void WALE::correctNut() { this->nut_ = Ck_*this->delta()*sqrt(this->k(fvc::grad(this->U_))); this->nut_.correctBoundaryConditions(); fv::options::New(this->mesh_).correct(this->nut_); - - BasicTurbulenceModel::correctNut(); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -WALE::WALE +template +WALE::WALE ( const alphaField& alpha, const rhoField& rho, @@ -102,7 +100,7 @@ WALE::WALE const word& type ) : - LESeddyViscosity + LESeddyViscosity ( type, alpha, @@ -142,10 +140,10 @@ WALE::WALE // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool WALE::read() +template +bool WALE::read() { - if (LESeddyViscosity::read()) + if (LESeddyViscosity::read()) { Ck_.readIfPresent(this->coeffDict()); Cw_.readIfPresent(this->coeffDict()); @@ -159,8 +157,8 @@ bool WALE::read() } -template -tmp WALE::epsilon() const +template +tmp WALE::epsilon() const { volScalarField k(this->k(fvc::grad(this->U_))); @@ -172,10 +170,10 @@ tmp WALE::epsilon() const } -template -void WALE::correct() +template +void WALE::correct() { - LESeddyViscosity::correct(); + LESeddyViscosity::correct(); correctNut(); } diff --git a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H b/src/MomentumTransportModels/momentumTransportModels/LES/WALE/WALE.H similarity index 93% rename from src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H rename to src/MomentumTransportModels/momentumTransportModels/LES/WALE/WALE.H index b5b3e5b4c8..fb603e1a7b 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/WALE/WALE.H @@ -70,10 +70,10 @@ namespace LESModels Class WALE Declaration \*---------------------------------------------------------------------------*/ -template +template class WALE : - public LESeddyViscosity + public LESeddyViscosity { protected: @@ -99,9 +99,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C b/src/MomentumTransportModels/momentumTransportModels/LES/dynamicKEqn/dynamicKEqn.C similarity index 80% rename from src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C rename to src/MomentumTransportModels/momentumTransportModels/LES/dynamicKEqn/dynamicKEqn.C index 802b4cd335..08811da91c 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/dynamicKEqn/dynamicKEqn.C @@ -35,8 +35,9 @@ namespace LESModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template -Foam::tmp dynamicKEqn::KK() const +template +Foam::tmp +dynamicKEqn::KK() const { return max ( @@ -46,8 +47,8 @@ Foam::tmp dynamicKEqn::KK() const } -template -volScalarField dynamicKEqn::Ck +template +volScalarField dynamicKEqn::Ck ( const volSymmTensorField& D, const volScalarField& KK @@ -77,8 +78,8 @@ volScalarField dynamicKEqn::Ck } -template -volScalarField dynamicKEqn::Ce +template +volScalarField dynamicKEqn::Ce ( const volSymmTensorField& D, const volScalarField& KK @@ -95,16 +96,16 @@ volScalarField dynamicKEqn::Ce } -template -volScalarField dynamicKEqn::Ce() const +template +volScalarField dynamicKEqn::Ce() const { const volSymmTensorField D(dev(symm(fvc::grad(this->U_)))); return Ce(D, KK()); } -template -void dynamicKEqn::correctNut +template +void dynamicKEqn::correctNut ( const volSymmTensorField& D, const volScalarField& KK @@ -113,20 +114,18 @@ void dynamicKEqn::correctNut this->nut_ = Ck(D, KK)*sqrt(k_)*this->delta(); this->nut_.correctBoundaryConditions(); fv::options::New(this->mesh_).correct(this->nut_); - - BasicTurbulenceModel::correctNut(); } -template -void dynamicKEqn::correctNut() +template +void dynamicKEqn::correctNut() { correctNut(symm(fvc::grad(this->U_)), KK()); } -template -tmp dynamicKEqn::kSource() const +template +tmp dynamicKEqn::kSource() const { return tmp ( @@ -142,8 +141,8 @@ tmp dynamicKEqn::kSource() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -dynamicKEqn::dynamicKEqn +template +dynamicKEqn::dynamicKEqn ( const alphaField& alpha, const rhoField& rho, @@ -154,7 +153,7 @@ dynamicKEqn::dynamicKEqn const word& type ) : - LESeddyViscosity + LESeddyViscosity ( type, alpha, @@ -193,10 +192,10 @@ dynamicKEqn::dynamicKEqn // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool dynamicKEqn::read() +template +bool dynamicKEqn::read() { - if (LESeddyViscosity::read()) + if (LESeddyViscosity::read()) { filter_.read(this->coeffDict()); @@ -209,8 +208,8 @@ bool dynamicKEqn::read() } -template -tmp dynamicKEqn::epsilon() const +template +tmp dynamicKEqn::epsilon() const { return volScalarField::New ( @@ -220,8 +219,8 @@ tmp dynamicKEqn::epsilon() const } -template -void dynamicKEqn::correct() +template +void dynamicKEqn::correct() { if (!this->turbulence_) { @@ -236,7 +235,7 @@ void dynamicKEqn::correct() volScalarField& nut = this->nut_; fv::options& fvOptions(fv::options::New(this->mesh_)); - LESeddyViscosity::correct(); + LESeddyViscosity::correct(); volScalarField divU(fvc::div(fvc::absolute(this->phi(), U))); diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H b/src/MomentumTransportModels/momentumTransportModels/LES/dynamicKEqn/dynamicKEqn.H similarity index 94% rename from src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H rename to src/MomentumTransportModels/momentumTransportModels/LES/dynamicKEqn/dynamicKEqn.H index ca467676f8..bd2c13f42d 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/dynamicKEqn/dynamicKEqn.H @@ -70,10 +70,10 @@ namespace LESModels Class dynamicKEqn Declaration \*---------------------------------------------------------------------------*/ -template +template class dynamicKEqn : - public LESeddyViscosity + public LESeddyViscosity { protected: @@ -126,9 +126,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C b/src/MomentumTransportModels/momentumTransportModels/LES/dynamicLagrangian/dynamicLagrangian.C similarity index 88% rename from src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C rename to src/MomentumTransportModels/momentumTransportModels/LES/dynamicLagrangian/dynamicLagrangian.C index f617b2bca2..49f07a6dec 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/dynamicLagrangian/dynamicLagrangian.C @@ -35,8 +35,8 @@ namespace LESModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template -void dynamicLagrangian::correctNut +template +void dynamicLagrangian::correctNut ( const tmp& gradU ) @@ -44,13 +44,11 @@ void dynamicLagrangian::correctNut this->nut_ = (flm_/fmm_)*sqr(this->delta())*mag(dev(symm(gradU))); this->nut_.correctBoundaryConditions(); fv::options::New(this->mesh_).correct(this->nut_); - - BasicTurbulenceModel::correctNut(); } -template -void dynamicLagrangian::correctNut() +template +void dynamicLagrangian::correctNut() { correctNut(fvc::grad(this->U_)); } @@ -58,8 +56,8 @@ void dynamicLagrangian::correctNut() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -dynamicLagrangian::dynamicLagrangian +template +dynamicLagrangian::dynamicLagrangian ( const alphaField& alpha, const rhoField& rho, @@ -70,7 +68,7 @@ dynamicLagrangian::dynamicLagrangian const word& type ) : - LESeddyViscosity + LESeddyViscosity ( type, alpha, @@ -131,10 +129,10 @@ dynamicLagrangian::dynamicLagrangian // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool dynamicLagrangian::read() +template +bool dynamicLagrangian::read() { - if (LESeddyViscosity::read()) + if (LESeddyViscosity::read()) { filter_.read(this->coeffDict()); theta_.readIfPresent(this->coeffDict()); @@ -148,8 +146,8 @@ bool dynamicLagrangian::read() } -template -void dynamicLagrangian::correct() +template +void dynamicLagrangian::correct() { if (!this->turbulence_) { @@ -163,7 +161,7 @@ void dynamicLagrangian::correct() const volVectorField& U = this->U_; fv::options& fvOptions(fv::options::New(this->mesh_)); - LESeddyViscosity::correct(); + LESeddyViscosity::correct(); tmp tgradU(fvc::grad(U)); const volTensorField& gradU = tgradU(); diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.H b/src/MomentumTransportModels/momentumTransportModels/LES/dynamicLagrangian/dynamicLagrangian.H similarity index 93% rename from src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.H rename to src/MomentumTransportModels/momentumTransportModels/LES/dynamicLagrangian/dynamicLagrangian.H index dc9fb6a072..3425cccd54 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/dynamicLagrangian/dynamicLagrangian.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/dynamicLagrangian/dynamicLagrangian.H @@ -56,10 +56,10 @@ namespace LESModels Class dynamicLagrangian Declaration \*---------------------------------------------------------------------------*/ -template +template class dynamicLagrangian : - public LESeddyViscosity + public LESeddyViscosity { protected: @@ -88,9 +88,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information TypeName("dynamicLagrangian"); diff --git a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C b/src/MomentumTransportModels/momentumTransportModels/LES/kEqn/kEqn.C similarity index 85% rename from src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C rename to src/MomentumTransportModels/momentumTransportModels/LES/kEqn/kEqn.C index 2d2c2a6031..ceb43e101d 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/kEqn/kEqn.C @@ -35,19 +35,17 @@ namespace LESModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template -void kEqn::correctNut() +template +void kEqn::correctNut() { this->nut_ = Ck_*sqrt(k_)*this->delta(); this->nut_.correctBoundaryConditions(); fv::options::New(this->mesh_).correct(this->nut_); - - BasicTurbulenceModel::correctNut(); } -template -tmp kEqn::kSource() const +template +tmp kEqn::kSource() const { return tmp ( @@ -63,8 +61,8 @@ tmp kEqn::kSource() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -kEqn::kEqn +template +kEqn::kEqn ( const alphaField& alpha, const rhoField& rho, @@ -75,7 +73,7 @@ kEqn::kEqn const word& type ) : - LESeddyViscosity + LESeddyViscosity ( type, alpha, @@ -120,10 +118,10 @@ kEqn::kEqn // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool kEqn::read() +template +bool kEqn::read() { - if (LESeddyViscosity::read()) + if (LESeddyViscosity::read()) { Ck_.readIfPresent(this->coeffDict()); @@ -136,8 +134,8 @@ bool kEqn::read() } -template -tmp kEqn::epsilon() const +template +tmp kEqn::epsilon() const { return volScalarField::New ( @@ -147,8 +145,8 @@ tmp kEqn::epsilon() const } -template -void kEqn::correct() +template +void kEqn::correct() { if (!this->turbulence_) { @@ -163,7 +161,7 @@ void kEqn::correct() volScalarField& nut = this->nut_; fv::options& fvOptions(fv::options::New(this->mesh_)); - LESeddyViscosity::correct(); + LESeddyViscosity::correct(); volScalarField divU(fvc::div(fvc::absolute(this->phi(), U))); diff --git a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H b/src/MomentumTransportModels/momentumTransportModels/LES/kEqn/kEqn.H similarity index 93% rename from src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H rename to src/MomentumTransportModels/momentumTransportModels/LES/kEqn/kEqn.H index 16dc9e6db2..d5ad9acaca 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/kEqn/kEqn.H @@ -68,10 +68,10 @@ namespace LESModels Class kEqn Declaration \*---------------------------------------------------------------------------*/ -template +template class kEqn : - public LESeddyViscosity + public LESeddyViscosity { protected: @@ -95,9 +95,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/LES/kOmegaSSTDES/kOmegaSSTDES.C b/src/MomentumTransportModels/momentumTransportModels/LES/kOmegaSSTDES/kOmegaSSTDES.C similarity index 80% rename from src/TurbulenceModels/turbulenceModels/LES/kOmegaSSTDES/kOmegaSSTDES.C rename to src/MomentumTransportModels/momentumTransportModels/LES/kOmegaSSTDES/kOmegaSSTDES.C index d220314287..9d23ede8f4 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/kOmegaSSTDES/kOmegaSSTDES.C +++ b/src/MomentumTransportModels/momentumTransportModels/LES/kOmegaSSTDES/kOmegaSSTDES.C @@ -34,15 +34,16 @@ namespace LESModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template -tmp kOmegaSSTDES::Lt() const +template +tmp +kOmegaSSTDES::Lt() const { return sqrt(this->k_())/(this->betaStar_*this->omega_()); } -template -tmp kOmegaSSTDES::FDES +template +tmp kOmegaSSTDES::FDES ( const volScalarField::Internal& F1, const volScalarField::Internal& F2 @@ -65,8 +66,9 @@ tmp kOmegaSSTDES::FDES } -template -tmp kOmegaSSTDES::epsilonByk +template +tmp +kOmegaSSTDES::epsilonByk ( const volScalarField::Internal& F1, const volScalarField::Internal& F2 @@ -78,8 +80,8 @@ tmp kOmegaSSTDES::epsilonByk // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -kOmegaSSTDES::kOmegaSSTDES +template +kOmegaSSTDES::kOmegaSSTDES ( const alphaField& alpha, const rhoField& rho, @@ -92,8 +94,8 @@ kOmegaSSTDES::kOmegaSSTDES : kOmegaSST < - LESeddyViscosity, - BasicTurbulenceModel + LESeddyViscosity, + BasicMomentumTransportModel > ( type, @@ -125,13 +127,16 @@ kOmegaSSTDES::kOmegaSSTDES // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool kOmegaSSTDES::read() +template +bool kOmegaSSTDES::read() { if ( - kOmegaSST, BasicTurbulenceModel> - ::read() + kOmegaSST + < + LESeddyViscosity, + BasicMomentumTransportModel + >::read() ) { CDES_.readIfPresent(this->coeffDict()); diff --git a/src/TurbulenceModels/turbulenceModels/LES/kOmegaSSTDES/kOmegaSSTDES.H b/src/MomentumTransportModels/momentumTransportModels/LES/kOmegaSSTDES/kOmegaSSTDES.H similarity index 92% rename from src/TurbulenceModels/turbulenceModels/LES/kOmegaSSTDES/kOmegaSSTDES.H rename to src/MomentumTransportModels/momentumTransportModels/LES/kOmegaSSTDES/kOmegaSSTDES.H index 728d477966..5c3d881c0f 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/kOmegaSSTDES/kOmegaSSTDES.H +++ b/src/MomentumTransportModels/momentumTransportModels/LES/kOmegaSSTDES/kOmegaSSTDES.H @@ -68,13 +68,13 @@ namespace LESModels Class kOmegaSST Declaration \*---------------------------------------------------------------------------*/ -template +template class kOmegaSSTDES : public Foam::kOmegaSST < - LESeddyViscosity, - BasicTurbulenceModel + LESeddyViscosity, + BasicMomentumTransportModel > { @@ -118,9 +118,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/Make/files b/src/MomentumTransportModels/momentumTransportModels/Make/files similarity index 97% rename from src/TurbulenceModels/turbulenceModels/Make/files rename to src/MomentumTransportModels/momentumTransportModels/Make/files index 4bdf69cbe1..96220d9e5f 100644 --- a/src/TurbulenceModels/turbulenceModels/Make/files +++ b/src/MomentumTransportModels/momentumTransportModels/Make/files @@ -1,4 +1,4 @@ -turbulenceModel.C +momentumTransportModel.C RAS/v2f/v2fBase.C LESdelta = LES/LESdeltas @@ -73,4 +73,4 @@ $(generalizedNewtonianViscosityModels)/HerschelBulkley/HerschelBulkley.C $(generalizedNewtonianViscosityModels)/powerLaw/powerLaw.C $(generalizedNewtonianViscosityModels)/strainRateFunction/strainRateFunction.C -LIB = $(FOAM_LIBBIN)/libturbulenceModels +LIB = $(FOAM_LIBBIN)/libmomentumTransportModels diff --git a/src/TurbulenceModels/turbulenceModels/Make/options b/src/MomentumTransportModels/momentumTransportModels/Make/options similarity index 100% rename from src/TurbulenceModels/turbulenceModels/Make/options rename to src/MomentumTransportModels/momentumTransportModels/Make/options diff --git a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C b/src/MomentumTransportModels/momentumTransportModels/MomentumTransportModel/MomentumTransportModel.C similarity index 79% rename from src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C rename to src/MomentumTransportModels/momentumTransportModels/MomentumTransportModel/MomentumTransportModel.C index 059a915bcc..03857a4776 100644 --- a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C +++ b/src/MomentumTransportModels/momentumTransportModels/MomentumTransportModel/MomentumTransportModel.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "TurbulenceModel.H" +#include "MomentumTransportModel.H" #include "volFields.H" #include "surfaceFields.H" @@ -33,11 +33,16 @@ template < class Alpha, class Rho, - class BasicTurbulenceModel, + class BasicMomentumTransportModel, class TransportModel > -Foam::TurbulenceModel:: -TurbulenceModel +Foam::MomentumTransportModel +< + Alpha, + Rho, + BasicMomentumTransportModel, + TransportModel +>::MomentumTransportModel ( const alphaField& alpha, const rhoField& rho, @@ -47,7 +52,7 @@ TurbulenceModel const transportModel& transport ) : - BasicTurbulenceModel + BasicMomentumTransportModel ( rho, U, @@ -65,14 +70,26 @@ template < class Alpha, class Rho, - class BasicTurbulenceModel, + class BasicMomentumTransportModel, class TransportModel > Foam::autoPtr < - Foam::TurbulenceModel + Foam::MomentumTransportModel + < + Alpha, + Rho, + BasicMomentumTransportModel, + TransportModel + > > -Foam::TurbulenceModel::New +Foam::MomentumTransportModel +< + Alpha, + Rho, + BasicMomentumTransportModel, + TransportModel +>::New ( const alphaField& alpha, const rhoField& rho, @@ -84,7 +101,7 @@ Foam::TurbulenceModel::New { const word modelType ( - turbulenceModel::readModelDict + momentumTransportModel::readModelDict ( U.db(), alphaRhoPhi.group() @@ -99,14 +116,14 @@ Foam::TurbulenceModel::New if (cstrIter == dictionaryConstructorTablePtr_->end()) { FatalErrorInFunction - << "Unknown TurbulenceModel type " + << "Unknown MomentumTransportModel type " << modelType << nl << nl - << "Valid TurbulenceModel types:" << endl + << "Valid MomentumTransportModel types:" << endl << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } - return autoPtr + return autoPtr ( cstrIter()(alpha, rho, U, alphaRhoPhi, phi, transport) ); diff --git a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H b/src/MomentumTransportModels/momentumTransportModels/MomentumTransportModel/MomentumTransportModel.H similarity index 86% rename from src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H rename to src/MomentumTransportModels/momentumTransportModels/MomentumTransportModel/MomentumTransportModel.H index 01a7f8e2f1..7e98897b3e 100644 --- a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H +++ b/src/MomentumTransportModels/momentumTransportModels/MomentumTransportModel/MomentumTransportModel.H @@ -22,20 +22,20 @@ License along with OpenFOAM. If not, see . Class - Foam::TurbulenceModel + Foam::MomentumTransportModel Description Templated abstract base class for turbulence models SourceFiles - TurbulenceModel.C + MomentumTransportModel.C \*---------------------------------------------------------------------------*/ -#ifndef TurbulenceModel_H -#define TurbulenceModel_H +#ifndef MomentumTransportModel_H +#define MomentumTransportModel_H -#include "turbulenceModel.H" +#include "momentumTransportModel.H" #include "autoPtr.H" #include "runTimeSelectionTables.H" @@ -45,19 +45,19 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class TurbulenceModel Declaration + Class MomentumTransportModel Declaration \*---------------------------------------------------------------------------*/ template < class Alpha, class Rho, - class BasicTurbulenceModel, + class BasicMomentumTransportModel, class TransportModel > -class TurbulenceModel +class MomentumTransportModel : - public BasicTurbulenceModel + public BasicMomentumTransportModel { public: @@ -82,7 +82,7 @@ public: declareRunTimeNewSelectionTable ( autoPtr, - TurbulenceModel, + MomentumTransportModel, dictionary, ( const alphaField& alpha, @@ -99,7 +99,7 @@ public: // Constructors //- Construct - TurbulenceModel + MomentumTransportModel ( const alphaField& alpha, const rhoField& rho, @@ -110,13 +110,13 @@ public: ); //- Disallow default bitwise copy construction - TurbulenceModel(const TurbulenceModel&) = delete; + MomentumTransportModel(const MomentumTransportModel&) = delete; // Selectors //- Return a reference to the selected turbulence model - static autoPtr New + static autoPtr New ( const alphaField& alpha, const rhoField& rho, @@ -128,7 +128,7 @@ public: //- Destructor - virtual ~TurbulenceModel() + virtual ~MomentumTransportModel() {} @@ -162,7 +162,7 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const TurbulenceModel&) = delete; + void operator=(const MomentumTransportModel&) = delete; }; @@ -173,7 +173,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "TurbulenceModel.C" + #include "MomentumTransportModel.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C b/src/MomentumTransportModels/momentumTransportModels/RAS/LRR/LRR.C similarity index 91% rename from src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C rename to src/MomentumTransportModels/momentumTransportModels/RAS/LRR/LRR.C index 23e14d6493..39deae53fb 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/LRR/LRR.C @@ -36,21 +36,19 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template -void LRR::correctNut() +template +void LRR::correctNut() { this->nut_ = this->Cmu_*sqr(k_)/epsilon_; this->nut_.correctBoundaryConditions(); fv::options::New(this->mesh_).correct(this->nut_); - - BasicTurbulenceModel::correctNut(); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -LRR::LRR +template +LRR::LRR ( const alphaField& alpha, const rhoField& rho, @@ -61,7 +59,7 @@ LRR::LRR const word& type ) : - ReynoldsStress> + ReynoldsStress> ( type, alpha, @@ -211,10 +209,10 @@ LRR::LRR // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool LRR::read() +template +bool LRR::read() { - if (ReynoldsStress>::read()) + if (ReynoldsStress>::read()) { Cmu_.readIfPresent(this->coeffDict()); C1_.readIfPresent(this->coeffDict()); @@ -238,8 +236,8 @@ bool LRR::read() } -template -tmp LRR::DREff() const +template +tmp LRR::DREff() const { return volSymmTensorField::New ( @@ -249,8 +247,8 @@ tmp LRR::DREff() const } -template -tmp LRR::DepsilonEff() const +template +tmp LRR::DepsilonEff() const { return volSymmTensorField::New ( @@ -260,8 +258,8 @@ tmp LRR::DepsilonEff() const } -template -void LRR::correct() +template +void LRR::correct() { if (!this->turbulence_) { @@ -276,7 +274,7 @@ void LRR::correct() volSymmTensorField& R = this->R_; fv::options& fvOptions(fv::options::New(this->mesh_)); - ReynoldsStress>::correct(); + ReynoldsStress>::correct(); tmp tgradU(fvc::grad(U)); const volTensorField& gradU = tgradU(); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H b/src/MomentumTransportModels/momentumTransportModels/RAS/LRR/LRR.H similarity index 94% rename from src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H rename to src/MomentumTransportModels/momentumTransportModels/RAS/LRR/LRR.H index 70f7e138e2..55dabef228 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/LRR/LRR.H @@ -94,10 +94,10 @@ namespace RASModels Class LRR Declaration \*---------------------------------------------------------------------------*/ -template +template class LRR : - public ReynoldsStress> + public ReynoldsStress> { protected: @@ -138,9 +138,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/MomentumTransportModels/momentumTransportModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C similarity index 85% rename from src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C rename to src/MomentumTransportModels/momentumTransportModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C index fa15f83cd1..4a5c5bbc6d 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/LaunderSharmaKE/LaunderSharmaKE.C @@ -36,15 +36,15 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template -tmp LaunderSharmaKE::fMu() const +template +tmp LaunderSharmaKE::fMu() const { return exp(-3.4/sqr(scalar(1) + sqr(k_)/(this->nu()*epsilon_)/50.0)); } -template -tmp LaunderSharmaKE::f2() const +template +tmp LaunderSharmaKE::f2() const { return scalar(1) @@ -52,19 +52,18 @@ tmp LaunderSharmaKE::f2() const } -template -void LaunderSharmaKE::correctNut() +template +void LaunderSharmaKE::correctNut() { this->nut_ = Cmu_*fMu()*sqr(k_)/epsilon_; this->nut_.correctBoundaryConditions(); fv::options::New(this->mesh_).correct(this->nut_); - - BasicTurbulenceModel::correctNut(); } -template -tmp LaunderSharmaKE::kSource() const +template +tmp +LaunderSharmaKE::kSource() const { return tmp ( @@ -78,8 +77,9 @@ tmp LaunderSharmaKE::kSource() const } -template -tmp LaunderSharmaKE::epsilonSource() const +template +tmp +LaunderSharmaKE::epsilonSource() const { return tmp ( @@ -95,8 +95,8 @@ tmp LaunderSharmaKE::epsilonSource() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -LaunderSharmaKE::LaunderSharmaKE +template +LaunderSharmaKE::LaunderSharmaKE ( const alphaField& alpha, const rhoField& rho, @@ -107,7 +107,7 @@ LaunderSharmaKE::LaunderSharmaKE const word& type ) : - eddyViscosity> + eddyViscosity> ( type, alpha, @@ -211,10 +211,10 @@ LaunderSharmaKE::LaunderSharmaKE // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool LaunderSharmaKE::read() +template +bool LaunderSharmaKE::read() { - if (eddyViscosity>::read()) + if (eddyViscosity>::read()) { Cmu_.readIfPresent(this->coeffDict()); C1_.readIfPresent(this->coeffDict()); @@ -232,8 +232,8 @@ bool LaunderSharmaKE::read() } -template -void LaunderSharmaKE::correct() +template +void LaunderSharmaKE::correct() { if (!this->turbulence_) { @@ -248,7 +248,7 @@ void LaunderSharmaKE::correct() volScalarField& nut = this->nut_; fv::options& fvOptions(fv::options::New(this->mesh_)); - eddyViscosity>::correct(); + eddyViscosity>::correct(); volScalarField divU(fvc::div(fvc::absolute(this->phi(), U))); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/MomentumTransportModels/momentumTransportModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H similarity index 94% rename from src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H rename to src/MomentumTransportModels/momentumTransportModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H index 1fa26fcd89..5748e3e597 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H @@ -78,10 +78,10 @@ namespace RASModels Class LaunderSharmaKE Declaration \*---------------------------------------------------------------------------*/ -template +template class LaunderSharmaKE : - public eddyViscosity> + public eddyViscosity> { protected: @@ -115,9 +115,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C b/src/MomentumTransportModels/momentumTransportModels/RAS/RASModel/RASModel.C similarity index 85% rename from src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C rename to src/MomentumTransportModels/momentumTransportModels/RAS/RASModel/RASModel.C index 5b59d03c9c..c0e856997b 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/RASModel/RASModel.C @@ -27,8 +27,8 @@ License // * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // -template -void Foam::RASModel::printCoeffs(const word& type) +template +void Foam::RASModel::printCoeffs(const word& type) { if (printCoeffs_) { @@ -39,8 +39,8 @@ void Foam::RASModel::printCoeffs(const word& type) // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::RASModel::RASModel +template +Foam::RASModel::RASModel ( const word& type, const alphaField& alpha, @@ -51,7 +51,7 @@ Foam::RASModel::RASModel const transportModel& transport ) : - BasicTurbulenceModel + BasicMomentumTransportModel ( type, alpha, @@ -108,9 +108,9 @@ Foam::RASModel::RASModel // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -template -Foam::autoPtr> -Foam::RASModel::New +template +Foam::autoPtr> +Foam::RASModel::New ( const alphaField& alpha, const rhoField& rho, @@ -122,7 +122,7 @@ Foam::RASModel::New { const IOdictionary modelDict ( - turbulenceModel::readModelDict + momentumTransportModel::readModelDict ( U.db(), alphaRhoPhi.group() @@ -160,10 +160,10 @@ Foam::RASModel::New // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool Foam::RASModel::read() +template +bool Foam::RASModel::read() { - if (BasicTurbulenceModel::read()) + if (BasicMomentumTransportModel::read()) { RASDict_ <<= this->subDict("RAS"); RASDict_.lookup("turbulence") >> turbulence_; @@ -183,10 +183,10 @@ bool Foam::RASModel::read() } -template -void Foam::RASModel::correct() +template +void Foam::RASModel::correct() { - BasicTurbulenceModel::correct(); + BasicMomentumTransportModel::correct(); } diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H b/src/MomentumTransportModels/momentumTransportModels/RAS/RASModel/RASModel.H similarity index 94% rename from src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H rename to src/MomentumTransportModels/momentumTransportModels/RAS/RASModel/RASModel.H index 62e5ccff8f..9b49dceb44 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/RASModel/RASModel.H @@ -35,7 +35,7 @@ SourceFiles #ifndef RASModel_H #define RASModel_H -#include "TurbulenceModel.H" +#include "MomentumTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -46,10 +46,10 @@ namespace Foam Class RASModel Declaration \*---------------------------------------------------------------------------*/ -template +template class RASModel : - public BasicTurbulenceModel + public BasicMomentumTransportModel { protected: @@ -86,9 +86,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.C similarity index 89% rename from src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C rename to src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.C index a074ae08d6..806fb47eab 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.C @@ -36,19 +36,17 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template -void RNGkEpsilon::correctNut() +template +void RNGkEpsilon::correctNut() { this->nut_ = Cmu_*sqr(k_)/epsilon_; this->nut_.correctBoundaryConditions(); fv::options::New(this->mesh_).correct(this->nut_); - - BasicTurbulenceModel::correctNut(); } -template -tmp RNGkEpsilon::kSource() const +template +tmp RNGkEpsilon::kSource() const { return tmp ( @@ -62,8 +60,9 @@ tmp RNGkEpsilon::kSource() const } -template -tmp RNGkEpsilon::epsilonSource() const +template +tmp +RNGkEpsilon::epsilonSource() const { return tmp ( @@ -79,8 +78,8 @@ tmp RNGkEpsilon::epsilonSource() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -RNGkEpsilon::RNGkEpsilon +template +RNGkEpsilon::RNGkEpsilon ( const alphaField& alpha, const rhoField& rho, @@ -91,7 +90,7 @@ RNGkEpsilon::RNGkEpsilon const word& type ) : - eddyViscosity> + eddyViscosity> ( type, alpha, @@ -212,10 +211,10 @@ RNGkEpsilon::RNGkEpsilon // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool RNGkEpsilon::read() +template +bool RNGkEpsilon::read() { - if (eddyViscosity>::read()) + if (eddyViscosity>::read()) { Cmu_.readIfPresent(this->coeffDict()); C1_.readIfPresent(this->coeffDict()); @@ -235,8 +234,8 @@ bool RNGkEpsilon::read() } -template -void RNGkEpsilon::correct() +template +void RNGkEpsilon::correct() { if (!this->turbulence_) { @@ -251,7 +250,7 @@ void RNGkEpsilon::correct() volScalarField& nut = this->nut_; fv::options& fvOptions(fv::options::New(this->mesh_)); - eddyViscosity>::correct(); + eddyViscosity>::correct(); volScalarField::Internal divU ( diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.H similarity index 94% rename from src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H rename to src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.H index cc209a588c..edbc119cc5 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/RNGkEpsilon/RNGkEpsilon.H @@ -79,10 +79,10 @@ namespace RASModels Class RNGkEpsilon Declaration \*---------------------------------------------------------------------------*/ -template +template class RNGkEpsilon : - public eddyViscosity> + public eddyViscosity> { // Private Member Functions @@ -120,9 +120,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C b/src/MomentumTransportModels/momentumTransportModels/RAS/SSG/SSG.C similarity index 91% rename from src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C rename to src/MomentumTransportModels/momentumTransportModels/RAS/SSG/SSG.C index 48267cb556..ec84077055 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/SSG/SSG.C @@ -36,21 +36,19 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template -void SSG::correctNut() +template +void SSG::correctNut() { this->nut_ = this->Cmu_*sqr(k_)/epsilon_; this->nut_.correctBoundaryConditions(); fv::options::New(this->mesh_).correct(this->nut_); - - BasicTurbulenceModel::correctNut(); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -SSG::SSG +template +SSG::SSG ( const alphaField& alpha, const rhoField& rho, @@ -61,7 +59,7 @@ SSG::SSG const word& type ) : - ReynoldsStress> + ReynoldsStress> ( type, alpha, @@ -220,10 +218,10 @@ SSG::SSG // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool SSG::read() +template +bool SSG::read() { - if (ReynoldsStress>::read()) + if (ReynoldsStress>::read()) { Cmu_.readIfPresent(this->coeffDict()); C1_.readIfPresent(this->coeffDict()); @@ -248,8 +246,8 @@ bool SSG::read() } -template -tmp SSG::DREff() const +template +tmp SSG::DREff() const { return volSymmTensorField::New ( @@ -259,8 +257,8 @@ tmp SSG::DREff() const } -template -tmp SSG::DepsilonEff() const +template +tmp SSG::DepsilonEff() const { return volSymmTensorField::New ( @@ -270,8 +268,8 @@ tmp SSG::DepsilonEff() const } -template -void SSG::correct() +template +void SSG::correct() { if (!this->turbulence_) { @@ -286,7 +284,7 @@ void SSG::correct() volSymmTensorField& R = this->R_; fv::options& fvOptions(fv::options::New(this->mesh_)); - ReynoldsStress>::correct(); + ReynoldsStress>::correct(); tmp tgradU(fvc::grad(U)); const volTensorField& gradU = tgradU(); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H b/src/MomentumTransportModels/momentumTransportModels/RAS/SSG/SSG.H similarity index 94% rename from src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H rename to src/MomentumTransportModels/momentumTransportModels/RAS/SSG/SSG.H index c068ea9bb8..b185cb3cc4 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/SSG/SSG.H @@ -89,10 +89,10 @@ namespace RASModels Class SSG Declaration \*---------------------------------------------------------------------------*/ -template +template class SSG : - public ReynoldsStress> + public ReynoldsStress> { protected: @@ -129,9 +129,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/MomentumTransportModels/momentumTransportModels/RAS/SpalartAllmaras/SpalartAllmaras.C similarity index 82% rename from src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C rename to src/MomentumTransportModels/momentumTransportModels/RAS/SpalartAllmaras/SpalartAllmaras.C index 8902da3177..389f55e305 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/SpalartAllmaras/SpalartAllmaras.C @@ -37,15 +37,15 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template -tmp SpalartAllmaras::chi() const +template +tmp SpalartAllmaras::chi() const { return volScalarField::New(modelName("chi"), nuTilda_/this->nu()); } -template -tmp SpalartAllmaras::fv1 +template +tmp SpalartAllmaras::fv1 ( const volScalarField& chi ) const @@ -55,8 +55,8 @@ tmp SpalartAllmaras::fv1 } -template -tmp SpalartAllmaras::fv2 +template +tmp SpalartAllmaras::fv2 ( const volScalarField::Internal& chi, const volScalarField::Internal& fv1 @@ -70,8 +70,9 @@ tmp SpalartAllmaras::fv2 } -template -tmp SpalartAllmaras::Stilda +template +tmp +SpalartAllmaras::Stilda ( const volScalarField::Internal& chi, const volScalarField::Internal& fv1 @@ -98,8 +99,8 @@ tmp SpalartAllmaras::Stilda } -template -tmp SpalartAllmaras::fw +template +tmp SpalartAllmaras::fw ( const volScalarField::Internal& Stilda ) const @@ -132,8 +133,8 @@ tmp SpalartAllmaras::fw } -template -void SpalartAllmaras::correctNut +template +void SpalartAllmaras::correctNut ( const volScalarField& fv1 ) @@ -141,13 +142,11 @@ void SpalartAllmaras::correctNut this->nut_ = nuTilda_*fv1; this->nut_.correctBoundaryConditions(); fv::options::New(this->mesh_).correct(this->nut_); - - BasicTurbulenceModel::correctNut(); } -template -void SpalartAllmaras::correctNut() +template +void SpalartAllmaras::correctNut() { correctNut(fv1(this->chi())); } @@ -155,8 +154,8 @@ void SpalartAllmaras::correctNut() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -SpalartAllmaras::SpalartAllmaras +template +SpalartAllmaras::SpalartAllmaras ( const alphaField& alpha, const rhoField& rho, @@ -167,7 +166,7 @@ SpalartAllmaras::SpalartAllmaras const word& type ) : - eddyViscosity> + eddyViscosity> ( type, alpha, @@ -277,10 +276,10 @@ SpalartAllmaras::SpalartAllmaras // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool SpalartAllmaras::read() +template +bool SpalartAllmaras::read() { - if (eddyViscosity>::read()) + if (eddyViscosity>::read()) { sigmaNut_.readIfPresent(this->coeffDict()); kappa_.readIfPresent(this->coeffDict()); @@ -302,8 +301,9 @@ bool SpalartAllmaras::read() } -template -tmp SpalartAllmaras::DnuTildaEff() const +template +tmp +SpalartAllmaras::DnuTildaEff() const { return volScalarField::New ( @@ -313,8 +313,8 @@ tmp SpalartAllmaras::DnuTildaEff() const } -template -tmp SpalartAllmaras::k() const +template +tmp SpalartAllmaras::k() const { return volScalarField::New ( @@ -325,8 +325,9 @@ tmp SpalartAllmaras::k() const } -template -tmp SpalartAllmaras::epsilon() const +template +tmp +SpalartAllmaras::epsilon() const { WarningInFunction << "Turbulence kinetic energy dissipation rate not defined for " @@ -342,8 +343,8 @@ tmp SpalartAllmaras::epsilon() const } -template -void SpalartAllmaras::correct() +template +void SpalartAllmaras::correct() { if (!this->turbulence_) { @@ -356,7 +357,7 @@ void SpalartAllmaras::correct() const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_; fv::options& fvOptions(fv::options::New(this->mesh_)); - eddyViscosity>::correct(); + eddyViscosity>::correct(); const volScalarField chi(this->chi()); const volScalarField fv1(this->fv1(chi)); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/MomentumTransportModels/momentumTransportModels/RAS/SpalartAllmaras/SpalartAllmaras.H similarity index 94% rename from src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H rename to src/MomentumTransportModels/momentumTransportModels/RAS/SpalartAllmaras/SpalartAllmaras.H index da68e8477a..12029faa98 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/SpalartAllmaras/SpalartAllmaras.H @@ -82,10 +82,10 @@ namespace RASModels Class SpalartAllmaras Declaration \*---------------------------------------------------------------------------*/ -template +template class SpalartAllmaras : - public eddyViscosity> + public eddyViscosity> { // Private Member Functions @@ -149,9 +149,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C similarity index 94% rename from src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C rename to src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C index 6dc6339418..f527511a1d 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C @@ -28,7 +28,7 @@ License #include "fvPatchFieldMapper.H" #include "surfaceFields.H" #include "volFields.H" -#include "turbulenceModel.H" +#include "momentumTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -126,14 +126,15 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs() } // Lookup Cmu corresponding to the turbulence model selected - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); const scalar Cmu = turbModel.coeffDict().lookupOrDefault("Cmu", 0.09); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H rename to src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H index ac15b2a181..1cd6432449 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.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/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C similarity index 94% rename from src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C rename to src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C index fc66cbdbd3..5fcfa17d3b 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C @@ -28,7 +28,7 @@ License #include "fvPatchFieldMapper.H" #include "surfaceFields.H" #include "volFields.H" -#include "turbulenceModel.H" +#include "momentumTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -122,14 +122,15 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs() } // Lookup Cmu corresponding to the turbulence model selected - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); const scalar Cmu = turbModel.coeffDict().lookupOrDefault("Cmu", 0.09); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H rename to src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H index 6845b469e1..186d4835ac 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.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/turbulenceModels/RAS/kEpsilon/kEpsilon.C b/src/MomentumTransportModels/momentumTransportModels/RAS/kEpsilon/kEpsilon.C similarity index 89% rename from src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C rename to src/MomentumTransportModels/momentumTransportModels/RAS/kEpsilon/kEpsilon.C index fe6524c766..743805c975 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/kEpsilon/kEpsilon.C @@ -36,19 +36,17 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template -void kEpsilon::correctNut() +template +void kEpsilon::correctNut() { this->nut_ = Cmu_*sqr(k_)/epsilon_; this->nut_.correctBoundaryConditions(); fv::options::New(this->mesh_).correct(this->nut_); - - BasicTurbulenceModel::correctNut(); } -template -tmp kEpsilon::kSource() const +template +tmp kEpsilon::kSource() const { return tmp ( @@ -62,8 +60,8 @@ tmp kEpsilon::kSource() const } -template -tmp kEpsilon::epsilonSource() const +template +tmp kEpsilon::epsilonSource() const { return tmp ( @@ -79,8 +77,8 @@ tmp kEpsilon::epsilonSource() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -kEpsilon::kEpsilon +template +kEpsilon::kEpsilon ( const alphaField& alpha, const rhoField& rho, @@ -91,7 +89,7 @@ kEpsilon::kEpsilon const word& type ) : - eddyViscosity> + eddyViscosity> ( type, alpha, @@ -194,10 +192,10 @@ kEpsilon::kEpsilon // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool kEpsilon::read() +template +bool kEpsilon::read() { - if (eddyViscosity>::read()) + if (eddyViscosity>::read()) { Cmu_.readIfPresent(this->coeffDict()); C1_.readIfPresent(this->coeffDict()); @@ -215,8 +213,8 @@ bool kEpsilon::read() } -template -void kEpsilon::correct() +template +void kEpsilon::correct() { if (!this->turbulence_) { @@ -231,7 +229,7 @@ void kEpsilon::correct() volScalarField& nut = this->nut_; fv::options& fvOptions(fv::options::New(this->mesh_)); - eddyViscosity>::correct(); + eddyViscosity>::correct(); volScalarField::Internal divU ( diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H b/src/MomentumTransportModels/momentumTransportModels/RAS/kEpsilon/kEpsilon.H similarity index 94% rename from src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H rename to src/MomentumTransportModels/momentumTransportModels/RAS/kEpsilon/kEpsilon.H index 04f1aef84c..d2336632ee 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/kEpsilon/kEpsilon.H @@ -80,10 +80,10 @@ namespace RASModels Class kEpsilon Declaration \*---------------------------------------------------------------------------*/ -template +template class kEpsilon : - public eddyViscosity> + public eddyViscosity> { protected: @@ -113,9 +113,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega/kOmega.C similarity index 88% rename from src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C rename to src/MomentumTransportModels/momentumTransportModels/RAS/kOmega/kOmega.C index 685d14b020..c5cb4bb40b 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega/kOmega.C @@ -36,19 +36,17 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template -void kOmega::correctNut() +template +void kOmega::correctNut() { this->nut_ = k_/omega_; this->nut_.correctBoundaryConditions(); fv::options::New(this->mesh_).correct(this->nut_); - - BasicTurbulenceModel::correctNut(); } -template -tmp kOmega::kSource() const +template +tmp kOmega::kSource() const { return tmp ( @@ -62,8 +60,8 @@ tmp kOmega::kSource() const } -template -tmp kOmega::omegaSource() const +template +tmp kOmega::omegaSource() const { return tmp ( @@ -78,8 +76,8 @@ tmp kOmega::omegaSource() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -kOmega::kOmega +template +kOmega::kOmega ( const alphaField& alpha, const rhoField& rho, @@ -90,7 +88,7 @@ kOmega::kOmega const word& type ) : - eddyViscosity> + eddyViscosity> ( type, alpha, @@ -184,10 +182,10 @@ kOmega::kOmega // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool kOmega::read() +template +bool kOmega::read() { - if (eddyViscosity>::read()) + if (eddyViscosity>::read()) { Cmu_.readIfPresent(this->coeffDict()); beta_.readIfPresent(this->coeffDict()); @@ -204,8 +202,8 @@ bool kOmega::read() } -template -void kOmega::correct() +template +void kOmega::correct() { if (!this->turbulence_) { @@ -220,7 +218,7 @@ void kOmega::correct() volScalarField& nut = this->nut_; fv::options& fvOptions(fv::options::New(this->mesh_)); - eddyViscosity>::correct(); + eddyViscosity>::correct(); volScalarField::Internal divU ( diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega/kOmega.H similarity index 93% rename from src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H rename to src/MomentumTransportModels/momentumTransportModels/RAS/kOmega/kOmega.H index fe8baf0298..c7134c4626 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmega/kOmega.H @@ -69,10 +69,10 @@ namespace RASModels Class kOmega Declaration \*---------------------------------------------------------------------------*/ -template +template class kOmega : - public eddyViscosity> + public eddyViscosity> { protected: @@ -103,9 +103,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSST/kOmegaSST.C similarity index 91% rename from src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C rename to src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSST/kOmegaSST.C index 85d8d2b0cf..903e7f3c51 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSST/kOmegaSST.C @@ -34,8 +34,8 @@ namespace RASModels // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -kOmegaSST::kOmegaSST +template +kOmegaSST::kOmegaSST ( const alphaField& alpha, const rhoField& rho, @@ -48,8 +48,8 @@ kOmegaSST::kOmegaSST : Foam::kOmegaSST < - eddyViscosity>, - BasicTurbulenceModel + eddyViscosity>, + BasicMomentumTransportModel > ( type, diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSST/kOmegaSST.H similarity index 88% rename from src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H rename to src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSST/kOmegaSST.H index d2b1c829c2..72d18dbc9c 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSST/kOmegaSST.H @@ -54,21 +54,21 @@ namespace RASModels Class kOmegaSST Declaration \*---------------------------------------------------------------------------*/ -template +template class kOmegaSST : public Foam::kOmegaSST < - eddyViscosity>, - BasicTurbulenceModel + eddyViscosity>, + BasicMomentumTransportModel > { public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C similarity index 89% rename from src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C rename to src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C index a31a899c6b..e0f1450c38 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSSTLM/kOmegaSSTLM.C @@ -34,8 +34,8 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template -tmp kOmegaSSTLM::F1 +template +tmp kOmegaSSTLM::F1 ( const volScalarField& CDkOmega ) const @@ -43,22 +43,23 @@ tmp kOmegaSSTLM::F1 const volScalarField Ry(this->y_*sqrt(this->k_)/this->nu()); const volScalarField F3(exp(-pow(Ry/120.0, 8))); - return max(kOmegaSST::F1(CDkOmega), F3); + return max(kOmegaSST::F1(CDkOmega), F3); } -template -tmp kOmegaSSTLM::Pk +template +tmp kOmegaSSTLM::Pk ( const volScalarField::Internal& G ) const { - return gammaIntEff_*kOmegaSST::Pk(G); + return gammaIntEff_*kOmegaSST::Pk(G); } -template -tmp kOmegaSSTLM::epsilonByk +template +tmp +kOmegaSSTLM::epsilonByk ( const volScalarField::Internal& F1, const volScalarField::Internal& F2 @@ -66,12 +67,12 @@ tmp kOmegaSSTLM::epsilonByk { return min(max(gammaIntEff_, scalar(0.1)), scalar(1)) - *kOmegaSST::epsilonByk(F1, F2); + *kOmegaSST::epsilonByk(F1, F2); } -template -tmp kOmegaSSTLM::Fthetat +template +tmp kOmegaSSTLM::Fthetat ( const volScalarField::Internal& Us, const volScalarField::Internal& Omega, @@ -101,9 +102,9 @@ tmp kOmegaSSTLM::Fthetat } -template +template tmp -kOmegaSSTLM::ReThetac() const +kOmegaSSTLM::ReThetac() const { tmp tReThetac ( @@ -137,8 +138,8 @@ kOmegaSSTLM::ReThetac() const } -template -tmp kOmegaSSTLM::Flength +template +tmp kOmegaSSTLM::Flength ( const volScalarField::Internal& nu ) const @@ -195,8 +196,9 @@ tmp kOmegaSSTLM::Flength } -template -tmp kOmegaSSTLM::ReThetat0 +template +tmp +kOmegaSSTLM::ReThetat0 ( const volScalarField::Internal& Us, const volScalarField::Internal& dUsds, @@ -304,8 +306,8 @@ tmp kOmegaSSTLM::ReThetat0 } -template -tmp kOmegaSSTLM::Fonset +template +tmp kOmegaSSTLM::Fonset ( const volScalarField::Internal& Rev, const volScalarField::Internal& ReThetac, @@ -331,8 +333,8 @@ tmp kOmegaSSTLM::Fonset // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -kOmegaSSTLM::kOmegaSSTLM +template +kOmegaSSTLM::kOmegaSSTLM ( const alphaField& alpha, const rhoField& rho, @@ -343,7 +345,7 @@ kOmegaSSTLM::kOmegaSSTLM const word& type ) : - kOmegaSST + kOmegaSST ( alpha, rho, @@ -459,10 +461,10 @@ kOmegaSSTLM::kOmegaSSTLM // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool kOmegaSSTLM::read() +template +bool kOmegaSSTLM::read() { - if (kOmegaSST::read()) + if (kOmegaSST::read()) { ca1_.readIfPresent(this->coeffDict()); ca2_.readIfPresent(this->coeffDict()); @@ -482,8 +484,8 @@ bool kOmegaSSTLM::read() } -template -void kOmegaSSTLM::correctReThetatGammaInt() +template +void kOmegaSSTLM::correctReThetatGammaInt() { // Local references const alphaField& alpha = this->alpha_; @@ -580,8 +582,8 @@ void kOmegaSSTLM::correctReThetatGammaInt() } -template -void kOmegaSSTLM::correct() +template +void kOmegaSSTLM::correct() { if (!this->turbulence_) { @@ -592,7 +594,7 @@ void kOmegaSSTLM::correct() correctReThetatGammaInt(); // Correct k and omega - kOmegaSST::correct(); + kOmegaSST::correct(); } diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.H b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSSTLM/kOmegaSSTLM.H similarity index 96% rename from src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.H rename to src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSSTLM/kOmegaSSTLM.H index 201af2a5b8..645cd73e5a 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTLM/kOmegaSSTLM.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSSTLM/kOmegaSSTLM.H @@ -98,10 +98,10 @@ namespace RASModels Class kOmegaSSTLM Declaration \*---------------------------------------------------------------------------*/ -template +template class kOmegaSSTLM : - public kOmegaSST + public kOmegaSST { protected: @@ -200,9 +200,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C similarity index 92% rename from src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C rename to src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C index 6b161e1402..921f308b44 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C @@ -34,8 +34,8 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template -tmp kOmegaSSTSAS::Qsas +template +tmp kOmegaSSTSAS::Qsas ( const volScalarField::Internal& S2, const volScalarField::Internal& gamma, @@ -92,8 +92,8 @@ tmp kOmegaSSTSAS::Qsas // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -kOmegaSSTSAS::kOmegaSSTSAS +template +kOmegaSSTSAS::kOmegaSSTSAS ( const alphaField& alpha, const rhoField& rho, @@ -104,7 +104,7 @@ kOmegaSSTSAS::kOmegaSSTSAS const word& type ) : - kOmegaSST + kOmegaSST ( alpha, rho, @@ -174,10 +174,10 @@ kOmegaSSTSAS::kOmegaSSTSAS // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool kOmegaSSTSAS::read() +template +bool kOmegaSSTSAS::read() { - if (kOmegaSST::read()) + if (kOmegaSST::read()) { Cs_.readIfPresent(this->coeffDict()); kappa_.readIfPresent(this->coeffDict()); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H similarity index 94% rename from src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H rename to src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H index 0bf284b92c..6927283dea 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.H @@ -92,10 +92,10 @@ namespace RASModels Class kOmegaSSTSAS Declaration \*---------------------------------------------------------------------------*/ -template +template class kOmegaSSTSAS : - public kOmegaSST + public kOmegaSST { protected: @@ -129,9 +129,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C b/src/MomentumTransportModels/momentumTransportModels/RAS/realizableKE/realizableKE.C similarity index 87% rename from src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C rename to src/MomentumTransportModels/momentumTransportModels/RAS/realizableKE/realizableKE.C index b9b7d0e5b3..75c737a387 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/realizableKE/realizableKE.C @@ -36,8 +36,8 @@ namespace RASModels // * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * * // -template -tmp realizableKE::rCmu +template +tmp realizableKE::rCmu ( const volTensorField& gradU, const volScalarField& S2, @@ -69,8 +69,8 @@ tmp realizableKE::rCmu } -template -void realizableKE::correctNut +template +void realizableKE::correctNut ( const volTensorField& gradU, const volScalarField& S2, @@ -80,13 +80,11 @@ void realizableKE::correctNut this->nut_ = rCmu(gradU, S2, magS)*sqr(k_)/epsilon_; this->nut_.correctBoundaryConditions(); fv::options::New(this->mesh_).correct(this->nut_); - - BasicTurbulenceModel::correctNut(); } -template -void realizableKE::correctNut() +template +void realizableKE::correctNut() { tmp tgradU = fvc::grad(this->U_); volScalarField S2(modelName("S2"), 2*magSqr(dev(symm(tgradU())))); @@ -96,8 +94,8 @@ void realizableKE::correctNut() } -template -tmp realizableKE::kSource() const +template +tmp realizableKE::kSource() const { return tmp ( @@ -111,8 +109,9 @@ tmp realizableKE::kSource() const } -template -tmp realizableKE::epsilonSource() const +template +tmp +realizableKE::epsilonSource() const { return tmp ( @@ -128,8 +127,8 @@ tmp realizableKE::epsilonSource() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -realizableKE::realizableKE +template +realizableKE::realizableKE ( const alphaField& alpha, const rhoField& rho, @@ -140,7 +139,7 @@ realizableKE::realizableKE const word& type ) : - eddyViscosity> + eddyViscosity> ( type, alpha, @@ -224,10 +223,10 @@ realizableKE::realizableKE // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool realizableKE::read() +template +bool realizableKE::read() { - if (eddyViscosity>::read()) + if (eddyViscosity>::read()) { A0_.readIfPresent(this->coeffDict()); C2_.readIfPresent(this->coeffDict()); @@ -243,8 +242,8 @@ bool realizableKE::read() } -template -void realizableKE::correct() +template +void realizableKE::correct() { if (!this->turbulence_) { @@ -259,7 +258,7 @@ void realizableKE::correct() volScalarField& nut = this->nut_; fv::options& fvOptions(fv::options::New(this->mesh_)); - eddyViscosity>::correct(); + eddyViscosity>::correct(); volScalarField::Internal divU ( diff --git a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.H b/src/MomentumTransportModels/momentumTransportModels/RAS/realizableKE/realizableKE.H similarity index 94% rename from src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.H rename to src/MomentumTransportModels/momentumTransportModels/RAS/realizableKE/realizableKE.H index 2a091da855..bd802152c9 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/realizableKE/realizableKE.H @@ -74,10 +74,10 @@ namespace RASModels Class realizableKE Declaration \*---------------------------------------------------------------------------*/ -template +template class realizableKE : - public eddyViscosity> + public eddyViscosity> { // Private Member Functions @@ -125,9 +125,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C b/src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2f.C similarity index 92% rename from src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C rename to src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2f.C index c3e20b06ab..5d9efc3010 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2f.C @@ -36,15 +36,15 @@ namespace RASModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template -tmp v2f::Ts() const +template +tmp v2f::Ts() const { return max(k_/epsilon_, 6.0*sqrt(this->nu()/epsilon_)); } -template -tmp v2f::Ls() const +template +tmp v2f::Ls() const { return CL_*max(pow(k_, 1.5) @@ -52,21 +52,19 @@ tmp v2f::Ls() const } -template -void v2f::correctNut() +template +void v2f::correctNut() { this->nut_ = min(CmuKEps_*sqr(k_)/epsilon_, this->Cmu_*v2_*Ts()); this->nut_.correctBoundaryConditions(); fv::options::New(this->mesh_).correct(this->nut_); - - BasicTurbulenceModel::correctNut(); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -v2f::v2f +template +v2f::v2f ( const alphaField& alpha, const rhoField& rho, @@ -77,7 +75,7 @@ v2f::v2f const word& type ) : - eddyViscosity> + eddyViscosity> ( type, alpha, @@ -245,10 +243,10 @@ v2f::v2f // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool v2f::read() +template +bool v2f::read() { - if (eddyViscosity>::read()) + if (eddyViscosity>::read()) { Cmu_.readIfPresent(this->coeffDict()); CmuKEps_.readIfPresent(this->coeffDict()); @@ -270,8 +268,8 @@ bool v2f::read() } -template -void v2f::correct() +template +void v2f::correct() { if (!this->turbulence_) { @@ -286,7 +284,7 @@ void v2f::correct() volScalarField& nut = this->nut_; fv::options& fvOptions(fv::options::New(this->mesh_)); - eddyViscosity>::correct(); + eddyViscosity>::correct(); volScalarField divU(fvc::div(fvc::absolute(this->phi(), U))); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.H b/src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2f.H similarity index 95% rename from src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.H rename to src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2f.H index 1a2537fa57..f5a08b4d04 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2f.H @@ -114,10 +114,10 @@ namespace RASModels Class v2f Declaration \*---------------------------------------------------------------------------*/ -template +template class v2f : - public eddyViscosity>, + public eddyViscosity>, public v2fBase { @@ -173,9 +173,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2fBase.C b/src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2fBase.C similarity index 95% rename from src/TurbulenceModels/turbulenceModels/RAS/v2f/v2fBase.C rename to src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2fBase.C index e4e5b3a772..f185b564be 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2fBase.C +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2fBase.C @@ -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 diff --git a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2fBase.H b/src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2fBase.H similarity index 97% rename from src/TurbulenceModels/turbulenceModels/RAS/v2f/v2fBase.H rename to src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2fBase.H index 41b1747960..a7ef4fba4f 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2fBase.H +++ b/src/MomentumTransportModels/momentumTransportModels/RAS/v2f/v2fBase.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 diff --git a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C b/src/MomentumTransportModels/momentumTransportModels/ReynoldsStress/ReynoldsStress.C similarity index 80% rename from src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C rename to src/MomentumTransportModels/momentumTransportModels/ReynoldsStress/ReynoldsStress.C index fdf90ed677..9c8064934f 100644 --- a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.C +++ b/src/MomentumTransportModels/momentumTransportModels/ReynoldsStress/ReynoldsStress.C @@ -30,8 +30,8 @@ License // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template -void Foam::ReynoldsStress::boundNormalStress +template +void Foam::ReynoldsStress::boundNormalStress ( volSymmTensorField& R ) const @@ -55,8 +55,8 @@ void Foam::ReynoldsStress::boundNormalStress } -template -void Foam::ReynoldsStress::correctWallShearStress +template +void Foam::ReynoldsStress::correctWallShearStress ( volSymmTensorField& R ) const @@ -104,8 +104,8 @@ void Foam::ReynoldsStress::correctWallShearStress // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::ReynoldsStress::ReynoldsStress +template +Foam::ReynoldsStress::ReynoldsStress ( const word& modelName, const alphaField& alpha, @@ -116,7 +116,7 @@ Foam::ReynoldsStress::ReynoldsStress const transportModel& transport ) : - BasicTurbulenceModel + BasicMomentumTransportModel ( modelName, alpha, @@ -175,24 +175,24 @@ Foam::ReynoldsStress::ReynoldsStress // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool Foam::ReynoldsStress::read() +template +bool Foam::ReynoldsStress::read() { - return BasicTurbulenceModel::read(); + return BasicMomentumTransportModel::read(); } -template +template Foam::tmp -Foam::ReynoldsStress::R() const +Foam::ReynoldsStress::sigma() const { return R_; } -template +template Foam::tmp -Foam::ReynoldsStress::k() const +Foam::ReynoldsStress::k() const { tmp tk(0.5*tr(R_)); tk.ref().rename("k"); @@ -200,13 +200,13 @@ Foam::ReynoldsStress::k() const } -template +template Foam::tmp -Foam::ReynoldsStress::devRhoReff() const +Foam::ReynoldsStress::devTau() const { return volSymmTensorField::New ( - IOobject::groupName("devRhoReff", this->alphaRhoPhi_.group()), + IOobject::groupName("devTau", this->alphaRhoPhi_.group()), this->alpha_*this->rho_*R_ - (this->alpha_*this->rho_*this->nu()) *dev(twoSymm(fvc::grad(this->U_))) @@ -214,10 +214,10 @@ Foam::ReynoldsStress::devRhoReff() const } -template +template template Foam::tmp -Foam::ReynoldsStress::DivDevRhoReff +Foam::ReynoldsStress::DivDevRhoReff ( const RhoFieldType& rho, volVectorField& U @@ -238,7 +238,7 @@ Foam::ReynoldsStress::DivDevRhoReff this->alpha_*rho*R_ + couplingFactor_ *this->alpha_*rho*this->nut()*fvc::grad(U), - "div(devRhoReff)" + "div(devTau)" ) - fvc::div(this->alpha_*rho*this->nu()*dev2(T(fvc::grad(U)))) - fvm::laplacian(this->alpha_*rho*this->nuEff(), U) @@ -262,9 +262,9 @@ Foam::ReynoldsStress::DivDevRhoReff } -template +template Foam::tmp -Foam::ReynoldsStress::divDevRhoReff +Foam::ReynoldsStress::divDevTau ( volVectorField& U ) const @@ -273,9 +273,9 @@ Foam::ReynoldsStress::divDevRhoReff } -template +template Foam::tmp -Foam::ReynoldsStress::divDevRhoReff +Foam::ReynoldsStress::divDevTau ( const volScalarField& rho, volVectorField& U @@ -285,17 +285,17 @@ Foam::ReynoldsStress::divDevRhoReff } -template -void Foam::ReynoldsStress::validate() +template +void Foam::ReynoldsStress::validate() { correctNut(); } -template -void Foam::ReynoldsStress::correct() +template +void Foam::ReynoldsStress::correct() { - BasicTurbulenceModel::correct(); + BasicMomentumTransportModel::correct(); } diff --git a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.H b/src/MomentumTransportModels/momentumTransportModels/ReynoldsStress/ReynoldsStress.H similarity index 88% rename from src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.H rename to src/MomentumTransportModels/momentumTransportModels/ReynoldsStress/ReynoldsStress.H index a542f9c4d7..a215a67778 100644 --- a/src/TurbulenceModels/turbulenceModels/ReynoldsStress/ReynoldsStress.H +++ b/src/MomentumTransportModels/momentumTransportModels/ReynoldsStress/ReynoldsStress.H @@ -44,10 +44,10 @@ namespace Foam Class ReynoldsStress Declaration \*---------------------------------------------------------------------------*/ -template +template class ReynoldsStress : - public BasicTurbulenceModel + public BasicMomentumTransportModel { protected: @@ -83,9 +83,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; // Constructors @@ -128,17 +128,17 @@ public: //- Return the turbulence kinetic energy virtual tmp k() const; - //- Return the Reynolds stress tensor - virtual tmp R() const; + //- Return the Reynolds stress tensor [m^2/s^2] + virtual tmp sigma() const; //- Return the effective stress tensor - virtual tmp devRhoReff() const; + virtual tmp devTau() const; //- Return the source term for the momentum equation - virtual tmp divDevRhoReff(volVectorField& U) const; + virtual tmp divDevTau(volVectorField& U) const; //- Return the source term for the momentum equation - virtual tmp divDevRhoReff + virtual tmp divDevTau ( const volScalarField& rho, volVectorField& U diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C similarity index 92% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C index 78e82f9a9a..841b16984a 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C @@ -28,7 +28,7 @@ License #include "fvPatchFieldMapper.H" #include "volFields.H" #include "surfaceFields.H" -#include "turbulenceModel.H" +#include "momentumTransportModel.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -100,14 +100,15 @@ void Foam::fixedShearStressFvPatchVectorField::updateCoeffs() return; } - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); scalarField nuEff(turbModel.nuEff(patch().index())); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.H rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.H index ed0a0a58f6..9b011d7ed6 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.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/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C similarity index 94% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C index a6d27defe7..c7e5681c33 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C @@ -25,7 +25,7 @@ License #include "porousBafflePressureFvPatchField.H" #include "surfaceFields.H" -#include "turbulenceModel.H" +#include "momentumTransportModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -136,14 +136,15 @@ void Foam::porousBafflePressureFvPatchField::updateCoeffs() scalarField magUn(mag(Un)); - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); jump_ = -sign(Un) diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H index 37653ef15a..d30366bffd 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.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/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFieldFwd.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFieldFwd.H similarity index 96% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFieldFwd.H rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFieldFwd.H index 62cb2e42f6..49da52acf3 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFieldFwd.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchFieldFwd.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/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C similarity index 95% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C index 2eb4672c23..fba0f3edfc 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "epsilonWallFunctionFvPatchScalarField.H" #include "nutWallFunctionFvPatchScalarField.H" -#include "turbulenceModel.H" +#include "momentumTransportModel.H" #include "fvMatrix.H" #include "addToRunTimeSelectionTable.H" @@ -141,7 +141,7 @@ Foam::epsilonWallFunctionFvPatchScalarField::epsilonPatch(const label patchi) void Foam::epsilonWallFunctionFvPatchScalarField::calculateTurbulenceFields ( - const turbulenceModel& turbulence, + const momentumTransportModel& turbulence, scalarField& G0, scalarField& epsilon0 ) @@ -174,7 +174,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::calculateTurbulenceFields void Foam::epsilonWallFunctionFvPatchScalarField::calculate ( - const turbulenceModel& turbModel, + const momentumTransportModel& turbModel, const List& cornerWeights, const fvPatch& patch, scalarField& G0, @@ -361,14 +361,15 @@ void Foam::epsilonWallFunctionFvPatchScalarField::updateCoeffs() return; } - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); setMaster(); @@ -413,14 +414,15 @@ void Foam::epsilonWallFunctionFvPatchScalarField::updateWeightedCoeffs return; } - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); setMaster(); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H similarity index 97% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H index 8ee7c0bbaa..7e62dc70ae 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.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 @@ -71,7 +71,7 @@ SourceFiles namespace Foam { -class turbulenceModel; +class momentumTransportModel; /*---------------------------------------------------------------------------*\ Class epsilonWallFunctionFvPatchScalarField Declaration @@ -123,7 +123,7 @@ protected: //- Main driver to calculate the turbulence fields virtual void calculateTurbulenceFields ( - const turbulenceModel& turbulence, + const momentumTransportModel& turbulence, scalarField& G0, scalarField& epsilon0 ); @@ -131,7 +131,7 @@ protected: //- Calculate the epsilon and G virtual void calculate ( - const turbulenceModel& turbulence, + const momentumTransportModel& turbulence, const List& cornerWeights, const fvPatch& patch, scalarField& G, diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C similarity index 94% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C index 453f58fa97..0fdb500676 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "fWallFunctionFvPatchScalarField.H" #include "nutWallFunctionFvPatchScalarField.H" -#include "turbulenceModel.H" +#include "momentumTransportModel.H" #include "v2f.H" #include "addToRunTimeSelectionTable.H" @@ -101,14 +101,15 @@ void fWallFunctionFvPatchScalarField::updateCoeffs() const label patchi = patch().index(); - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); const v2fBase& v2fModel = refCast(turbModel); const nutWallFunctionFvPatchScalarField& nutw = diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H index c10cb92da9..0295dad17a 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C similarity index 94% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C index babea90440..a61f52d55d 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "kLowReWallFunctionFvPatchScalarField.H" #include "nutWallFunctionFvPatchScalarField.H" -#include "turbulenceModel.H" +#include "momentumTransportModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -103,14 +103,15 @@ void kLowReWallFunctionFvPatchScalarField::updateCoeffs() const label patchi = patch().index(); - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); const nutWallFunctionFvPatchScalarField& nutw = nutWallFunctionFvPatchScalarField::nutw(turbModel, patchi); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.H rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.H index 8612d97992..db5b301324 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C similarity index 97% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C index ef7f2f3efb..a3b3301bfa 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.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/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H index e3fa37ed0a..59db63fe52 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.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/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C similarity index 96% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C index c6e9bdd708..6f85d43925 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.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/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H similarity index 96% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H index e9ef25838a..7b84849f99 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.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/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C similarity index 92% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C index 8e671c7e86..d3a6d9a776 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "nutLowReWallFunctionFvPatchScalarField.H" -#include "turbulenceModel.H" +#include "momentumTransportModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" @@ -101,14 +101,15 @@ nutLowReWallFunctionFvPatchScalarField::nutLowReWallFunctionFvPatchScalarField tmp nutLowReWallFunctionFvPatchScalarField::yPlus() const { const label patchi = patch().index(); - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); const scalarField& y = turbModel.y()[patchi]; const tmp tnuw = turbModel.nu(patchi); const scalarField& nuw = tnuw(); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.H rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.H index d288b0cb83..f3a1c53dc2 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.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/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C similarity index 94% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C index 070d11967d..1846ffd298 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "nutURoughWallFunctionFvPatchScalarField.H" -#include "turbulenceModel.H" +#include "momentumTransportModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" @@ -40,14 +40,15 @@ tmp nutURoughWallFunctionFvPatchScalarField::nut() const { const label patchi = patch().index(); - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); const scalarField& y = turbModel.y()[patchi]; const tmp tnuw = turbModel.nu(patchi); const scalarField& nuw = tnuw(); @@ -86,14 +87,15 @@ tmp nutURoughWallFunctionFvPatchScalarField::yPlus { const label patchi = patch().index(); - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); const scalarField& y = turbModel.y()[patchi]; const tmp tnuw = turbModel.nu(patchi); const scalarField& nuw = tnuw(); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H similarity index 99% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H index a5810d6028..966470c05e 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.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/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C similarity index 87% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C index 5449f2f4ae..c91b7660ad 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "nutUSpaldingWallFunctionFvPatchScalarField.H" -#include "turbulenceModel.H" +#include "momentumTransportModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" @@ -40,14 +40,15 @@ tmp nutUSpaldingWallFunctionFvPatchScalarField::nut() const { const label patchi = patch().index(); - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi]; const scalarField magGradU(mag(Uw.snGrad())); const tmp tnuw = turbModel.nu(patchi); @@ -68,14 +69,15 @@ tmp nutUSpaldingWallFunctionFvPatchScalarField::calcUTau { const label patchi = patch().index(); - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); const scalarField& y = turbModel.y()[patchi]; const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi]; @@ -192,14 +194,15 @@ tmp nutUSpaldingWallFunctionFvPatchScalarField::yPlus() const { const label patchi = patch().index(); - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); const scalarField& y = turbModel.y()[patchi]; const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi]; const tmp tnuw = turbModel.nu(patchi); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H index a34a872c81..0b1d084ec2 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.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/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C similarity index 91% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C index 40bd3d2827..5b5ac2907f 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "nutUTabulatedWallFunctionFvPatchScalarField.H" -#include "turbulenceModel.H" +#include "momentumTransportModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" @@ -40,14 +40,15 @@ tmp nutUTabulatedWallFunctionFvPatchScalarField::nut() const { const label patchi = patch().index(); - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); const scalarField& y = turbModel.y()[patchi]; const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi]; const scalarField magUp(mag(Uw.patchInternalField() - Uw)); @@ -182,14 +183,15 @@ tmp nutUTabulatedWallFunctionFvPatchScalarField::yPlus() const { const label patchi = patch().index(); - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); const scalarField& y = turbModel.y()[patchi]; const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi]; const scalarField magUp(mag(Uw.patchInternalField() - Uw)); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H index c3d63e3a37..0d4a84e86e 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.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/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C similarity index 86% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C index 759080ee4a..ff20aaca3a 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "nutUWallFunctionFvPatchScalarField.H" -#include "turbulenceModel.H" +#include "momentumTransportModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" @@ -40,14 +40,15 @@ tmp nutUWallFunctionFvPatchScalarField::nut() const { const label patchi = patch().index(); - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); const tmp tnuw = turbModel.nu(patchi); const scalarField& nuw = tnuw(); @@ -79,14 +80,15 @@ tmp nutUWallFunctionFvPatchScalarField::yPlus { const label patchi = patch().index(); - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); const scalarField& y = turbModel.y()[patchi]; const tmp tnuw = turbModel.nu(patchi); const scalarField& nuw = tnuw(); @@ -182,14 +184,15 @@ nutUWallFunctionFvPatchScalarField::nutUWallFunctionFvPatchScalarField tmp nutUWallFunctionFvPatchScalarField::yPlus() const { const label patchi = patch().index(); - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi]; const scalarField magUp(mag(Uw.patchInternalField() - Uw)); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H index f7fc0a7c5f..dc22dbfbf5 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.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/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C similarity index 97% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C index ea994e2581..a67713d216 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.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,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "nutWallFunctionFvPatchScalarField.H" -#include "turbulenceModel.H" +#include "momentumTransportModel.H" #include "fvPatchFieldMapper.H" #include "wallFvPatch.H" #include "addToRunTimeSelectionTable.H" @@ -152,7 +152,7 @@ Foam::nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField const Foam::nutWallFunctionFvPatchScalarField& Foam::nutWallFunctionFvPatchScalarField::nutw ( - const turbulenceModel& turbModel, + const momentumTransportModel& turbModel, const label patchi ) { diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H similarity index 97% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H index 86a0c25003..0ad4c767c1 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.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 @@ -71,7 +71,7 @@ SourceFiles namespace Foam { -class turbulenceModel; +class momentumTransportModel; /*---------------------------------------------------------------------------*\ Class nutWallFunctionFvPatchScalarField Declaration @@ -181,7 +181,7 @@ public: //- Return the nut patchField for the given wall patch static const nutWallFunctionFvPatchScalarField& nutw ( - const turbulenceModel& turbModel, + const momentumTransportModel& turbModel, const label patchi ); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C similarity index 95% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C index f15bfaef6d..9bf26f7681 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "nutkRoughWallFunctionFvPatchScalarField.H" -#include "turbulenceModel.H" +#include "momentumTransportModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" #include "addToRunTimeSelectionTable.H" @@ -70,14 +70,15 @@ tmp nutkRoughWallFunctionFvPatchScalarField::nut() const { const label patchi = patch().index(); - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); const scalarField& y = turbModel.y()[patchi]; diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H similarity index 99% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H index d412c7f9c8..209b635f16 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.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/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C similarity index 89% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C index 807ebbc924..59417517fd 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "nutkWallFunctionFvPatchScalarField.H" -#include "turbulenceModel.H" +#include "momentumTransportModel.H" #include "fvPatchFieldMapper.H" #include "volFields.H" #include "wallFvPatch.H" @@ -41,14 +41,15 @@ tmp nutkWallFunctionFvPatchScalarField::nut() const { const label patchi = patch().index(); - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); const scalarField& y = turbModel.y()[patchi]; const tmp tk = turbModel.k(); @@ -137,14 +138,15 @@ tmp nutkWallFunctionFvPatchScalarField::yPlus() const { const label patchi = patch().index(); - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); const scalarField& y = turbModel.y()[patchi]; diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H index 17e6206125..8fd7b746ff 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.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/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C similarity index 95% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C index cd7bd21bbd..24cf37381b 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "omegaWallFunctionFvPatchScalarField.H" #include "nutWallFunctionFvPatchScalarField.H" -#include "turbulenceModel.H" +#include "momentumTransportModel.H" #include "fvMatrix.H" #include "addToRunTimeSelectionTable.H" @@ -147,7 +147,7 @@ omegaWallFunctionFvPatchScalarField::omegaPatch(const label patchi) void omegaWallFunctionFvPatchScalarField::calculateTurbulenceFields ( - const turbulenceModel& turbModel, + const momentumTransportModel& turbModel, scalarField& G0, scalarField& omega0 ) @@ -180,7 +180,7 @@ void omegaWallFunctionFvPatchScalarField::calculateTurbulenceFields void omegaWallFunctionFvPatchScalarField::calculate ( - const turbulenceModel& turbModel, + const momentumTransportModel& turbModel, const List& cornerWeights, const fvPatch& patch, scalarField& G0, @@ -405,14 +405,15 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs() return; } - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); setMaster(); @@ -455,14 +456,15 @@ void omegaWallFunctionFvPatchScalarField::updateWeightedCoeffs return; } - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); setMaster(); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H similarity index 97% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H index 30910208d8..f3cf9293dd 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.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 @@ -92,7 +92,7 @@ SourceFiles namespace Foam { -class turbulenceModel; +class momentumTransportModel; /*---------------------------------------------------------------------------*\ Class omegaWallFunctionFvPatchScalarField Declaration @@ -150,7 +150,7 @@ protected: //- Main driver to calculate the turbulence fields virtual void calculateTurbulenceFields ( - const turbulenceModel& turbulence, + const momentumTransportModel& turbulence, scalarField& G0, scalarField& omega0 ); @@ -158,7 +158,7 @@ protected: //- Calculate the omega and G virtual void calculate ( - const turbulenceModel& turbulence, + const momentumTransportModel& turbulence, const List& cornerWeights, const fvPatch& patch, scalarField& G, diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C similarity index 93% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C index 4df98b3b0f..5c7b17d370 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C @@ -25,7 +25,7 @@ License #include "v2WallFunctionFvPatchScalarField.H" #include "nutWallFunctionFvPatchScalarField.H" -#include "turbulenceModel.H" +#include "momentumTransportModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -100,14 +100,15 @@ void v2WallFunctionFvPatchScalarField::updateCoeffs() const label patchi = patch().index(); - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName + const momentumTransportModel& turbModel = + db().lookupObject ( - turbulenceModel::typeName, - internalField().group() - ) - ); + IOobject::groupName + ( + momentumTransportModel::typeName, + internalField().group() + ) + ); const nutWallFunctionFvPatchScalarField& nutw = nutWallFunctionFvPatchScalarField::nutw(turbModel, patchi); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H rename to src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H index be293ce2ce..6694357f00 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C b/src/MomentumTransportModels/momentumTransportModels/eddyViscosity/eddyViscosity.C similarity index 80% rename from src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C rename to src/MomentumTransportModels/momentumTransportModels/eddyViscosity/eddyViscosity.C index c329560e33..f7b1874582 100644 --- a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C +++ b/src/MomentumTransportModels/momentumTransportModels/eddyViscosity/eddyViscosity.C @@ -29,8 +29,8 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::eddyViscosity::eddyViscosity +template +Foam::eddyViscosity::eddyViscosity ( const word& type, const alphaField& alpha, @@ -41,7 +41,7 @@ Foam::eddyViscosity::eddyViscosity const transportModel& transport ) : - linearViscousStress + linearViscousStress ( type, alpha, @@ -69,16 +69,16 @@ Foam::eddyViscosity::eddyViscosity // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool Foam::eddyViscosity::read() +template +bool Foam::eddyViscosity::read() { - return BasicTurbulenceModel::read(); + return BasicMomentumTransportModel::read(); } -template +template Foam::tmp -Foam::eddyViscosity::R() const +Foam::eddyViscosity::sigma() const { tmp tk(k()); @@ -108,17 +108,17 @@ Foam::eddyViscosity::R() const } -template -void Foam::eddyViscosity::validate() +template +void Foam::eddyViscosity::validate() { correctNut(); } -template -void Foam::eddyViscosity::correct() +template +void Foam::eddyViscosity::correct() { - BasicTurbulenceModel::correct(); + BasicMomentumTransportModel::correct(); } diff --git a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.H b/src/MomentumTransportModels/momentumTransportModels/eddyViscosity/eddyViscosity.H similarity index 89% rename from src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.H rename to src/MomentumTransportModels/momentumTransportModels/eddyViscosity/eddyViscosity.H index e72b32ec67..c838f8fa08 100644 --- a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.H +++ b/src/MomentumTransportModels/momentumTransportModels/eddyViscosity/eddyViscosity.H @@ -46,10 +46,10 @@ namespace Foam Class eddyViscosity Declaration \*---------------------------------------------------------------------------*/ -template +template class eddyViscosity : - public linearViscousStress + public linearViscousStress { protected: @@ -68,9 +68,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; // Constructors @@ -113,8 +113,8 @@ public: //- Return the turbulence kinetic energy virtual tmp k() const = 0; - //- Return the Reynolds stress tensor - virtual tmp R() const; + //- Return the Reynolds stress tensor [m^2/s^2] + virtual tmp sigma() const; //- Validate the turbulence fields after construction // Update turbulence viscosity and other derived fields as requires diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Giesekus/Giesekus.C b/src/MomentumTransportModels/momentumTransportModels/laminar/Giesekus/Giesekus.C similarity index 87% rename from src/TurbulenceModels/turbulenceModels/laminar/Giesekus/Giesekus.C rename to src/MomentumTransportModels/momentumTransportModels/laminar/Giesekus/Giesekus.C index f52f7d7718..c1300800fc 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/Giesekus/Giesekus.C +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/Giesekus/Giesekus.C @@ -35,9 +35,9 @@ namespace laminarModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template +template tmp -Giesekus::sigmaSource +Giesekus::sigmaSource ( const label modei, volSymmTensorField& sigma @@ -54,8 +54,8 @@ Giesekus::sigmaSource // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Giesekus::Giesekus +template +Giesekus::Giesekus ( const alphaField& alpha, const rhoField& rho, @@ -66,7 +66,7 @@ Giesekus::Giesekus const word& type ) : - Maxwell + Maxwell ( alpha, rho, @@ -88,10 +88,10 @@ Giesekus::Giesekus // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool Giesekus::read() +template +bool Giesekus::read() { - if (Maxwell::read()) + if (Maxwell::read()) { alphaGs_ = this->readModeCoefficients("alphaG", dimless); diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Giesekus/Giesekus.H b/src/MomentumTransportModels/momentumTransportModels/laminar/Giesekus/Giesekus.H similarity index 92% rename from src/TurbulenceModels/turbulenceModels/laminar/Giesekus/Giesekus.H rename to src/MomentumTransportModels/momentumTransportModels/laminar/Giesekus/Giesekus.H index b6a9efc3e8..6fb72f5d3a 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/Giesekus/Giesekus.H +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/Giesekus/Giesekus.H @@ -60,10 +60,10 @@ namespace laminarModels Class Giesekus Declaration \*---------------------------------------------------------------------------*/ -template +template class Giesekus : - public Maxwell + public Maxwell { protected: @@ -85,9 +85,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.C b/src/MomentumTransportModels/momentumTransportModels/laminar/Maxwell/Maxwell.C similarity index 89% rename from src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.C rename to src/MomentumTransportModels/momentumTransportModels/laminar/Maxwell/Maxwell.C index d093805ede..329af8ec09 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.C +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/Maxwell/Maxwell.C @@ -36,9 +36,9 @@ namespace laminarModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template +template Foam::PtrList -Maxwell::readModeCoefficients +Maxwell::readModeCoefficients ( const word& name, const dimensionSet& dims @@ -87,8 +87,8 @@ Maxwell::readModeCoefficients } -template -tmp Maxwell::sigmaSource +template +tmp Maxwell::sigmaSource ( const label modei, volSymmTensorField& sigma @@ -100,8 +100,8 @@ tmp Maxwell::sigmaSource // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Maxwell::Maxwell +template +Maxwell::Maxwell ( const alphaField& alpha, const rhoField& rho, @@ -112,7 +112,7 @@ Maxwell::Maxwell const word& type ) : - laminarModel + laminarModel ( type, alpha, @@ -228,10 +228,10 @@ Maxwell::Maxwell // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool Maxwell::read() +template +bool Maxwell::read() { - if (laminarModel::read()) + if (laminarModel::read()) { if (modeCoefficients_.size()) { @@ -251,21 +251,21 @@ bool Maxwell::read() } -template +template tmp -Maxwell::R() const +Maxwell::sigma() const { return sigma_; } -template +template tmp -Maxwell::devRhoReff() const +Maxwell::devTau() const { return volSymmTensorField::New ( - IOobject::groupName("devRhoReff", this->alphaRhoPhi_.group()), + IOobject::groupName("devTau", this->alphaRhoPhi_.group()), this->alpha_*this->rho_*sigma_ - (this->alpha_*this->rho_*this->nu()) *dev(twoSymm(fvc::grad(this->U_))) @@ -273,9 +273,9 @@ Maxwell::devRhoReff() const } -template +template tmp -Maxwell::divDevRhoReff +Maxwell::divDevTau ( volVectorField& U ) const @@ -293,9 +293,9 @@ Maxwell::divDevRhoReff } -template +template tmp -Maxwell::divDevRhoReff +Maxwell::divDevTau ( const volScalarField& rho, volVectorField& U @@ -314,8 +314,8 @@ Maxwell::divDevRhoReff } -template -void Maxwell::correct() +template +void Maxwell::correct() { // Local references const alphaField& alpha = this->alpha_; @@ -324,7 +324,7 @@ void Maxwell::correct() const volVectorField& U = this->U_; fv::options& fvOptions(fv::options::New(this->mesh_)); - laminarModel::correct(); + laminarModel::correct(); tmp tgradU(fvc::grad(U)); const volTensorField& gradU = tgradU(); diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.H b/src/MomentumTransportModels/momentumTransportModels/laminar/Maxwell/Maxwell.H similarity index 89% rename from src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.H rename to src/MomentumTransportModels/momentumTransportModels/laminar/Maxwell/Maxwell.H index 737d033e92..4a88b69fcc 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/Maxwell/Maxwell.H +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/Maxwell/Maxwell.H @@ -73,10 +73,10 @@ namespace laminarModels Class Maxwell Declaration \*---------------------------------------------------------------------------*/ -template +template class Maxwell : - public laminarModel + public laminarModel { protected: @@ -126,9 +126,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information @@ -160,17 +160,17 @@ public: //- Read model coefficients if they have changed virtual bool read(); - //- Return the Reynolds stress tensor - virtual tmp R() const; + //- Return the stress tensor [m^2/s^2] + virtual tmp sigma() const; //- Return the effective stress tensor - virtual tmp devRhoReff() const; + virtual tmp devTau() const; //- Return the source term for the momentum equation - virtual tmp divDevRhoReff(volVectorField& U) const; + virtual tmp divDevTau(volVectorField& U) const; //- Return the source term for the momentum equation - virtual tmp divDevRhoReff + virtual tmp divDevTau ( const volScalarField& rho, volVectorField& U diff --git a/src/TurbulenceModels/turbulenceModels/laminar/PTT/PTT.C b/src/MomentumTransportModels/momentumTransportModels/laminar/PTT/PTT.C similarity index 88% rename from src/TurbulenceModels/turbulenceModels/laminar/PTT/PTT.C rename to src/MomentumTransportModels/momentumTransportModels/laminar/PTT/PTT.C index 6e8791e7db..f534743ef9 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/PTT/PTT.C +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/PTT/PTT.C @@ -35,9 +35,9 @@ namespace laminarModels // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template +template tmp -PTT::sigmaSource +PTT::sigmaSource ( const label modei, volSymmTensorField& sigma @@ -55,8 +55,8 @@ PTT::sigmaSource // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -PTT::PTT +template +PTT::PTT ( const alphaField& alpha, const rhoField& rho, @@ -67,7 +67,7 @@ PTT::PTT const word& type ) : - Maxwell + Maxwell ( alpha, rho, @@ -89,10 +89,10 @@ PTT::PTT // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool PTT::read() +template +bool PTT::read() { - if (Maxwell::read()) + if (Maxwell::read()) { epsilons_ = this->readModeCoefficients("epsilon", dimless); diff --git a/src/TurbulenceModels/turbulenceModels/laminar/PTT/PTT.H b/src/MomentumTransportModels/momentumTransportModels/laminar/PTT/PTT.H similarity index 92% rename from src/TurbulenceModels/turbulenceModels/laminar/PTT/PTT.H rename to src/MomentumTransportModels/momentumTransportModels/laminar/PTT/PTT.H index b96b49005c..b22ee851e3 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/PTT/PTT.H +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/PTT/PTT.H @@ -60,10 +60,10 @@ namespace laminarModels Class PTT Declaration \*---------------------------------------------------------------------------*/ -template +template class PTT : - public Maxwell + public Maxwell { protected: @@ -85,9 +85,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C b/src/MomentumTransportModels/momentumTransportModels/laminar/Stokes/Stokes.C similarity index 75% rename from src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C rename to src/MomentumTransportModels/momentumTransportModels/laminar/Stokes/Stokes.C index 5ad026ce08..db23892d7c 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/Stokes/Stokes.C @@ -39,8 +39,8 @@ namespace laminarModels // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Stokes::Stokes +template +Stokes::Stokes ( const alphaField& alpha, const rhoField& rho, @@ -50,7 +50,7 @@ Stokes::Stokes const transportModel& transport ) : - linearViscousStress> + linearViscousStress> ( typeName, alpha, @@ -65,24 +65,24 @@ Stokes::Stokes // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template +template const dictionary& -Stokes::coeffDict() const +Stokes::coeffDict() const { return dictionary::null; } -template -bool Stokes::read() +template +bool Stokes::read() { return true; } -template +template tmp -Stokes::nut() const +Stokes::nut() const { return volScalarField::New ( @@ -93,9 +93,9 @@ Stokes::nut() const } -template +template tmp -Stokes::nut +Stokes::nut ( const label patchi ) const @@ -107,9 +107,9 @@ Stokes::nut } -template +template tmp -Stokes::nuEff() const +Stokes::nuEff() const { return volScalarField::New ( @@ -119,9 +119,9 @@ Stokes::nuEff() const } -template +template tmp -Stokes::nuEff +Stokes::nuEff ( const label patchi ) const @@ -130,9 +130,9 @@ Stokes::nuEff } -template +template tmp -Stokes::k() const +Stokes::k() const { return volScalarField::New ( @@ -143,9 +143,9 @@ Stokes::k() const } -template +template tmp -Stokes::epsilon() const +Stokes::epsilon() const { return volScalarField::New ( @@ -156,9 +156,9 @@ Stokes::epsilon() const } -template +template tmp -Stokes::R() const +Stokes::sigma() const { return volSymmTensorField::New ( @@ -169,10 +169,10 @@ Stokes::R() const } -template -void Stokes::correct() +template +void Stokes::correct() { - laminarModel::correct(); + laminarModel::correct(); } diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.H b/src/MomentumTransportModels/momentumTransportModels/laminar/Stokes/Stokes.H similarity index 89% rename from src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.H rename to src/MomentumTransportModels/momentumTransportModels/laminar/Stokes/Stokes.H index c2589fe9be..42be0d08bb 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.H +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/Stokes/Stokes.H @@ -49,17 +49,17 @@ namespace laminarModels Class Stokes Declaration \*---------------------------------------------------------------------------*/ -template +template class Stokes : - public linearViscousStress> + public linearViscousStress> { public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information @@ -126,8 +126,8 @@ public: // i.e. 0 for Stokes flow virtual tmp epsilon() const; - //- Return the Reynolds stress tensor, i.e. 0 for Stokes flow - virtual tmp R() const; + //- Return the stress tensor [m^2/s^2], i.e. 0 for Stokes flow + virtual tmp sigma() const; //- Correct the Stokes viscosity virtual void correct(); diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.C b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonian.C similarity index 76% rename from src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.C rename to src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonian.C index 88640aebb6..9637be273c 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.C +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonian.C @@ -39,8 +39,8 @@ namespace laminarModels // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -generalizedNewtonian::generalizedNewtonian +template +generalizedNewtonian::generalizedNewtonian ( const alphaField& alpha, const rhoField& rho, @@ -50,7 +50,7 @@ generalizedNewtonian::generalizedNewtonian const transportModel& transport ) : - linearViscousStress> + linearViscousStress> ( typeName, alpha, @@ -86,9 +86,9 @@ generalizedNewtonian::generalizedNewtonian // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -template +template Foam::tmp -generalizedNewtonian::strainRate() const +generalizedNewtonian::strainRate() const { return sqrt(2.0)*mag(symm(fvc::grad(this->U()))); } @@ -96,8 +96,8 @@ generalizedNewtonian::strainRate() const // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool generalizedNewtonian::read() +template +bool generalizedNewtonian::read() { viscosityModel_->read(this->coeffDict_); @@ -105,9 +105,9 @@ bool generalizedNewtonian::read() } -template +template tmp -generalizedNewtonian::nut() const +generalizedNewtonian::nut() const { return volScalarField::New ( @@ -118,9 +118,9 @@ generalizedNewtonian::nut() const } -template +template tmp -generalizedNewtonian::nut +generalizedNewtonian::nut ( const label patchi ) const @@ -132,9 +132,9 @@ generalizedNewtonian::nut } -template +template tmp -generalizedNewtonian::nuEff() const +generalizedNewtonian::nuEff() const { return volScalarField::New ( @@ -144,9 +144,9 @@ generalizedNewtonian::nuEff() const } -template +template tmp -generalizedNewtonian::nuEff +generalizedNewtonian::nuEff ( const label patchi ) const @@ -155,9 +155,9 @@ generalizedNewtonian::nuEff } -template +template tmp -generalizedNewtonian::k() const +generalizedNewtonian::k() const { return volScalarField::New ( @@ -168,9 +168,9 @@ generalizedNewtonian::k() const } -template +template tmp -generalizedNewtonian::epsilon() const +generalizedNewtonian::epsilon() const { return volScalarField::New ( @@ -181,9 +181,9 @@ generalizedNewtonian::epsilon() const } -template +template tmp -generalizedNewtonian::R() const +generalizedNewtonian::sigma() const { return volSymmTensorField::New ( @@ -194,11 +194,11 @@ generalizedNewtonian::R() const } -template -void generalizedNewtonian::correct() +template +void generalizedNewtonian::correct() { nu_ = viscosityModel_->nu(this->nu(), strainRate()); - laminarModel::correct(); + laminarModel::correct(); } diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.H b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonian.H similarity index 91% rename from src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.H rename to src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonian.H index dbd1dd20ce..0123fb8d22 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.H +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonian.H @@ -50,10 +50,10 @@ namespace laminarModels Class generalizedNewtonian Declaration \*---------------------------------------------------------------------------*/ -template +template class generalizedNewtonian : - public linearViscousStress> + public linearViscousStress> { protected: @@ -74,9 +74,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information @@ -143,9 +143,9 @@ public: // i.e. 0 for generalizedNewtonian flow virtual tmp epsilon() const; - //- Return the Reynolds stress tensor + //- Return the stress tensor [m^2/s^2] // i.e. 0 for generalizedNewtonian flow - virtual tmp R() const; + virtual tmp sigma() const; //- Correct the generalizedNewtonian viscosity virtual void correct(); diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/BirdCarreau/BirdCarreau.C b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/BirdCarreau/BirdCarreau.C similarity index 97% rename from src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/BirdCarreau/BirdCarreau.C rename to src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/BirdCarreau/BirdCarreau.C index 1c7f47f253..6a87f9da11 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/BirdCarreau/BirdCarreau.C +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/BirdCarreau/BirdCarreau.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/BirdCarreau/BirdCarreau.H b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/BirdCarreau/BirdCarreau.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/BirdCarreau/BirdCarreau.H rename to src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/BirdCarreau/BirdCarreau.H index 1316919383..649bf9abf2 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/BirdCarreau/BirdCarreau.H +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/BirdCarreau/BirdCarreau.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 diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/Casson/Casson.C b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/Casson/Casson.C similarity index 97% rename from src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/Casson/Casson.C rename to src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/Casson/Casson.C index 7a24a85c79..aa1ed02b18 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/Casson/Casson.C +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/Casson/Casson.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/Casson/Casson.H b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/Casson/Casson.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/Casson/Casson.H rename to src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/Casson/Casson.H index c362701ebd..7b9a298069 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/Casson/Casson.H +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/Casson/Casson.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 diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/CrossPowerLaw/CrossPowerLaw.C b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/CrossPowerLaw/CrossPowerLaw.C similarity index 97% rename from src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/CrossPowerLaw/CrossPowerLaw.C rename to src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/CrossPowerLaw/CrossPowerLaw.C index f6cbb8560b..9602de1092 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/CrossPowerLaw/CrossPowerLaw.C +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/CrossPowerLaw/CrossPowerLaw.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/CrossPowerLaw/CrossPowerLaw.H b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/CrossPowerLaw/CrossPowerLaw.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/CrossPowerLaw/CrossPowerLaw.H rename to src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/CrossPowerLaw/CrossPowerLaw.H index 65dafa4ecf..9d69f6ca93 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/CrossPowerLaw/CrossPowerLaw.H +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/CrossPowerLaw/CrossPowerLaw.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 diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/HerschelBulkley/HerschelBulkley.C b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/HerschelBulkley/HerschelBulkley.C similarity index 97% rename from src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/HerschelBulkley/HerschelBulkley.C rename to src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/HerschelBulkley/HerschelBulkley.C index d437f785ce..58670a7d5a 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/HerschelBulkley/HerschelBulkley.C +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/HerschelBulkley/HerschelBulkley.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/HerschelBulkley/HerschelBulkley.H b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/HerschelBulkley/HerschelBulkley.H similarity index 97% rename from src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/HerschelBulkley/HerschelBulkley.H rename to src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/HerschelBulkley/HerschelBulkley.H index 56dfa6de26..86fc1d33b4 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/HerschelBulkley/HerschelBulkley.H +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/HerschelBulkley/HerschelBulkley.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 diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModel.C b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModel.C similarity index 96% rename from src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModel.C rename to src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModel.C index a5d92d5097..610beb826f 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModel.C +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModel.H b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModel.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModel.H rename to src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModel.H index 63922224fb..d8744c0431 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModel.H +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModel.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 diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModelNew.C b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModelNew.C similarity index 96% rename from src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModelNew.C rename to src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModelNew.C index 20c6c783c9..6921139636 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModelNew.C +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/generalizedNewtonianViscosityModel/generalizedNewtonianViscosityModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/powerLaw/powerLaw.C b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/powerLaw/powerLaw.C similarity index 97% rename from src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/powerLaw/powerLaw.C rename to src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/powerLaw/powerLaw.C index d3a624eaca..2deca0ec5c 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/powerLaw/powerLaw.C +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/powerLaw/powerLaw.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/powerLaw/powerLaw.H b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/powerLaw/powerLaw.H similarity index 97% rename from src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/powerLaw/powerLaw.H rename to src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/powerLaw/powerLaw.H index 8af045f710..66c0d2b474 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/powerLaw/powerLaw.H +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/powerLaw/powerLaw.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 diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/strainRateFunction/strainRateFunction.C b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/strainRateFunction/strainRateFunction.C similarity index 97% rename from src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/strainRateFunction/strainRateFunction.C rename to src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/strainRateFunction/strainRateFunction.C index ddb16642ca..bdd2b96fbb 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/strainRateFunction/strainRateFunction.C +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/strainRateFunction/strainRateFunction.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/strainRateFunction/strainRateFunction.H b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/strainRateFunction/strainRateFunction.H similarity index 98% rename from src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/strainRateFunction/strainRateFunction.H rename to src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/strainRateFunction/strainRateFunction.H index cc524fb0f5..6ec242b4cb 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/strainRateFunction/strainRateFunction.H +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/generalizedNewtonian/generalizedNewtonianViscosityModels/strainRateFunction/strainRateFunction.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 diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C b/src/MomentumTransportModels/momentumTransportModels/laminar/laminarModel/laminarModel.C similarity index 77% rename from src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C rename to src/MomentumTransportModels/momentumTransportModels/laminar/laminarModel/laminarModel.C index 00752383c9..39ea2ab392 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/laminarModel/laminarModel.C @@ -28,8 +28,11 @@ License // * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // -template -void Foam::laminarModel::printCoeffs(const word& type) +template +void Foam::laminarModel::printCoeffs +( + const word& type +) { if (printCoeffs_) { @@ -40,8 +43,8 @@ void Foam::laminarModel::printCoeffs(const word& type) // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::laminarModel::laminarModel +template +Foam::laminarModel::laminarModel ( const word& type, const alphaField& alpha, @@ -52,7 +55,7 @@ Foam::laminarModel::laminarModel const transportModel& transport ) : - BasicTurbulenceModel + BasicMomentumTransportModel ( type, alpha, @@ -75,9 +78,9 @@ Foam::laminarModel::laminarModel // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -template -Foam::autoPtr> -Foam::laminarModel::New +template +Foam::autoPtr> +Foam::laminarModel::New ( const alphaField& alpha, const rhoField& rho, @@ -89,7 +92,7 @@ Foam::laminarModel::New { const IOdictionary modelDict ( - turbulenceModel::readModelDict + momentumTransportModel::readModelDict ( U.db(), alphaRhoPhi.group() @@ -136,11 +139,12 @@ Foam::laminarModel::New else { Info<< "Selecting laminar stress model " - << laminarModels::Stokes::typeName << endl; + << laminarModels::Stokes::typeName + << endl; return autoPtr ( - new laminarModels::Stokes + new laminarModels::Stokes ( alpha, rho, @@ -156,10 +160,10 @@ Foam::laminarModel::New // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool Foam::laminarModel::read() +template +bool Foam::laminarModel::read() { - if (BasicTurbulenceModel::read()) + if (BasicMomentumTransportModel::read()) { laminarDict_ <<= this->subDict("laminar"); @@ -174,9 +178,9 @@ bool Foam::laminarModel::read() } -template +template Foam::tmp -Foam::laminarModel::nut() const +Foam::laminarModel::nut() const { return volScalarField::New ( @@ -187,9 +191,9 @@ Foam::laminarModel::nut() const } -template +template Foam::tmp -Foam::laminarModel::nut +Foam::laminarModel::nut ( const label patchi ) const @@ -201,9 +205,9 @@ Foam::laminarModel::nut } -template +template Foam::tmp -Foam::laminarModel::nuEff() const +Foam::laminarModel::nuEff() const { return volScalarField::New ( @@ -213,9 +217,9 @@ Foam::laminarModel::nuEff() const } -template +template Foam::tmp -Foam::laminarModel::nuEff +Foam::laminarModel::nuEff ( const label patchi ) const @@ -224,9 +228,9 @@ Foam::laminarModel::nuEff } -template +template Foam::tmp -Foam::laminarModel::k() const +Foam::laminarModel::k() const { return volScalarField::New ( @@ -237,9 +241,9 @@ Foam::laminarModel::k() const } -template +template Foam::tmp -Foam::laminarModel::epsilon() const +Foam::laminarModel::epsilon() const { return volScalarField::New ( @@ -250,9 +254,9 @@ Foam::laminarModel::epsilon() const } -template +template Foam::tmp -Foam::laminarModel::R() const +Foam::laminarModel::sigma() const { return volSymmTensorField::New ( @@ -263,10 +267,10 @@ Foam::laminarModel::R() const } -template -void Foam::laminarModel::correct() +template +void Foam::laminarModel::correct() { - BasicTurbulenceModel::correct(); + BasicMomentumTransportModel::correct(); } diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H b/src/MomentumTransportModels/momentumTransportModels/laminar/laminarModel/laminarModel.H similarity index 91% rename from src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H rename to src/MomentumTransportModels/momentumTransportModels/laminar/laminarModel/laminarModel.H index 24dd3f86cd..01067ddd91 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H +++ b/src/MomentumTransportModels/momentumTransportModels/laminar/laminarModel/laminarModel.H @@ -35,7 +35,7 @@ SourceFiles #ifndef laminarModel_H #define laminarModel_H -#include "TurbulenceModel.H" +#include "MomentumTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -46,10 +46,10 @@ namespace Foam Class laminarModel Declaration \*---------------------------------------------------------------------------*/ -template +template class laminarModel : - public BasicTurbulenceModel + public BasicMomentumTransportModel { protected: @@ -74,9 +74,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information @@ -172,8 +172,8 @@ public: // i.e. 0 for laminar flow virtual tmp epsilon() const; - //- Return the Reynolds stress tensor, i.e. 0 for laminar flow - virtual tmp R() const; + //- Return the stress tensor [m^2/s^2], i.e. 0 for laminar flow + virtual tmp sigma() const; //- Correct the laminar transport virtual void correct(); diff --git a/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.C b/src/MomentumTransportModels/momentumTransportModels/linearViscousStress/linearViscousStress.C similarity index 74% rename from src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.C rename to src/MomentumTransportModels/momentumTransportModels/linearViscousStress/linearViscousStress.C index 9358ba8533..7b30479c5b 100644 --- a/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.C +++ b/src/MomentumTransportModels/momentumTransportModels/linearViscousStress/linearViscousStress.C @@ -29,8 +29,8 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::linearViscousStress::linearViscousStress +template +Foam::linearViscousStress::linearViscousStress ( const word& modelName, const alphaField& alpha, @@ -41,7 +41,7 @@ Foam::linearViscousStress::linearViscousStress const transportModel& transport ) : - BasicTurbulenceModel + BasicMomentumTransportModel ( modelName, alpha, @@ -56,29 +56,29 @@ Foam::linearViscousStress::linearViscousStress // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool Foam::linearViscousStress::read() +template +bool Foam::linearViscousStress::read() { - return BasicTurbulenceModel::read(); + return BasicMomentumTransportModel::read(); } -template +template Foam::tmp -Foam::linearViscousStress::devRhoReff() const +Foam::linearViscousStress::devTau() const { return volSymmTensorField::New ( - IOobject::groupName("devRhoReff", this->alphaRhoPhi_.group()), + IOobject::groupName("devTau", this->alphaRhoPhi_.group()), (-(this->alpha_*this->rho_*this->nuEff())) *dev(twoSymm(fvc::grad(this->U_))) ); } -template +template Foam::tmp -Foam::linearViscousStress::divDevRhoReff +Foam::linearViscousStress::divDevTau ( volVectorField& U ) const @@ -91,9 +91,9 @@ Foam::linearViscousStress::divDevRhoReff } -template +template Foam::tmp -Foam::linearViscousStress::divDevRhoReff +Foam::linearViscousStress::divDevTau ( const volScalarField& rho, volVectorField& U @@ -107,10 +107,10 @@ Foam::linearViscousStress::divDevRhoReff } -template -void Foam::linearViscousStress::correct() +template +void Foam::linearViscousStress::correct() { - BasicTurbulenceModel::correct(); + BasicMomentumTransportModel::correct(); } diff --git a/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.H b/src/MomentumTransportModels/momentumTransportModels/linearViscousStress/linearViscousStress.H similarity index 86% rename from src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.H rename to src/MomentumTransportModels/momentumTransportModels/linearViscousStress/linearViscousStress.H index 232b9d6cdf..c00ec94978 100644 --- a/src/TurbulenceModels/turbulenceModels/linearViscousStress/linearViscousStress.H +++ b/src/MomentumTransportModels/momentumTransportModels/linearViscousStress/linearViscousStress.H @@ -44,17 +44,17 @@ namespace Foam Class linearViscousStress Declaration \*---------------------------------------------------------------------------*/ -template +template class linearViscousStress : - public BasicTurbulenceModel + public BasicMomentumTransportModel { public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; // Constructors @@ -83,13 +83,13 @@ public: virtual bool read() = 0; //- Return the effective stress tensor - virtual tmp devRhoReff() const; + virtual tmp devTau() const; //- Return the source term for the momentum equation - virtual tmp divDevRhoReff(volVectorField& U) const; + virtual tmp divDevTau(volVectorField& U) const; //- Return the source term for the momentum equation - virtual tmp divDevRhoReff + virtual tmp divDevTau ( const volScalarField& rho, volVectorField& U diff --git a/src/TurbulenceModels/turbulenceModels/makeTurbulenceModel.H b/src/MomentumTransportModels/momentumTransportModels/makeMomentumTransportModel.H similarity index 93% rename from src/TurbulenceModels/turbulenceModels/makeTurbulenceModel.H rename to src/MomentumTransportModels/momentumTransportModels/makeMomentumTransportModel.H index dcef7bb612..5dccbb20a6 100644 --- a/src/TurbulenceModels/turbulenceModels/makeTurbulenceModel.H +++ b/src/MomentumTransportModels/momentumTransportModels/makeMomentumTransportModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,7 +23,8 @@ License \*---------------------------------------------------------------------------*/ -#define makeTurbulenceModelTypes(Alpha, Rho, baseModel, BaseModel, Transport) \ +#define makeMomentumTransportModelTypes( \ + Alpha, Rho, baseModel, BaseModel, Transport) \ \ namespace Foam \ { \ @@ -35,11 +36,12 @@ License } -#define makeBaseTurbulenceModel(Alpha, Rho, baseModel, BaseModel, Transport) \ +#define makeBaseMomentumTransportModel( \ + Alpha, Rho, baseModel, BaseModel, Transport) \ \ namespace Foam \ { \ - typedef TurbulenceModel \ + typedef MomentumTransportModel \ < \ Alpha, \ Rho, \ @@ -94,7 +96,7 @@ License } -#define makeTemplatedTurbulenceModel(BaseModel, SType, Type) \ +#define makeTemplatedMomentumTransportModel(BaseModel, SType, Type) \ defineNamedTemplateTypeNameAndDebug \ (Foam::SType##Models::Type, 0); \ \ @@ -114,7 +116,7 @@ License } -#define makeTurbulenceModel(BaseModel, SType, Type) \ +#define makeMomentumTransportModel(BaseModel, SType, Type) \ namespace Foam \ { \ namespace SType##Models \ diff --git a/src/TurbulenceModels/turbulenceModels/turbulenceModel.C b/src/MomentumTransportModels/momentumTransportModels/momentumTransportModel.C similarity index 88% rename from src/TurbulenceModels/turbulenceModels/turbulenceModel.C rename to src/MomentumTransportModels/momentumTransportModels/momentumTransportModel.C index e4aa56017e..90c8daa15e 100644 --- a/src/TurbulenceModels/turbulenceModels/turbulenceModel.C +++ b/src/MomentumTransportModels/momentumTransportModels/momentumTransportModel.C @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "turbulenceModel.H" +#include "momentumTransportModel.H" #include "volFields.H" #include "surfaceFields.H" #include "wallFvPatch.H" @@ -32,13 +32,13 @@ License namespace Foam { - defineTypeNameAndDebug(turbulenceModel, 0); + defineTypeNameAndDebug(momentumTransportModel, 0); } // * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // -Foam::IOdictionary Foam::turbulenceModel::readModelDict +Foam::IOdictionary Foam::momentumTransportModel::readModelDict ( const objectRegistry& obr, const word& group, @@ -85,7 +85,7 @@ Foam::IOdictionary Foam::turbulenceModel::readModelDict // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::turbulenceModel::turbulenceModel +Foam::momentumTransportModel::momentumTransportModel ( const volVectorField& U, const surfaceScalarField& alphaRhoPhi, @@ -109,23 +109,23 @@ Foam::turbulenceModel::turbulenceModel // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::tmp Foam::turbulenceModel::phi() const +Foam::tmp Foam::momentumTransportModel::phi() const { return phi_; } -bool Foam::turbulenceModel::read() +bool Foam::momentumTransportModel::read() { return regIOobject::read(); } -void Foam::turbulenceModel::validate() +void Foam::momentumTransportModel::validate() {} -void Foam::turbulenceModel::correct() +void Foam::momentumTransportModel::correct() { if (mesh_.changing()) { diff --git a/src/TurbulenceModels/turbulenceModels/turbulenceModel.H b/src/MomentumTransportModels/momentumTransportModels/momentumTransportModel.H similarity index 91% rename from src/TurbulenceModels/turbulenceModels/turbulenceModel.H rename to src/MomentumTransportModels/momentumTransportModels/momentumTransportModel.H index 057cfc4ff6..e21fc0fe79 100644 --- a/src/TurbulenceModels/turbulenceModels/turbulenceModel.H +++ b/src/MomentumTransportModels/momentumTransportModels/momentumTransportModel.H @@ -22,18 +22,18 @@ License along with OpenFOAM. If not, see . Class - Foam::turbulenceModel + Foam::momentumTransportModel Description Abstract base class for turbulence models (RAS, LES and laminar). SourceFiles - turbulenceModel.C + momentumTransportModel.C \*---------------------------------------------------------------------------*/ -#ifndef turbulenceModel_H -#define turbulenceModel_H +#ifndef momentumTransportModel_H +#define momentumTransportModel_H #include "IOdictionary.H" #include "primitiveFieldsFwd.H" @@ -52,10 +52,10 @@ namespace Foam class fvMesh; /*---------------------------------------------------------------------------*\ - Class turbulenceModel Declaration + Class momentumTransportModel Declaration \*---------------------------------------------------------------------------*/ -class turbulenceModel +class momentumTransportModel : public IOdictionary { @@ -93,7 +93,7 @@ public: // Constructors //- Construct from components - turbulenceModel + momentumTransportModel ( const volVectorField& U, const surfaceScalarField& alphaRhoPhi, @@ -101,11 +101,11 @@ public: ); //- Disallow default bitwise copy construction - turbulenceModel(const turbulenceModel&) = delete; + momentumTransportModel(const momentumTransportModel&) = delete; //- Destructor - virtual ~turbulenceModel() + virtual ~momentumTransportModel() {} @@ -196,8 +196,8 @@ public: //- Return the turbulence kinetic energy dissipation rate virtual tmp epsilon() const = 0; - //- Return the Reynolds stress tensor - virtual tmp R() const = 0; + //- Return the stress tensor [m^2/s^2] + virtual tmp sigma() const = 0; //- Validate the turbulence fields after construction // Update derived fields as required @@ -210,7 +210,7 @@ public: // Member Operators //- Disallow default bitwise assignment - void operator=(const turbulenceModel&) = delete; + void operator=(const momentumTransportModel&) = delete; }; diff --git a/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C b/src/MomentumTransportModels/momentumTransportModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C similarity index 73% rename from src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C rename to src/MomentumTransportModels/momentumTransportModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C index 777375a2eb..8de1b740ce 100644 --- a/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C +++ b/src/MomentumTransportModels/momentumTransportModels/nonlinearEddyViscosity/nonlinearEddyViscosity.C @@ -29,8 +29,9 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::nonlinearEddyViscosity::nonlinearEddyViscosity +template +Foam::nonlinearEddyViscosity:: +nonlinearEddyViscosity ( const word& modelName, const alphaField& alpha, @@ -41,7 +42,7 @@ Foam::nonlinearEddyViscosity::nonlinearEddyViscosity const transportModel& transport ) : - eddyViscosity + eddyViscosity ( modelName, alpha, @@ -73,35 +74,35 @@ Foam::nonlinearEddyViscosity::nonlinearEddyViscosity // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template +template Foam::tmp -Foam::nonlinearEddyViscosity::R() const +Foam::nonlinearEddyViscosity::sigma() const { tmp tR ( - eddyViscosity::R() + eddyViscosity::sigma() ); tR.ref() += nonlinearStress_; return tR; } -template +template Foam::tmp -Foam::nonlinearEddyViscosity::devRhoReff() const +Foam::nonlinearEddyViscosity::devTau() const { - tmp tdevRhoReff + tmp tdevTau ( - eddyViscosity::devRhoReff() + eddyViscosity::devTau() ); - tdevRhoReff.ref() += this->rho_*nonlinearStress_; - return tdevRhoReff; + tdevTau.ref() += this->rho_*nonlinearStress_; + return tdevTau; } -template +template Foam::tmp -Foam::nonlinearEddyViscosity::divDevRhoReff +Foam::nonlinearEddyViscosity::divDevTau ( volVectorField& U ) const @@ -109,14 +110,14 @@ Foam::nonlinearEddyViscosity::divDevRhoReff return ( fvc::div(this->rho_*nonlinearStress_) - + eddyViscosity::divDevRhoReff(U) + + eddyViscosity::divDevTau(U) ); } -template +template Foam::tmp -Foam::nonlinearEddyViscosity::divDevRhoReff +Foam::nonlinearEddyViscosity::divDevTau ( const volScalarField& rho, volVectorField& U @@ -125,7 +126,7 @@ Foam::nonlinearEddyViscosity::divDevRhoReff return ( fvc::div(rho*nonlinearStress_) - + eddyViscosity::divDevRhoReff(rho, U) + + eddyViscosity::divDevTau(rho, U) ); } diff --git a/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.H b/src/MomentumTransportModels/momentumTransportModels/nonlinearEddyViscosity/nonlinearEddyViscosity.H similarity index 84% rename from src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.H rename to src/MomentumTransportModels/momentumTransportModels/nonlinearEddyViscosity/nonlinearEddyViscosity.H index 44cdd13e79..bdfe91a970 100644 --- a/src/TurbulenceModels/turbulenceModels/nonlinearEddyViscosity/nonlinearEddyViscosity.H +++ b/src/MomentumTransportModels/momentumTransportModels/nonlinearEddyViscosity/nonlinearEddyViscosity.H @@ -46,10 +46,10 @@ namespace Foam Class nonlinearEddyViscosity Declaration \*---------------------------------------------------------------------------*/ -template +template class nonlinearEddyViscosity : - public eddyViscosity + public eddyViscosity { protected: @@ -68,9 +68,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; // Constructors @@ -95,17 +95,17 @@ public: // Member Functions - //- Return the Reynolds stress tensor - virtual tmp R() const; + //- Return the Reynolds stress tensor [m^2/s^2] + virtual tmp sigma() const; //- Return the effective stress tensor - virtual tmp devRhoReff() const; + virtual tmp devTau() const; //- Return the source term for the momentum equation - virtual tmp divDevRhoReff(volVectorField& U) const; + virtual tmp divDevTau(volVectorField& U) const; //- Return the source term for the momentum equation - virtual tmp divDevRhoReff + virtual tmp divDevTau ( const volScalarField& rho, volVectorField& U diff --git a/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C b/src/MomentumTransportModels/phaseCompressible/LES/Niceno/NicenoKEqn.C similarity index 75% rename from src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C rename to src/MomentumTransportModels/phaseCompressible/LES/Niceno/NicenoKEqn.C index 10a5f5d092..00a5716765 100644 --- a/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C +++ b/src/MomentumTransportModels/phaseCompressible/LES/Niceno/NicenoKEqn.C @@ -37,8 +37,8 @@ namespace LESModels // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -NicenoKEqn::NicenoKEqn +template +NicenoKEqn::NicenoKEqn ( const alphaField& alpha, const rhoField& rho, @@ -49,7 +49,7 @@ NicenoKEqn::NicenoKEqn const word& type ) : - kEqn + kEqn ( alpha, rho, @@ -101,10 +101,10 @@ NicenoKEqn::NicenoKEqn // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool NicenoKEqn::read() +template +bool NicenoKEqn::read() { - if (kEqn::read()) + if (kEqn::read()) { alphaInversion_.readIfPresent(this->coeffDict()); Cp_.readIfPresent(this->coeffDict()); @@ -119,12 +119,12 @@ bool NicenoKEqn::read() } -template -const PhaseCompressibleTurbulenceModel +template +const PhaseCompressibleMomentumTransportModel < - typename BasicTurbulenceModel::transportModel + typename BasicMomentumTransportModel::transportModel >& -NicenoKEqn::gasTurbulence() const +NicenoKEqn::gasTurbulence() const { if (!gasTurbulencePtr_) { @@ -136,12 +136,14 @@ NicenoKEqn::gasTurbulence() const const transportModel& gas = fluid.otherPhase(liquid); gasTurbulencePtr_ = - &U.db() - .lookupObject> + &U.db().lookupObject + < + PhaseCompressibleMomentumTransportModel + > ( IOobject::groupName ( - turbulenceModel::typeName, + momentumTransportModel::typeName, gas.name() ) ); @@ -151,11 +153,11 @@ NicenoKEqn::gasTurbulence() const } -template -void NicenoKEqn::correctNut() +template +void NicenoKEqn::correctNut() { - const PhaseCompressibleTurbulenceModel& gasTurbulence = - this->gasTurbulence(); + const PhaseCompressibleMomentumTransportModel& + gasTurbulence = this->gasTurbulence(); this->nut_ = this->Ck_*sqrt(this->k_)*this->delta() @@ -164,16 +166,14 @@ void NicenoKEqn::correctNut() this->nut_.correctBoundaryConditions(); fv::options::New(this->mesh_).correct(this->nut_); - - BasicTurbulenceModel::correctNut(); } -template -tmp NicenoKEqn::bubbleG() const +template +tmp NicenoKEqn::bubbleG() const { - const PhaseCompressibleTurbulenceModel& gasTurbulence = - this->gasTurbulence(); + const PhaseCompressibleMomentumTransportModel& + gasTurbulence = this->gasTurbulence(); const transportModel& liquid = this->transport(); const twoPhaseSystem& fluid = @@ -193,15 +193,15 @@ tmp NicenoKEqn::bubbleG() const } -template +template tmp -NicenoKEqn::phaseTransferCoeff() const +NicenoKEqn::phaseTransferCoeff() const { const volVectorField& U = this->U_; const alphaField& alpha = this->alpha_; const rhoField& rho = this->rho_; - const turbulenceModel& gasTurbulence = this->gasTurbulence(); + const momentumTransportModel& gasTurbulence = this->gasTurbulence(); return ( @@ -216,14 +216,14 @@ NicenoKEqn::phaseTransferCoeff() const } -template -tmp NicenoKEqn::kSource() const +template +tmp NicenoKEqn::kSource() const { const alphaField& alpha = this->alpha_; const rhoField& rho = this->rho_; - const PhaseCompressibleTurbulenceModel& gasTurbulence = - this->gasTurbulence(); + const PhaseCompressibleMomentumTransportModel& + gasTurbulence = this->gasTurbulence(); const volScalarField phaseTransferCoeff(this->phaseTransferCoeff()); diff --git a/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.H b/src/MomentumTransportModels/phaseCompressible/LES/Niceno/NicenoKEqn.H similarity index 88% rename from src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.H rename to src/MomentumTransportModels/phaseCompressible/LES/Niceno/NicenoKEqn.H index 79aa6774ac..edf6104070 100644 --- a/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.H +++ b/src/MomentumTransportModels/phaseCompressible/LES/Niceno/NicenoKEqn.H @@ -69,25 +69,25 @@ namespace LESModels Class NicenoKEqn Declaration \*---------------------------------------------------------------------------*/ -template +template class NicenoKEqn : - public kEqn + public kEqn { // Private Data - mutable const PhaseCompressibleTurbulenceModel + mutable const PhaseCompressibleMomentumTransportModel < - typename BasicTurbulenceModel::transportModel + typename BasicMomentumTransportModel::transportModel > *gasTurbulencePtr_; // Private Member Functions //- Return the turbulence model for the gas phase - const PhaseCompressibleTurbulenceModel + const PhaseCompressibleMomentumTransportModel < - typename BasicTurbulenceModel::transportModel + typename BasicMomentumTransportModel::transportModel >& gasTurbulence() const; @@ -113,9 +113,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C b/src/MomentumTransportModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C similarity index 77% rename from src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C rename to src/MomentumTransportModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C index db8b557148..c11f4f540e 100644 --- a/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C +++ b/src/MomentumTransportModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C @@ -35,8 +35,8 @@ namespace LESModels // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -SmagorinskyZhang::SmagorinskyZhang +template +SmagorinskyZhang::SmagorinskyZhang ( const alphaField& alpha, const rhoField& rho, @@ -47,7 +47,7 @@ SmagorinskyZhang::SmagorinskyZhang const word& type ) : - Smagorinsky + Smagorinsky ( alpha, rho, @@ -79,10 +79,10 @@ SmagorinskyZhang::SmagorinskyZhang // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool SmagorinskyZhang::read() +template +bool SmagorinskyZhang::read() { - if (Smagorinsky::read()) + if (Smagorinsky::read()) { Cmub_.readIfPresent(this->coeffDict()); @@ -95,12 +95,12 @@ bool SmagorinskyZhang::read() } -template -const PhaseCompressibleTurbulenceModel +template +const PhaseCompressibleMomentumTransportModel < - typename BasicTurbulenceModel::transportModel + typename BasicMomentumTransportModel::transportModel >& -SmagorinskyZhang::gasTurbulence() const +SmagorinskyZhang::gasTurbulence() const { if (!gasTurbulencePtr_) { @@ -112,12 +112,14 @@ SmagorinskyZhang::gasTurbulence() const const transportModel& gas = fluid.otherPhase(liquid); gasTurbulencePtr_ = - &U.db() - .lookupObject> + &U.db().lookupObject + < + PhaseCompressibleMomentumTransportModel + > ( IOobject::groupName ( - turbulenceModel::typeName, + momentumTransportModel::typeName, gas.name() ) ); @@ -127,11 +129,11 @@ SmagorinskyZhang::gasTurbulence() const } -template -void SmagorinskyZhang::correctNut() +template +void SmagorinskyZhang::correctNut() { - const PhaseCompressibleTurbulenceModel& gasTurbulence = - this->gasTurbulence(); + const PhaseCompressibleMomentumTransportModel& + gasTurbulence = this->gasTurbulence(); volScalarField k(this->k(fvc::grad(this->U_))); @@ -142,8 +144,6 @@ void SmagorinskyZhang::correctNut() this->nut_.correctBoundaryConditions(); fv::options::New(this->mesh_).correct(this->nut_); - - BasicTurbulenceModel::correctNut(); } diff --git a/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H b/src/MomentumTransportModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H similarity index 87% rename from src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H rename to src/MomentumTransportModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H index d5d03f09b6..49542a7f52 100644 --- a/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H +++ b/src/MomentumTransportModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.H @@ -67,25 +67,25 @@ namespace LESModels Class SmagorinskyZhang Declaration \*---------------------------------------------------------------------------*/ -template +template class SmagorinskyZhang : - public Smagorinsky + public Smagorinsky { // Private Data - mutable const PhaseCompressibleTurbulenceModel + mutable const PhaseCompressibleMomentumTransportModel < - typename BasicTurbulenceModel::transportModel + typename BasicMomentumTransportModel::transportModel > *gasTurbulencePtr_; // Private Member Functions //- Return the turbulence model for the gas phase - const PhaseCompressibleTurbulenceModel + const PhaseCompressibleMomentumTransportModel < - typename BasicTurbulenceModel::transportModel + typename BasicMomentumTransportModel::transportModel >& gasTurbulence() const; @@ -106,9 +106,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C b/src/MomentumTransportModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C similarity index 79% rename from src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C rename to src/MomentumTransportModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C index b03af26e34..360ddb5946 100644 --- a/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C +++ b/src/MomentumTransportModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C @@ -35,8 +35,8 @@ namespace LESModels // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -continuousGasKEqn::continuousGasKEqn +template +continuousGasKEqn::continuousGasKEqn ( const alphaField& alpha, const rhoField& rho, @@ -47,7 +47,7 @@ continuousGasKEqn::continuousGasKEqn const word& type ) : - kEqn + kEqn ( alpha, rho, @@ -79,10 +79,10 @@ continuousGasKEqn::continuousGasKEqn // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool continuousGasKEqn::read() +template +bool continuousGasKEqn::read() { - if (kEqn::read()) + if (kEqn::read()) { alphaInversion_.readIfPresent(this->coeffDict()); @@ -95,9 +95,9 @@ bool continuousGasKEqn::read() } -template -const turbulenceModel& -continuousGasKEqn::liquidTurbulence() const +template +const momentumTransportModel& +continuousGasKEqn::liquidTurbulence() const { if (!liquidTurbulencePtr_) { @@ -109,11 +109,11 @@ continuousGasKEqn::liquidTurbulence() const const transportModel& liquid = fluid.otherPhase(gas); liquidTurbulencePtr_ = - &U.db().lookupObject + &U.db().lookupObject ( IOobject::groupName ( - turbulenceModel::typeName, + momentumTransportModel::typeName, liquid.name() ) ); @@ -123,15 +123,15 @@ continuousGasKEqn::liquidTurbulence() const } -template +template tmp -continuousGasKEqn::phaseTransferCoeff() const +continuousGasKEqn::phaseTransferCoeff() const { const volVectorField& U = this->U_; const alphaField& alpha = this->alpha_; const rhoField& rho = this->rho_; - const turbulenceModel& liquidTurbulence = this->liquidTurbulence(); + const momentumTransportModel& liquidTurbulence = this->liquidTurbulence(); return ( @@ -146,11 +146,11 @@ continuousGasKEqn::phaseTransferCoeff() const } -template +template tmp -continuousGasKEqn::kSource() const +continuousGasKEqn::kSource() const { - const turbulenceModel& liquidTurbulence = this->liquidTurbulence(); + const momentumTransportModel& liquidTurbulence = this->liquidTurbulence(); const volScalarField phaseTransferCoeff(this->phaseTransferCoeff()); return diff --git a/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H b/src/MomentumTransportModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H similarity index 90% rename from src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H rename to src/MomentumTransportModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H index f5028b34cf..4fea782f37 100644 --- a/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H +++ b/src/MomentumTransportModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.H @@ -67,14 +67,14 @@ namespace LESModels Class continuousGasKEqn Declaration \*---------------------------------------------------------------------------*/ -template +template class continuousGasKEqn : - public kEqn + public kEqn { // Private Data - mutable const turbulenceModel *liquidTurbulencePtr_; + mutable const momentumTransportModel *liquidTurbulencePtr_; protected: @@ -89,7 +89,7 @@ protected: // Protected Member Functions //- Return the turbulence model for the liquid phase - const turbulenceModel& liquidTurbulence() const; + const momentumTransportModel& liquidTurbulence() const; tmp phaseTransferCoeff() const; virtual tmp kSource() const; @@ -97,9 +97,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C b/src/MomentumTransportModels/phaseCompressible/PhaseCompressibleMomentumTransportModel/PhaseCompressibleMomentumTransportModel.C similarity index 80% rename from src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C rename to src/MomentumTransportModels/phaseCompressible/PhaseCompressibleMomentumTransportModel/PhaseCompressibleMomentumTransportModel.C index 8fa200099e..b5cd99304a 100644 --- a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.C +++ b/src/MomentumTransportModels/phaseCompressible/PhaseCompressibleMomentumTransportModel/PhaseCompressibleMomentumTransportModel.C @@ -23,13 +23,13 @@ License \*---------------------------------------------------------------------------*/ -#include "PhaseCompressibleTurbulenceModel.H" +#include "PhaseCompressibleMomentumTransportModel.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -Foam::PhaseCompressibleTurbulenceModel:: -PhaseCompressibleTurbulenceModel +Foam::PhaseCompressibleMomentumTransportModel:: +PhaseCompressibleMomentumTransportModel ( const word& type, const volScalarField& alpha, @@ -40,11 +40,11 @@ PhaseCompressibleTurbulenceModel const transportModel& transport ) : - TurbulenceModel + MomentumTransportModel < volScalarField, volScalarField, - compressibleTurbulenceModel, + compressibleMomentumTransportModel, transportModel > ( @@ -61,8 +61,8 @@ PhaseCompressibleTurbulenceModel // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * // template -Foam::autoPtr> -Foam::PhaseCompressibleTurbulenceModel::New +Foam::autoPtr> +Foam::PhaseCompressibleMomentumTransportModel::New ( const volScalarField& alpha, const volScalarField& rho, @@ -72,14 +72,14 @@ Foam::PhaseCompressibleTurbulenceModel::New const transportModel& transport ) { - return autoPtr + return autoPtr ( - static_cast( - TurbulenceModel + static_cast( + MomentumTransportModel < volScalarField, volScalarField, - compressibleTurbulenceModel, + compressibleMomentumTransportModel, transportModel >::New ( @@ -98,7 +98,7 @@ Foam::PhaseCompressibleTurbulenceModel::New template Foam::tmp -Foam::PhaseCompressibleTurbulenceModel::pPrime() const +Foam::PhaseCompressibleMomentumTransportModel::pPrime() const { return volScalarField::New ( @@ -111,7 +111,7 @@ Foam::PhaseCompressibleTurbulenceModel::pPrime() const template Foam::tmp -Foam::PhaseCompressibleTurbulenceModel::pPrimef() const +Foam::PhaseCompressibleMomentumTransportModel::pPrimef() const { return surfaceScalarField::New ( diff --git a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H b/src/MomentumTransportModels/phaseCompressible/PhaseCompressibleMomentumTransportModel/PhaseCompressibleMomentumTransportModel.H similarity index 86% rename from src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H rename to src/MomentumTransportModels/phaseCompressible/PhaseCompressibleMomentumTransportModel/PhaseCompressibleMomentumTransportModel.H index dd62ae7163..8d4def1cac 100644 --- a/src/TurbulenceModels/phaseCompressible/PhaseCompressibleTurbulenceModel/PhaseCompressibleTurbulenceModel.H +++ b/src/MomentumTransportModels/phaseCompressible/PhaseCompressibleMomentumTransportModel/PhaseCompressibleMomentumTransportModel.H @@ -22,22 +22,22 @@ License along with OpenFOAM. If not, see . Class - Foam::PhaseCompressibleTurbulenceModel + Foam::PhaseCompressibleMomentumTransportModel Description Templated abstract base class for multiphase compressible turbulence models. SourceFiles - PhaseCompressibleTurbulenceModel.C + PhaseCompressibleMomentumTransportModel.C \*---------------------------------------------------------------------------*/ -#ifndef PhaseCompressibleTurbulenceModel_H -#define PhaseCompressibleTurbulenceModel_H +#ifndef PhaseCompressibleMomentumTransportModel_H +#define PhaseCompressibleMomentumTransportModel_H -#include "TurbulenceModel.H" -#include "compressibleTurbulenceModel.H" +#include "MomentumTransportModel.H" +#include "compressibleMomentumTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,17 +45,17 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class PhaseCompressibleTurbulenceModel Declaration + Class PhaseCompressibleMomentumTransportModel Declaration \*---------------------------------------------------------------------------*/ template -class PhaseCompressibleTurbulenceModel +class PhaseCompressibleMomentumTransportModel : - public TurbulenceModel + public MomentumTransportModel < volScalarField, volScalarField, - compressibleTurbulenceModel, + compressibleMomentumTransportModel, TransportModel > { @@ -70,7 +70,7 @@ public: // Constructors //- Construct - PhaseCompressibleTurbulenceModel + PhaseCompressibleMomentumTransportModel ( const word& type, const alphaField& alpha, @@ -85,7 +85,7 @@ public: // Selectors //- Return a reference to the selected turbulence model - static autoPtr New + static autoPtr New ( const alphaField& alpha, const volScalarField& rho, @@ -97,7 +97,7 @@ public: //- Destructor - virtual ~PhaseCompressibleTurbulenceModel() + virtual ~PhaseCompressibleMomentumTransportModel() {} @@ -156,7 +156,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "PhaseCompressibleTurbulenceModel.C" + #include "PhaseCompressibleMomentumTransportModel.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C b/src/MomentumTransportModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C similarity index 73% rename from src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C rename to src/MomentumTransportModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C index f2667d22e0..a76bfdc481 100644 --- a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C +++ b/src/MomentumTransportModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C @@ -37,8 +37,8 @@ namespace RASModels // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -LaheyKEpsilon::LaheyKEpsilon +template +LaheyKEpsilon::LaheyKEpsilon ( const alphaField& alpha, const rhoField& rho, @@ -49,7 +49,7 @@ LaheyKEpsilon::LaheyKEpsilon const word& type ) : - kEpsilon + kEpsilon ( alpha, rho, @@ -111,10 +111,10 @@ LaheyKEpsilon::LaheyKEpsilon // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool LaheyKEpsilon::read() +template +bool LaheyKEpsilon::read() { - if (kEpsilon::read()) + if (kEpsilon::read()) { alphaInversion_.readIfPresent(this->coeffDict()); Cp_.readIfPresent(this->coeffDict()); @@ -130,12 +130,12 @@ bool LaheyKEpsilon::read() } -template -const PhaseCompressibleTurbulenceModel +template +const PhaseCompressibleMomentumTransportModel < - typename BasicTurbulenceModel::transportModel + typename BasicMomentumTransportModel::transportModel >& -LaheyKEpsilon::gasTurbulence() const +LaheyKEpsilon::gasTurbulence() const { if (!gasTurbulencePtr_) { @@ -147,12 +147,14 @@ LaheyKEpsilon::gasTurbulence() const const transportModel& gas = fluid.otherPhase(liquid); gasTurbulencePtr_ = - &U.db() - .lookupObject> + &U.db().lookupObject + < + PhaseCompressibleMomentumTransportModel + > ( IOobject::groupName ( - turbulenceModel::typeName, + momentumTransportModel::typeName, gas.name() ) ); @@ -162,11 +164,11 @@ LaheyKEpsilon::gasTurbulence() const } -template -void LaheyKEpsilon::correctNut() +template +void LaheyKEpsilon::correctNut() { - const PhaseCompressibleTurbulenceModel& gasTurbulence = - this->gasTurbulence(); + const PhaseCompressibleMomentumTransportModel& + gasTurbulence = this->gasTurbulence(); this->nut_ = this->Cmu_*sqr(this->k_)/this->epsilon_ @@ -175,16 +177,14 @@ void LaheyKEpsilon::correctNut() this->nut_.correctBoundaryConditions(); fv::options::New(this->mesh_).correct(this->nut_); - - BasicTurbulenceModel::correctNut(); } -template -tmp LaheyKEpsilon::bubbleG() const +template +tmp LaheyKEpsilon::bubbleG() const { - const PhaseCompressibleTurbulenceModel& gasTurbulence = - this->gasTurbulence(); + const PhaseCompressibleMomentumTransportModel& + gasTurbulence = this->gasTurbulence(); const transportModel& liquid = this->transport(); const twoPhaseSystem& fluid = refCast(liquid.fluid()); @@ -210,15 +210,15 @@ tmp LaheyKEpsilon::bubbleG() const } -template +template tmp -LaheyKEpsilon::phaseTransferCoeff() const +LaheyKEpsilon::phaseTransferCoeff() const { const volVectorField& U = this->U_; const alphaField& alpha = this->alpha_; const rhoField& rho = this->rho_; - const turbulenceModel& gasTurbulence = this->gasTurbulence(); + const momentumTransportModel& gasTurbulence = this->gasTurbulence(); return ( @@ -229,14 +229,14 @@ LaheyKEpsilon::phaseTransferCoeff() const } -template -tmp LaheyKEpsilon::kSource() const +template +tmp LaheyKEpsilon::kSource() const { const alphaField& alpha = this->alpha_; const rhoField& rho = this->rho_; - const PhaseCompressibleTurbulenceModel& gasTurbulence = - this->gasTurbulence(); + const PhaseCompressibleMomentumTransportModel& + gasTurbulence = this->gasTurbulence(); const volScalarField phaseTransferCoeff(this->phaseTransferCoeff()); @@ -247,14 +247,15 @@ tmp LaheyKEpsilon::kSource() const } -template -tmp LaheyKEpsilon::epsilonSource() const +template +tmp +LaheyKEpsilon::epsilonSource() const { const alphaField& alpha = this->alpha_; const rhoField& rho = this->rho_; - const PhaseCompressibleTurbulenceModel& gasTurbulence = - this->gasTurbulence(); + const PhaseCompressibleMomentumTransportModel& + gasTurbulence = this->gasTurbulence(); const volScalarField phaseTransferCoeff(this->phaseTransferCoeff()); @@ -265,10 +266,10 @@ tmp LaheyKEpsilon::epsilonSource() const } -template -void LaheyKEpsilon::correct() +template +void LaheyKEpsilon::correct() { - kEpsilon::correct(); + kEpsilon::correct(); } diff --git a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H b/src/MomentumTransportModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H similarity index 89% rename from src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H rename to src/MomentumTransportModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H index f7f1d18d5e..92d26bda55 100644 --- a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H +++ b/src/MomentumTransportModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.H @@ -71,25 +71,25 @@ namespace RASModels Class LaheyKEpsilon Declaration \*---------------------------------------------------------------------------*/ -template +template class LaheyKEpsilon : - public kEpsilon + public kEpsilon { // Private Data - mutable const PhaseCompressibleTurbulenceModel + mutable const PhaseCompressibleMomentumTransportModel < - typename BasicTurbulenceModel::transportModel + typename BasicMomentumTransportModel::transportModel > *gasTurbulencePtr_; // Private Member Functions //- Return the turbulence model for the gas phase - const PhaseCompressibleTurbulenceModel + const PhaseCompressibleMomentumTransportModel < - typename BasicTurbulenceModel::transportModel + typename BasicMomentumTransportModel::transportModel >& gasTurbulence() const; @@ -117,9 +117,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C b/src/MomentumTransportModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C similarity index 78% rename from src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C rename to src/MomentumTransportModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C index 92caa8ba9b..2017a4e619 100644 --- a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C +++ b/src/MomentumTransportModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C @@ -38,8 +38,8 @@ namespace RASModels // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -continuousGasKEpsilon::continuousGasKEpsilon +template +continuousGasKEpsilon::continuousGasKEpsilon ( const alphaField& alpha, const rhoField& rho, @@ -50,7 +50,7 @@ continuousGasKEpsilon::continuousGasKEpsilon const word& type ) : - kEpsilon + kEpsilon ( alpha, rho, @@ -95,10 +95,10 @@ continuousGasKEpsilon::continuousGasKEpsilon // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool continuousGasKEpsilon::read() +template +bool continuousGasKEpsilon::read() { - if (kEpsilon::read()) + if (kEpsilon::read()) { alphaInversion_.readIfPresent(this->coeffDict()); @@ -111,12 +111,12 @@ bool continuousGasKEpsilon::read() } -template -void continuousGasKEpsilon::correctNut() +template +void continuousGasKEpsilon::correctNut() { - kEpsilon::correctNut(); + kEpsilon::correctNut(); - const turbulenceModel& liquidTurbulence = this->liquidTurbulence(); + const momentumTransportModel& liquidTurbulence = this->liquidTurbulence(); const transportModel& gas = this->transport(); const twoPhaseSystem& fluid = refCast(gas.fluid()); const transportModel& liquid = fluid.otherPhase(gas); @@ -142,9 +142,9 @@ void continuousGasKEpsilon::correctNut() } -template -const turbulenceModel& -continuousGasKEpsilon::liquidTurbulence() const +template +const momentumTransportModel& +continuousGasKEpsilon::liquidTurbulence() const { if (!liquidTurbulencePtr_) { @@ -156,11 +156,11 @@ continuousGasKEpsilon::liquidTurbulence() const const transportModel& liquid = fluid.otherPhase(gas); liquidTurbulencePtr_ = - &U.db().lookupObject + &U.db().lookupObject ( IOobject::groupName ( - turbulenceModel::typeName, + momentumTransportModel::typeName, liquid.name() ) ); @@ -170,9 +170,9 @@ continuousGasKEpsilon::liquidTurbulence() const } -template +template tmp -continuousGasKEpsilon::nuEff() const +continuousGasKEpsilon::nuEff() const { volScalarField blend ( @@ -197,9 +197,9 @@ continuousGasKEpsilon::nuEff() const } -template +template tmp -continuousGasKEpsilon::rhoEff() const +continuousGasKEpsilon::rhoEff() const { const transportModel& gas = this->transport(); const twoPhaseSystem& fluid = refCast(gas.fluid()); @@ -216,15 +216,15 @@ continuousGasKEpsilon::rhoEff() const } -template +template tmp -continuousGasKEpsilon::phaseTransferCoeff() const +continuousGasKEpsilon::phaseTransferCoeff() const { const volVectorField& U = this->U_; const alphaField& alpha = this->alpha_; const rhoField& rho = this->rho_; - const turbulenceModel& liquidTurbulence = this->liquidTurbulence(); + const momentumTransportModel& liquidTurbulence = this->liquidTurbulence(); return ( @@ -239,11 +239,11 @@ continuousGasKEpsilon::phaseTransferCoeff() const } -template +template tmp -continuousGasKEpsilon::kSource() const +continuousGasKEpsilon::kSource() const { - const turbulenceModel& liquidTurbulence = this->liquidTurbulence(); + const momentumTransportModel& liquidTurbulence = this->liquidTurbulence(); const volScalarField phaseTransferCoeff(this->phaseTransferCoeff()); return @@ -252,11 +252,11 @@ continuousGasKEpsilon::kSource() const } -template +template tmp -continuousGasKEpsilon::epsilonSource() const +continuousGasKEpsilon::epsilonSource() const { - const turbulenceModel& liquidTurbulence = this->liquidTurbulence(); + const momentumTransportModel& liquidTurbulence = this->liquidTurbulence(); const volScalarField phaseTransferCoeff(this->phaseTransferCoeff()); return @@ -265,9 +265,9 @@ continuousGasKEpsilon::epsilonSource() const } -template +template tmp -continuousGasKEpsilon::R() const +continuousGasKEpsilon::sigma() const { tmp tk(this->k()); diff --git a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H b/src/MomentumTransportModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H similarity index 89% rename from src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H rename to src/MomentumTransportModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H index 45e8754442..d1faab9a6d 100644 --- a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H +++ b/src/MomentumTransportModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.H @@ -72,14 +72,14 @@ namespace RASModels Class continuousGasKEpsilon Declaration \*---------------------------------------------------------------------------*/ -template +template class continuousGasKEpsilon : - public kEpsilon + public kEpsilon { // Private Data - mutable const turbulenceModel *liquidTurbulencePtr_; + mutable const momentumTransportModel *liquidTurbulencePtr_; volScalarField nutEff_; @@ -103,9 +103,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information @@ -141,7 +141,7 @@ public: virtual bool read(); //- Return the turbulence model for the liquid phase - const turbulenceModel& liquidTurbulence() const; + const momentumTransportModel& liquidTurbulence() const; //- Return the effective viscosity virtual tmp nuEff() const; @@ -149,8 +149,8 @@ public: //- Return the effective density for the stress virtual tmp rhoEff() const; - //- Return the Reynolds stress tensor - virtual tmp R() const; + //- Return the stress tensor [m^2/s^2] + virtual tmp sigma() const; // Member Operators diff --git a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C b/src/MomentumTransportModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C similarity index 86% rename from src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C rename to src/MomentumTransportModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C index 2b4080b31a..8696cc089b 100644 --- a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C +++ b/src/MomentumTransportModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C @@ -37,8 +37,8 @@ namespace RASModels // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -kOmegaSSTSato::kOmegaSSTSato +template +kOmegaSSTSato::kOmegaSSTSato ( const alphaField& alpha, const rhoField& rho, @@ -49,7 +49,7 @@ kOmegaSSTSato::kOmegaSSTSato const word& type ) : - kOmegaSST + kOmegaSST ( alpha, rho, @@ -88,10 +88,10 @@ kOmegaSSTSato::kOmegaSSTSato // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool kOmegaSSTSato::read() +template +bool kOmegaSSTSato::read() { - if (kOmegaSST::read()) + if (kOmegaSST::read()) { Cmub_.readIfPresent(this->coeffDict()); @@ -104,9 +104,9 @@ bool kOmegaSSTSato::read() } -template +template UPtrList -kOmegaSSTSato::getDispersedPhases() const +kOmegaSSTSato::getDispersedPhases() const { UPtrList dispersedPhases; @@ -150,8 +150,8 @@ kOmegaSSTSato::getDispersedPhases() const } -template -void kOmegaSSTSato::correctNut +template +void kOmegaSSTSato::correctNut ( const volScalarField& S2, const volScalarField& F2 @@ -176,15 +176,13 @@ void kOmegaSSTSato::correctNut this->nut_.correctBoundaryConditions(); fv::options::New(this->mesh_).correct(this->nut_); - - BasicTurbulenceModel::correctNut(); } -template -void kOmegaSSTSato::correct() +template +void kOmegaSSTSato::correct() { - kOmegaSST::correct(); + kOmegaSST::correct(); } diff --git a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H b/src/MomentumTransportModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H similarity index 95% rename from src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H rename to src/MomentumTransportModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H index 9ed2e2f3d1..fa1d68faaf 100644 --- a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H +++ b/src/MomentumTransportModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H @@ -113,10 +113,10 @@ namespace RASModels Class kOmegaSSTSato Declaration \*---------------------------------------------------------------------------*/ -template +template class kOmegaSSTSato : - public kOmegaSST + public kOmegaSST { // Private Data @@ -155,9 +155,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C b/src/MomentumTransportModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C similarity index 84% rename from src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C rename to src/MomentumTransportModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C index cb7009d0a9..ce2078e3d2 100644 --- a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C +++ b/src/MomentumTransportModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C @@ -42,8 +42,8 @@ namespace RASModels // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -mixtureKEpsilon::mixtureKEpsilon +template +mixtureKEpsilon::mixtureKEpsilon ( const alphaField& alpha, const rhoField& rho, @@ -54,7 +54,7 @@ mixtureKEpsilon::mixtureKEpsilon const word& type ) : - eddyViscosity> + eddyViscosity> ( type, alpha, @@ -175,8 +175,8 @@ mixtureKEpsilon::mixtureKEpsilon } -template -wordList mixtureKEpsilon::epsilonBoundaryTypes +template +wordList mixtureKEpsilon::epsilonBoundaryTypes ( const volScalarField& epsilon ) const @@ -197,8 +197,8 @@ wordList mixtureKEpsilon::epsilonBoundaryTypes } -template -void mixtureKEpsilon::correctInletOutlet +template +void mixtureKEpsilon::correctInletOutlet ( volScalarField& vsf, const volScalarField& refVsf @@ -225,8 +225,8 @@ void mixtureKEpsilon::correctInletOutlet } -template -void mixtureKEpsilon::initMixtureFields() +template +void mixtureKEpsilon::initMixtureFields() { if (rhom_.valid()) return; @@ -235,7 +235,8 @@ void mixtureKEpsilon::initMixtureFields() const volScalarField& epsilong = this->epsilon_; // Local references to liquid-phase properties - mixtureKEpsilon& turbc = this->liquidTurbulence(); + mixtureKEpsilon& turbc = + this->liquidTurbulence(); const volScalarField& kl = turbc.k_; const volScalarField& epsilonl = turbc.epsilon_; @@ -316,10 +317,10 @@ void mixtureKEpsilon::initMixtureFields() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool mixtureKEpsilon::read() +template +bool mixtureKEpsilon::read() { - if (eddyViscosity>::read()) + if (eddyViscosity>::read()) { Cmu_.readIfPresent(this->coeffDict()); C1_.readIfPresent(this->coeffDict()); @@ -338,20 +339,18 @@ bool mixtureKEpsilon::read() } -template -void mixtureKEpsilon::correctNut() +template +void mixtureKEpsilon::correctNut() { this->nut_ = Cmu_*sqr(k_)/epsilon_; this->nut_.correctBoundaryConditions(); fv::options::New(this->mesh_).correct(this->nut_); - - BasicTurbulenceModel::correctNut(); } -template -mixtureKEpsilon& -mixtureKEpsilon::liquidTurbulence() const +template +mixtureKEpsilon& +mixtureKEpsilon::liquidTurbulence() const { if (!liquidTurbulencePtr_) { @@ -363,13 +362,16 @@ mixtureKEpsilon::liquidTurbulence() const const transportModel& liquid = fluid.otherPhase(gas); liquidTurbulencePtr_ = - &const_cast&> + &const_cast&> ( - U.db().lookupObject> + U.db().lookupObject + < + mixtureKEpsilon + > ( IOobject::groupName ( - turbulenceModel::typeName, + momentumTransportModel::typeName, liquid.name() ) ) @@ -380,10 +382,10 @@ mixtureKEpsilon::liquidTurbulence() const } -template -tmp mixtureKEpsilon::Ct2() const +template +tmp mixtureKEpsilon::Ct2() const { - const mixtureKEpsilon& liquidTurbulence = + const mixtureKEpsilon& liquidTurbulence = this->liquidTurbulence(); const transportModel& gas = this->transport(); @@ -407,8 +409,9 @@ tmp mixtureKEpsilon::Ct2() const } -template -tmp mixtureKEpsilon::rholEff() const +template +tmp +mixtureKEpsilon::rholEff() const { const transportModel& gas = this->transport(); const twoPhaseSystem& fluid = refCast(gas.fluid()); @@ -416,8 +419,9 @@ tmp mixtureKEpsilon::rholEff() const } -template -tmp mixtureKEpsilon::rhogEff() const +template +tmp +mixtureKEpsilon::rhogEff() const { const transportModel& gas = this->transport(); const twoPhaseSystem& fluid = refCast(gas.fluid()); @@ -427,8 +431,8 @@ tmp mixtureKEpsilon::rhogEff() const } -template -tmp mixtureKEpsilon::rhom() const +template +tmp mixtureKEpsilon::rhom() const { const volScalarField& alphag = this->alpha_; const volScalarField& alphal = this->liquidTurbulence().alpha_; @@ -437,8 +441,8 @@ tmp mixtureKEpsilon::rhom() const } -template -tmp mixtureKEpsilon::mix +template +tmp mixtureKEpsilon::mix ( const volScalarField& fc, const volScalarField& fd @@ -451,8 +455,8 @@ tmp mixtureKEpsilon::mix } -template -tmp mixtureKEpsilon::mixU +template +tmp mixtureKEpsilon::mixU ( const volScalarField& fc, const volScalarField& fd @@ -467,8 +471,8 @@ tmp mixtureKEpsilon::mixU } -template -tmp mixtureKEpsilon::mixFlux +template +tmp mixtureKEpsilon::mixFlux ( const surfaceScalarField& fc, const surfaceScalarField& fd @@ -489,10 +493,11 @@ tmp mixtureKEpsilon::mixFlux } -template -tmp mixtureKEpsilon::bubbleG() const +template +tmp +mixtureKEpsilon::bubbleG() const { - const mixtureKEpsilon& liquidTurbulence = + const mixtureKEpsilon& liquidTurbulence = this->liquidTurbulence(); const transportModel& gas = this->transport(); @@ -527,22 +532,24 @@ tmp mixtureKEpsilon::bubbleG() const } -template -tmp mixtureKEpsilon::kSource() const +template +tmp +mixtureKEpsilon::kSource() const { return fvm::Su(bubbleG()/rhom_(), km_()); } -template -tmp mixtureKEpsilon::epsilonSource() const +template +tmp +mixtureKEpsilon::epsilonSource() const { return fvm::Su(C3_*epsilonm_()*bubbleG()/(rhom_()*km_()), epsilonm_()); } -template -void mixtureKEpsilon::correct() +template +void mixtureKEpsilon::correct() { const transportModel& gas = this->transport(); const twoPhaseSystem& fluid = refCast(gas.fluid()); @@ -574,7 +581,7 @@ void mixtureKEpsilon::correct() volScalarField& nutg = this->nut_; // Local references to liquid-phase properties - mixtureKEpsilon& liquidTurbulence = + mixtureKEpsilon& liquidTurbulence = this->liquidTurbulence(); tmp phil = liquidTurbulence.phi(); const volVectorField& Ul = liquidTurbulence.U_; @@ -590,7 +597,7 @@ void mixtureKEpsilon::correct() fv::options& fvOptions(fv::options::New(this->mesh_)); - eddyViscosity>::correct(); + eddyViscosity>::correct(); // Update the effective mixture density rhom = this->rhom(); diff --git a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H b/src/MomentumTransportModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H similarity index 93% rename from src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H rename to src/MomentumTransportModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H index 871e779ac1..ce21595466 100644 --- a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H +++ b/src/MomentumTransportModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H @@ -80,20 +80,21 @@ namespace RASModels Class mixtureKEpsilon Declaration \*---------------------------------------------------------------------------*/ -template +template class mixtureKEpsilon : - public eddyViscosity> + public eddyViscosity> { // Private Data - mutable mixtureKEpsilon *liquidTurbulencePtr_; + mutable mixtureKEpsilon + *liquidTurbulencePtr_; // Private Member Functions //- Return the turbulence model for the other phase - mixtureKEpsilon& liquidTurbulence() const; + mixtureKEpsilon& liquidTurbulence() const; protected: @@ -188,9 +189,9 @@ protected: public: - typedef typename BasicTurbulenceModel::alphaField alphaField; - typedef typename BasicTurbulenceModel::rhoField rhoField; - typedef typename BasicTurbulenceModel::transportModel transportModel; + typedef typename BasicMomentumTransportModel::alphaField alphaField; + typedef typename BasicMomentumTransportModel::rhoField rhoField; + typedef typename BasicMomentumTransportModel::transportModel transportModel; //- Runtime type information diff --git a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C b/src/MomentumTransportModels/phaseIncompressible/PhaseIncompressibleMomentumTransportModel/PhaseIncompressibleMomentumTransportModel.C similarity index 74% rename from src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C rename to src/MomentumTransportModels/phaseIncompressible/PhaseIncompressibleMomentumTransportModel/PhaseIncompressibleMomentumTransportModel.C index d45e93e696..0ac42a0fee 100644 --- a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.C +++ b/src/MomentumTransportModels/phaseIncompressible/PhaseIncompressibleMomentumTransportModel/PhaseIncompressibleMomentumTransportModel.C @@ -23,13 +23,13 @@ License \*---------------------------------------------------------------------------*/ -#include "PhaseIncompressibleTurbulenceModel.H" +#include "PhaseIncompressibleMomentumTransportModel.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -Foam::PhaseIncompressibleTurbulenceModel:: -PhaseIncompressibleTurbulenceModel +Foam::PhaseIncompressibleMomentumTransportModel:: +PhaseIncompressibleMomentumTransportModel ( const word& type, const volScalarField& alpha, @@ -40,11 +40,11 @@ PhaseIncompressibleTurbulenceModel const TransportModel& transportModel ) : - TurbulenceModel + MomentumTransportModel < volScalarField, geometricOneField, - incompressibleTurbulenceModel, + incompressibleMomentumTransportModel, TransportModel > ( @@ -61,8 +61,8 @@ PhaseIncompressibleTurbulenceModel // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * // template -Foam::autoPtr> -Foam::PhaseIncompressibleTurbulenceModel::New +Foam::autoPtr> +Foam::PhaseIncompressibleMomentumTransportModel::New ( const volScalarField& alpha, const volVectorField& U, @@ -71,14 +71,14 @@ Foam::PhaseIncompressibleTurbulenceModel::New const TransportModel& transportModel ) { - return autoPtr + return autoPtr ( - static_cast( - TurbulenceModel + static_cast( + MomentumTransportModel < volScalarField, geometricOneField, - incompressibleTurbulenceModel, + incompressibleMomentumTransportModel, TransportModel >::New ( @@ -97,7 +97,7 @@ Foam::PhaseIncompressibleTurbulenceModel::New template Foam::tmp -Foam::PhaseIncompressibleTurbulenceModel::pPrime() const +Foam::PhaseIncompressibleMomentumTransportModel::pPrime() const { return volScalarField::New ( @@ -110,7 +110,7 @@ Foam::PhaseIncompressibleTurbulenceModel::pPrime() const template Foam::tmp -Foam::PhaseIncompressibleTurbulenceModel::pPrimef() const +Foam::PhaseIncompressibleMomentumTransportModel::pPrimef() const { return surfaceScalarField::New ( @@ -123,45 +123,46 @@ Foam::PhaseIncompressibleTurbulenceModel::pPrimef() const template Foam::tmp -Foam::PhaseIncompressibleTurbulenceModel::devReff() const +Foam::PhaseIncompressibleMomentumTransportModel:: +devSigma() const { - return devRhoReff(); + return devTau(); } template Foam::tmp -Foam::PhaseIncompressibleTurbulenceModel::divDevReff +Foam::PhaseIncompressibleMomentumTransportModel::divDevSigma ( volVectorField& U ) const { - return divDevRhoReff(U); + return divDevTau(U); } template Foam::tmp -Foam::PhaseIncompressibleTurbulenceModel:: -devRhoReff() const +Foam::PhaseIncompressibleMomentumTransportModel:: +devTau() const { NotImplemented; - return devReff(); + return devSigma(); } template Foam::tmp -Foam::PhaseIncompressibleTurbulenceModel:: -divDevRhoReff +Foam::PhaseIncompressibleMomentumTransportModel:: +divDevTau ( volVectorField& U ) const { NotImplemented; - return divDevReff(U); + return divDevSigma(U); } diff --git a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H b/src/MomentumTransportModels/phaseIncompressible/PhaseIncompressibleMomentumTransportModel/PhaseIncompressibleMomentumTransportModel.H similarity index 77% rename from src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H rename to src/MomentumTransportModels/phaseIncompressible/PhaseIncompressibleMomentumTransportModel/PhaseIncompressibleMomentumTransportModel.H index 070e7dce70..4e43d6d01f 100644 --- a/src/TurbulenceModels/phaseIncompressible/PhaseIncompressibleTurbulenceModel/PhaseIncompressibleTurbulenceModel.H +++ b/src/MomentumTransportModels/phaseIncompressible/PhaseIncompressibleMomentumTransportModel/PhaseIncompressibleMomentumTransportModel.H @@ -22,22 +22,22 @@ License along with OpenFOAM. If not, see . Class - Foam::PhaseIncompressibleTurbulenceModel + Foam::PhaseIncompressibleMomentumTransportModel Description Templated abstract base class for multiphase incompressible turbulence models. SourceFiles - PhaseIncompressibleTurbulenceModel.C + PhaseIncompressibleMomentumTransportModel.C \*---------------------------------------------------------------------------*/ -#ifndef PhaseIncompressibleTurbulenceModel_H -#define PhaseIncompressibleTurbulenceModel_H +#ifndef PhaseIncompressibleMomentumTransportModel_H +#define PhaseIncompressibleMomentumTransportModel_H -#include "TurbulenceModel.H" -#include "incompressibleTurbulenceModel.H" +#include "MomentumTransportModel.H" +#include "incompressibleMomentumTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -45,17 +45,17 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class PhaseIncompressibleTurbulenceModel Declaration + Class PhaseIncompressibleMomentumTransportModel Declaration \*---------------------------------------------------------------------------*/ template -class PhaseIncompressibleTurbulenceModel +class PhaseIncompressibleMomentumTransportModel : - public TurbulenceModel + public MomentumTransportModel < volScalarField, geometricOneField, - incompressibleTurbulenceModel, + incompressibleMomentumTransportModel, TransportModel > { @@ -70,7 +70,7 @@ public: // Constructors //- Construct - PhaseIncompressibleTurbulenceModel + PhaseIncompressibleMomentumTransportModel ( const word& type, const alphaField& alpha, @@ -85,7 +85,7 @@ public: // Selectors //- Return a reference to the selected turbulence model - static autoPtr New + static autoPtr New ( const alphaField& alpha, const volVectorField& U, @@ -96,7 +96,7 @@ public: //- Destructor - virtual ~PhaseIncompressibleTurbulenceModel() + virtual ~PhaseIncompressibleMomentumTransportModel() {} @@ -111,16 +111,16 @@ public: virtual tmp pPrimef() const; //- Return the effective stress tensor - virtual tmp devReff() const; + virtual tmp devSigma() const; //- Return the source term for the momentum equation - virtual tmp divDevReff(volVectorField& U) const; + virtual tmp divDevSigma(volVectorField& U) const; //- Return the effective stress tensor - virtual tmp devRhoReff() const; + virtual tmp devTau() const; //- Return the source term for the momentum equation - virtual tmp divDevRhoReff(volVectorField& U) const; + virtual tmp divDevTau(volVectorField& U) const; }; @@ -131,7 +131,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "PhaseIncompressibleTurbulenceModel.C" + #include "PhaseIncompressibleMomentumTransportModel.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/GeometricFields/pointFields/pointFieldsFwd.H b/src/OpenFOAM/fields/GeometricFields/pointFields/pointFieldsFwd.H index e656ee2e2d..9b3d9c4581 100644 --- a/src/OpenFOAM/fields/GeometricFields/pointFields/pointFieldsFwd.H +++ b/src/OpenFOAM/fields/GeometricFields/pointFields/pointFieldsFwd.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 @@ -51,6 +51,9 @@ class pointPatchField; template class PatchField, class GeoMesh> class GeometricField; +template +using PointField = GeometricField; + typedef GeometricField pointScalarField; typedef GeometricField pointVectorField; typedef GeometricField diff --git a/src/OpenFOAM/include/listOptions.H b/src/OpenFOAM/include/listOptions.H index 49131de763..202654c6cb 100644 --- a/src/OpenFOAM/include/listOptions.H +++ b/src/OpenFOAM/include/listOptions.H @@ -43,10 +43,10 @@ argList::addBoolOption ); #endif -#if defined(turbulentTransportModel_H) || defined(turbulentFluidThermoModel_H) +#if defined(kinematicMomentumTransportModel_H) || defined(fluidThermoMomentumTransportModel_H) argList::addBoolOption ( - "listTurbulenceModels", - "List turbulenceModels" + "listMomentumTransportModels", + "List momentumTransportModels" ); #endif diff --git a/src/OpenFOAM/include/listOutput.H b/src/OpenFOAM/include/listOutput.H index 876a52f67d..c94f052d29 100644 --- a/src/OpenFOAM/include/listOutput.H +++ b/src/OpenFOAM/include/listOutput.H @@ -56,11 +56,11 @@ if (args.optionFound("listFvOptions")) } #endif -#ifdef turbulentTransportModel_H -if (args.optionFound("listTurbulenceModels")) +#ifdef kinematicMomentumTransportModel_H +if (args.optionFound("listMomentumTransportModels")) { Info<< "Turbulence models" - << incompressible::turbulenceModel:: + << incompressible::momentumTransportModel:: dictionaryConstructorTablePtr_->sortedToc() << endl; @@ -75,11 +75,11 @@ if (args.optionFound("listTurbulenceModels")) << endl; listOptions = true; } -#elif defined(turbulentFluidThermoModel_H) -if (args.optionFound("listTurbulenceModels")) +#elif defined(fluidThermoMomentumTransportModel_H) +if (args.optionFound("listMomentumTransportModels")) { Info<< "Turbulence models" - << compressible::turbulenceModel:: + << compressible::momentumTransportModel:: dictionaryConstructorTablePtr_->sortedToc() << endl; diff --git a/src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1.H b/src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1.H new file mode 100644 index 0000000000..e3aff1c97c --- /dev/null +++ b/src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1.H @@ -0,0 +1,143 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 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::objectFunction1 + +Description + Wrapper around Function1 that constructs a function of type associated with + an object found in the database. + +SourceFiles + objectFunction1Templates.C + +\*---------------------------------------------------------------------------*/ + +#ifndef objectFunction1_H +#define objectFunction1_H + +#include "Function1.H" +#include "objectRegistry.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + Class objectFunction1 Declaration +\*---------------------------------------------------------------------------*/ + +class objectFunction1 +: + private autoPtr>, + private autoPtr>, + private autoPtr>, + private autoPtr>, + private autoPtr> +{ + // Private Classes + + //- Tag structure used to deduce type in the templated constructor + template + struct type + {}; + + + // Private Constructors + + //- Construct from an name and a dictionary + template + objectFunction1 + ( + const word& entryName, + const dictionary& dict, + const type& + ); + + +public: + + // Selector + + template