From 7f5144312ece8c6706ecc5d9a3309ea2df4bcbed Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Fri, 10 Apr 2020 17:17:37 +0100 Subject: [PATCH] Renamed turbulenceProperties -> momentumTransport Following the generalisation of the TurbulenceModels library to support non-Newtonian laminar flow including visco-elasticity and extensible to other form of non-Newtonian behaviour the name TurbulenceModels is misleading and does not properly represent how general the OpenFOAM solvers now are. The TurbulenceModels now provides an interface to momentum transport modelling in general and the plan is to rename it MomentumTransportModels and in preparation for this the turbulenceProperties dictionary has been renamed momentumTransport to properly reflect its new more general purpose. The old turbulenceProperties name is supported for backward-compatibility. --- .../DNS/dnsFoam/readTurbulenceProperties.H | 8 +- .../preProcessing/foamSetupCHT/foamSetupCHT.C | 4 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- .../constant/momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- .../constant/momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- .../templates/materials/air/momentumTransport | 51 ++++ .../materials/air/turbulenceProperties | 51 ---- .../materials/water/momentumTransport | 51 ++++ .../materials/water/turbulenceProperties | 51 ---- .../compressibleTurbulenceModel.H | 2 +- ...convectiveHeatTransferFvPatchScalarField.C | 4 +- ...oupledTemperatureMixedFvPatchScalarField.C | 4 +- .../temperatureCoupledBase.C | 2 +- .../thermalBaffle1DFvPatchScalarField.C | 4 +- ...RateAdvectiveDiffusiveFvPatchScalarField.C | 4 +- ...ayatillekeWallFunctionFvPatchScalarField.C | 4 +- .../alphatWallFunctionFvPatchScalarField.C | 4 +- .../turbulentFluidThermoModel.H | 3 + .../incompressible/Make/files | 3 - .../incompressibleTurbulenceModel.H | 2 +- ...ayatillekeWallFunctionFvPatchScalarField.C | 252 ------------------ ...ayatillekeWallFunctionFvPatchScalarField.H | 210 --------------- .../phaseCompressible/LES/Niceno/NicenoKEqn.C | 2 +- .../LES/SmagorinskyZhang/SmagorinskyZhang.C | 2 +- .../LES/continuousGasKEqn/continuousGasKEqn.C | 2 +- .../RAS/LaheyKEpsilon/LaheyKEpsilon.C | 2 +- .../continuousGasKEpsilon.C | 2 +- .../RAS/mixtureKEpsilon/mixtureKEpsilon.C | 2 +- .../turbulenceModels/LES/LESModel/LESModel.C | 14 +- .../LES/LESdeltas/PrandtlDelta/PrandtlDelta.H | 4 +- .../turbulenceModels/RAS/RASModel/RASModel.C | 14 +- ...thDissipationRateInletFvPatchScalarField.C | 4 +- ...ngLengthFrequencyInletFvPatchScalarField.C | 4 +- .../TurbulenceModel/TurbulenceModel.C | 19 +- .../fixedShearStressFvPatchVectorField.C | 4 +- .../porousBafflePressureFvPatchField.C | 4 +- .../epsilonWallFunctionFvPatchScalarField.C | 6 +- .../fWallFunctionFvPatchScalarField.C | 4 +- .../kLowReWallFunctionFvPatchScalarField.C | 4 +- .../nutLowReWallFunctionFvPatchScalarField.C | 4 +- .../nutURoughWallFunctionFvPatchScalarField.C | 6 +- ...tUSpaldingWallFunctionFvPatchScalarField.C | 8 +- ...UTabulatedWallFunctionFvPatchScalarField.C | 6 +- .../nutUWallFunctionFvPatchScalarField.C | 8 +- .../nutkRoughWallFunctionFvPatchScalarField.C | 4 +- .../nutkWallFunctionFvPatchScalarField.C | 6 +- .../omegaWallFunctionFvPatchScalarField.C | 6 +- .../v2WallFunctionFvPatchScalarField.C | 4 +- .../turbulenceModels/laminar/Stokes/Stokes.H | 2 +- .../generalizedNewtonian.H | 2 +- .../laminar/laminarModel/laminarModel.C | 14 +- .../turbulenceModels/turbulenceModel.C | 64 ++++- .../turbulenceModels/turbulenceModel.H | 15 +- ...tkAtmRoughWallFunctionFvPatchScalarField.C | 2 +- src/combustionModels/FSD/FSD.C | 4 +- src/functionObjects/field/PecletNo/PecletNo.C | 4 +- src/functionObjects/field/age/age.C | 6 +- .../field/shearStress/shearStress.C | 2 +- .../field/turbulenceFields/turbulenceFields.C | 4 +- .../turbulenceIntensity/turbulenceIntensity.C | 6 +- .../field/wallHeatFlux/wallHeatFlux.C | 6 +- .../wallHeatTransferCoeff.C | 6 +- .../field/wallShearStress/wallShearStress.C | 10 +- src/functionObjects/field/yPlus/yPlus.C | 6 +- src/functionObjects/forces/forces/forces.C | 10 +- .../phaseScalarTransport.C | 4 +- .../solvers/scalarTransport/scalarTransport.C | 10 +- .../volumeFractionSource.C | 6 +- .../variableHeatTransfer.C | 4 +- .../DispersionRASModel/DispersionRASModel.C | 6 +- .../BrownianMotion/BrownianMotionForce.C | 4 +- ...alphatFilmWallFunctionFvPatchScalarField.C | 4 +- .../nutkFilmWallFunctionFvPatchScalarField.C | 6 +- ...adsorptionMassFractionFvPatchScalarField.C | 4 +- ...ableBaffleMassFractionFvPatchScalarField.C | 4 +- ...ieTransferMassFractionFvPatchScalarField.C | 4 +- ...cieTransferTemperatureFvPatchScalarField.C | 4 +- .../constant/momentumTransport.air1 | 20 ++ .../constant/momentumTransport.air2 | 20 ++ .../constant/momentumTransport.air3 | 20 ++ .../constant/momentumTransport.water | 20 ++ .../breakup/constant/momentumTransport.air1 | 20 ++ .../breakup/constant/momentumTransport.air2 | 20 ++ .../breakup/constant/momentumTransport.air3 | 20 ++ .../breakup/constant/momentumTransport.water | 20 ++ .../constant/turbulenceProperties.air3 | 20 -- .../constant/momentumTransport.air1 | 20 ++ .../constant/momentumTransport.air2 | 20 ++ .../constant/momentumTransport.air3 | 20 ++ .../constant/momentumTransport.water | 20 ++ .../constant/turbulenceProperties.air1 | 20 -- .../constant/turbulenceProperties.air2 | 20 -- .../constant/turbulenceProperties.air3 | 20 -- .../constant/momentumTransport.air1 | 20 ++ .../constant/momentumTransport.air2 | 20 ++ .../constant/momentumTransport.air3 | 20 ++ .../constant/momentumTransport.water | 20 ++ .../constant/turbulenceProperties.air1 | 20 -- .../constant/turbulenceProperties.air2 | 20 -- .../constant/turbulenceProperties.air3 | 20 -- .../constant/momentumTransport.gas | 20 ++ .../constant/momentumTransport.liquid | 20 ++ .../constant/momentumTransport.gas | 20 ++ .../constant/momentumTransport.liquid | 20 ++ .../drift/constant/momentumTransport.air | 20 ++ .../drift/constant/momentumTransport.water | 20 ++ .../constant/momentumTransport.air | 20 ++ .../constant/momentumTransport.water | 20 ++ .../constant/momentumTransport.steam | 20 ++ .../constant/momentumTransport.water | 20 ++ ...turbulenceProperties => momentumTransport} | 2 +- .../fileHandler/constant/momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- .../constant/momentumTransport} | 2 +- .../freePiston/constant/momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- .../constant/momentumTransport} | 2 +- .../constant/momentumTransport} | 2 +- .../constant/momentumTransport} | 2 +- .../constant/momentumTransport | 21 ++ .../constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../forwardStep/constant/momentumTransport | 21 ++ .../forwardStep/constant/turbulenceProperties | 21 -- .../movingCone/constant/momentumTransport | 21 ++ .../movingCone/constant/turbulenceProperties | 21 -- .../obliqueShock/constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../shockTube/constant/momentumTransport | 21 ++ .../shockTube/constant/turbulenceProperties | 21 -- .../wedge15Ma5/constant/momentumTransport | 21 ++ .../wedge15Ma5/constant/turbulenceProperties | 21 -- .../LES/pitzDaily/constant/momentumTransport} | 3 +- ...turbulenceProperties => momentumTransport} | 2 +- .../constant/momentumTransport} | 2 +- .../constant/momentumTransport} | 2 +- .../constant/momentumTransport} | 2 +- .../RAS/cavity/constant/momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- .../nacaAirfoil/constant/momentumTransport} | 2 +- .../RAS/prism/constant/momentumTransport | 30 +++ .../RAS/prism/constant/turbulenceProperties | 30 --- .../squareBendLiq/constant/momentumTransport | 30 +++ .../constant/turbulenceProperties | 30 --- ...turbulenceProperties => momentumTransport} | 2 +- .../constant/thermophysicalTransport | 7 +- ...turbulenceProperties => momentumTransport} | 2 +- .../forwardStep/constant/momentumTransport | 21 ++ .../forwardStep/constant/turbulenceProperties | 21 -- .../constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../shockTube/constant/momentumTransport | 21 ++ .../shockTube/constant/turbulenceProperties | 21 -- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- .../squareBend/constant/momentumTransport | 30 +++ .../squareBend/constant/turbulenceProperties | 30 --- .../squareBendLiq/constant/momentumTransport | 30 +++ .../constant/turbulenceProperties | 30 --- ...turbulenceProperties => momentumTransport} | 2 +- .../hotRoom/constant/momentumTransport | 30 +++ .../hotRoom/constant/turbulenceProperties | 30 --- .../constant/momentumTransport | 30 +++ .../constant/turbulenceProperties | 30 --- ...turbulenceProperties => momentumTransport} | 0 ...turbulenceProperties => momentumTransport} | 0 ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 0 ...turbulenceProperties => momentumTransport} | 0 ...turbulenceProperties => momentumTransport} | 0 ...turbulenceProperties => momentumTransport} | 2 +- .../constant/momentumTransport | 30 +++ .../constant/turbulenceProperties | 30 --- ...turbulenceProperties => momentumTransport} | 2 +- .../momentumTransport} | 2 +- .../momentumTransport} | 2 +- .../constant/air/momentumTransport | 30 +++ .../constant/air/turbulenceProperties | 30 --- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- .../constant/tube/momentumTransport | 1 + .../constant/tube/turbulenceProperties | 1 - .../rotor2D/constant/momentumTransport | 30 +++ .../rotor2D/constant/turbulenceProperties | 30 --- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 0 ...turbulenceProperties => momentumTransport} | 2 +- .../constant/momentumTransport} | 2 +- .../constant/momentumTransport | 30 +++ .../constant/turbulenceProperties | 30 --- .../constant/momentumTransport | 30 +++ .../constant/turbulenceProperties | 30 --- ...turbulenceProperties => momentumTransport} | 2 +- .../RAS/TJunction/constant/momentumTransport | 30 +++ .../TJunction/constant/turbulenceProperties | 30 --- .../TJunctionFan/constant/momentumTransport | 30 +++ .../constant/turbulenceProperties | 30 --- ...turbulenceProperties => momentumTransport} | 2 +- .../RAS/impeller/constant/momentumTransport | 30 +++ .../impeller/constant/turbulenceProperties | 30 --- .../constant/momentumTransport | 30 +++ .../constant/turbulenceProperties | 30 --- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- .../RAS/propeller/constant/momentumTransport | 30 +++ .../propeller/constant/turbulenceProperties | 30 --- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- .../constant/momentumTransport} | 2 +- .../constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../movingCone/constant/momentumTransport | 21 ++ .../movingCone/constant/turbulenceProperties | 21 -- ...turbulenceProperties => momentumTransport} | 2 +- .../constant/momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- .../validation/WatersKing/createFields.H | 6 +- .../pisoFoam/LES/motorBike/lesFiles/Allrun | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 0 ...turbulenceProperties => momentumTransport} | 2 +- .../constant/momentumTransport} | 3 +- .../constant/momentumTransport} | 2 +- .../constant/momentumTransport} | 2 +- .../porousBlockage/constant/momentumTransport | 20 ++ .../constant/turbulenceProperties | 20 -- .../constant/momentumTransport | 30 +++ .../constant/turbulenceProperties | 30 --- .../constant/momentumTransport | 30 +++ .../constant/turbulenceProperties | 30 --- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- .../constant/momentumTransport | 30 +++ .../constant/turbulenceProperties | 30 --- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 0 .../constant/momentumTransport.air | 0 .../constant/momentumTransport.air | 0 .../column/constant/momentumTransport.air} | 0 ...ceProperties.air => momentumTransport.air} | 0 .../constant/momentumTransport.air} | 0 ...turbulenceProperties => momentumTransport} | 2 +- .../hopperEmptying/constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- ...turbulenceProperties => momentumTransport} | 2 +- .../cylinder/constant/momentumTransport | 21 ++ .../cylinder/constant/turbulenceProperties | 21 -- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- .../rivuletPanel/constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../splashPanel/constant/momentumTransport | 21 ++ .../splashPanel/constant/turbulenceProperties | 21 -- .../constant/momentumTransport} | 2 +- .../constant/momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- .../laminar/climbingRod/README | 6 +- ...turbulenceProperties => momentumTransport} | 2 +- .../constant/momentumTransport.air} | 0 ...erties.liquid => momentumTransport.liquid} | 0 .../constant/turbulenceProperties.air | 21 -- .../depthCharge2D/constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../depthCharge3D/constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../sloshingTank2D/constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../damBreak4phase/constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- ...turbulenceProperties => momentumTransport} | 2 +- .../RAS/DTCHull/constant/momentumTransport} | 2 +- .../DTCHullMoving/constant/momentumTransport | 30 +++ .../constant/turbulenceProperties | 30 --- .../DTCHullWave/constant/momentumTransport | 30 +++ .../DTCHullWave/constant/turbulenceProperties | 30 --- .../RAS/angledDuct/constant/momentumTransport | 30 +++ .../angledDuct/constant/turbulenceProperties | 30 --- .../damBreak/constant/momentumTransport | 30 +++ .../damBreak/constant/turbulenceProperties | 30 --- .../constant/momentumTransport | 30 +++ .../constant/turbulenceProperties | 30 --- .../floatingObject/constant/momentumTransport | 30 +++ .../constant/turbulenceProperties | 30 --- ...turbulenceProperties => momentumTransport} | 2 +- .../waterChannel/constant/momentumTransport | 30 +++ .../constant/turbulenceProperties | 30 --- .../weirOverflow/constant/momentumTransport | 30 +++ .../constant/turbulenceProperties | 30 --- .../capillaryRise/constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../damBreak/constant/momentumTransport | 21 ++ .../damBreak/constant/turbulenceProperties | 21 -- .../constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../mixerVessel2D/constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../sloshingTank2D/constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../sloshingTank3D/constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../testTubeMixer/constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../laminar/wave/constant/momentumTransport | 21 ++ .../wave/constant/turbulenceProperties | 21 -- .../damBreak/constant/momentumTransport | 21 ++ .../damBreak/constant/turbulenceProperties | 21 -- ...turbulenceProperties => momentumTransport} | 2 +- .../propeller/constant/momentumTransport | 30 +++ .../propeller/constant/turbulenceProperties | 30 --- .../bubbleColumn/constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../damBreak4phase/constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../mixerVessel2D/constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../damBreak4phase/constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../mixerVessel2D/constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- .../oscillatingBox/constant/momentumTransport | 21 ++ .../constant/turbulenceProperties | 21 -- ...ceProperties.air => momentumTransport.air} | 0 ....particles => momentumTransport.particles} | 0 ...ceProperties.gas => momentumTransport.gas} | 0 ...Properties.gas2 => momentumTransport.gas2} | 0 ...erties.liquid => momentumTransport.liquid} | 0 .../bed/constant/momentumTransport.air} | 0 .../bed/constant/momentumTransport.water | 0 .../constant/momentumTransport.air} | 0 .../constant/momentumTransport.water | 0 .../constant/momentumTransport.air1 | 0 .../constant/momentumTransport.air2 | 0 .../constant/momentumTransport.water | 0 .../constant/turbulenceProperties.air1 | 20 -- .../constant/turbulenceProperties.air2 | 20 -- .../constant/momentumTransport.air1 | 0 .../constant/momentumTransport.air2 | 0 .../constant/momentumTransport.water | 0 .../constant/turbulenceProperties.air1 | 20 -- .../constant/turbulenceProperties.air2 | 20 -- .../damBreak4phase/constant/momentumTransport | 21 ++ .../constant/momentumTransport.air} | 0 ...ties.mercury => momentumTransport.mercury} | 0 ...ceProperties.oil => momentumTransport.oil} | 0 .../constant/momentumTransport.water | 0 .../constant/turbulenceProperties | 21 -- .../constant/momentumTransport.air} | 0 ...ties.mercury => momentumTransport.mercury} | 0 ...ceProperties.oil => momentumTransport.oil} | 0 .../constant/momentumTransport.water | 0 .../constant/momentumTransport.air} | 0 .../constant/momentumTransport.water | 0 ...ceProperties.air => momentumTransport.air} | 0 ...operties.water => momentumTransport.water} | 0 ...ceProperties.gas => momentumTransport.gas} | 0 ...erties.solids => momentumTransport.solids} | 0 ...ceProperties.air => momentumTransport.air} | 0 ...operties.water => momentumTransport.water} | 0 ...ceProperties.gas => momentumTransport.gas} | 0 .../constant/momentumTransport.liquid | 0 ...ceProperties.air => momentumTransport.air} | 0 ...operties.water => momentumTransport.water} | 0 ...ceProperties.gas => momentumTransport.gas} | 0 ...erties.liquid => momentumTransport.liquid} | 0 ...ceProperties.air => momentumTransport.air} | 0 ....particles => momentumTransport.particles} | 0 ...ceProperties.gas => momentumTransport.gas} | 0 ...erties.liquid => momentumTransport.liquid} | 0 ...ceProperties.gas => momentumTransport.gas} | 0 ...erties.liquid => momentumTransport.liquid} | 0 ...ceProperties.gas => momentumTransport.gas} | 0 ...erties.liquid => momentumTransport.liquid} | 0 .../constant/momentumTransport.air} | 0 .../constant/momentumTransport.water} | 0 .../constant/momentumTransport.gas | 0 .../constant/momentumTransport.liquid | 0 .../constant/turbulenceProperties.gas | 20 -- .../constant/turbulenceProperties.liquid | 20 -- .../constant/momentumTransport.gas | 0 .../constant/momentumTransport.liquid} | 0 .../constant/turbulenceProperties.gas | 20 -- .../constant/turbulenceProperties.liquid | 20 -- .../constant/momentumTransport.air} | 0 .../constant/momentumTransport.water} | 0 .../constant/turbulenceProperties.water | 20 -- .../constant/momentumTransport.air} | 0 ....particles => momentumTransport.particles} | 0 .../constant/momentumTransport.air} | 0 .../constant/momentumTransport.water} | 0 .../constant/turbulenceProperties.water | 20 -- .../constant/momentumTransport.air} | 0 .../constant/momentumTransport.water} | 0 .../constant/turbulenceProperties.water | 20 -- .../constant/momentumTransport.steam | 0 ...operties.water => momentumTransport.water} | 0 .../constant/turbulenceProperties.steam | 20 -- ....particles => momentumTransport.particles} | 0 ...operties.vapor => momentumTransport.vapor} | 0 ....particles => momentumTransport.particles} | 0 ...operties.vapor => momentumTransport.vapor} | 0 ...turbulenceProperties => momentumTransport} | 2 +- ...ceProperties.air => momentumTransport.air} | 0 ...operties.water => momentumTransport.water} | 0 ...ceProperties.air => momentumTransport.air} | 0 ...operties.water => momentumTransport.water} | 0 ...ceProperties.air => momentumTransport.air} | 0 ....particles => momentumTransport.particles} | 0 .../constant/momentumTransport.air} | 0 .../constant/momentumTransport.water} | 0 .../constant/turbulenceProperties.water | 20 -- .../constant/momentumTransport.air} | 0 .../constant/momentumTransport.water} | 0 .../constant/turbulenceProperties.water | 20 -- .../constant/momentumTransport.air} | 0 ....particles => momentumTransport.particles} | 0 .../constant/momentumTransport.air} | 0 .../constant/momentumTransport.water} | 0 .../constant/turbulenceProperties.air | 20 -- .../constant/turbulenceProperties.water | 20 -- .../constant/momentumTransport.air} | 0 .../constant/momentumTransport.water} | 0 .../constant/turbulenceProperties.air | 20 -- .../constant/turbulenceProperties.water | 20 -- 472 files changed, 2788 insertions(+), 3219 deletions(-) rename etc/templates/axisymmetricJet/constant/{turbulenceProperties => momentumTransport} (96%) rename etc/templates/closedVolume/constant/{turbulenceProperties => momentumTransport} (96%) rename etc/templates/{inflowOutflow/constant/turbulenceProperties => closedVolumeRotating/constant/momentumTransport} (96%) rename etc/templates/compressibleInflowOutflow/constant/{turbulenceProperties => momentumTransport} (96%) rename etc/templates/{closedVolumeRotating/constant/turbulenceProperties => inflowOutflow/constant/momentumTransport} (96%) rename etc/templates/inflowOutflowRotating/constant/{turbulenceProperties => momentumTransport} (96%) create mode 100644 etc/templates/singleFluidCHT/templates/materials/air/momentumTransport delete mode 100644 etc/templates/singleFluidCHT/templates/materials/air/turbulenceProperties create mode 100644 etc/templates/singleFluidCHT/templates/materials/water/momentumTransport delete mode 100644 etc/templates/singleFluidCHT/templates/materials/water/turbulenceProperties delete mode 100644 src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C delete mode 100644 src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H create mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/momentumTransport.air1 create mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/momentumTransport.air2 create mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/momentumTransport.air3 create mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/momentumTransport.water create mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/momentumTransport.air1 create mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/momentumTransport.air2 create mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/momentumTransport.air3 create mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/momentumTransport.water delete mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/turbulenceProperties.air3 create mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/momentumTransport.air1 create mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/momentumTransport.air2 create mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/momentumTransport.air3 create mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/momentumTransport.water delete mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/turbulenceProperties.air1 delete mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/turbulenceProperties.air2 delete mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/turbulenceProperties.air3 create mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/momentumTransport.air1 create mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/momentumTransport.air2 create mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/momentumTransport.air3 create mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/momentumTransport.water delete mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/turbulenceProperties.air1 delete mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/turbulenceProperties.air2 delete mode 100644 test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/turbulenceProperties.air3 create mode 100644 test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/momentumTransport.gas create mode 100644 test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/momentumTransport.liquid create mode 100644 test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterEvaporation/constant/momentumTransport.gas create mode 100644 test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterEvaporation/constant/momentumTransport.liquid create mode 100644 test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/drift/constant/momentumTransport.air create mode 100644 test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/drift/constant/momentumTransport.water create mode 100644 test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/negativeDrift/constant/momentumTransport.air create mode 100644 test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/negativeDrift/constant/momentumTransport.water create mode 100644 test/multiphase/reactingTwoPhaseEulerFoam/thermal/waterEvaporation/constant/momentumTransport.steam create mode 100644 test/multiphase/reactingTwoPhaseEulerFoam/thermal/waterEvaporation/constant/momentumTransport.water rename tutorials/DNS/dnsFoam/boxTurb16/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/{combustion/reactingFoam/laminar/counterFlowFlame2D/constant/turbulenceProperties => IO/fileHandler/constant/momentumTransport} (94%) rename tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/{turbulenceProperties => momentumTransport} (96%) rename tutorials/combustion/XiEngineFoam/kivaTest/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/{compressible/rhoPimpleFoam/RAS/nacaAirfoil/constant/turbulenceProperties => combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/momentumTransport} (95%) rename tutorials/{incompressible/pisoFoam/RAS/cavity/constant/turbulenceProperties => combustion/coldEngineFoam/freePiston/constant/momentumTransport} (95%) rename tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/{turbulenceProperties => momentumTransport} (97%) rename tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/{turbulenceProperties => momentumTransport} (98%) rename tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/combustion/reactingFoam/RAS/membrane/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/combustion/reactingFoam/laminar/{counterFlowFlame2DLTS/constant/turbulenceProperties => counterFlowFlame2D/constant/momentumTransport} (94%) rename tutorials/combustion/reactingFoam/laminar/{counterFlowFlame2DLTS_GRI_TDAC/constant/turbulenceProperties => counterFlowFlame2DLTS/constant/momentumTransport} (94%) rename tutorials/combustion/reactingFoam/laminar/{counterFlowFlame2D_GRI/constant/turbulenceProperties => counterFlowFlame2DLTS_GRI_TDAC/constant/momentumTransport} (94%) create mode 100644 tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/momentumTransport create mode 100644 tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/momentumTransport delete mode 100644 tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/turbulenceProperties create mode 100644 tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/momentumTransport delete mode 100644 tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/turbulenceProperties create mode 100644 tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/momentumTransport delete mode 100644 tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/turbulenceProperties create mode 100644 tutorials/compressible/rhoCentralFoam/forwardStep/constant/momentumTransport delete mode 100644 tutorials/compressible/rhoCentralFoam/forwardStep/constant/turbulenceProperties create mode 100644 tutorials/compressible/rhoCentralFoam/movingCone/constant/momentumTransport delete mode 100644 tutorials/compressible/rhoCentralFoam/movingCone/constant/turbulenceProperties create mode 100644 tutorials/compressible/rhoCentralFoam/obliqueShock/constant/momentumTransport delete mode 100644 tutorials/compressible/rhoCentralFoam/obliqueShock/constant/turbulenceProperties create mode 100644 tutorials/compressible/rhoCentralFoam/shockTube/constant/momentumTransport delete mode 100644 tutorials/compressible/rhoCentralFoam/shockTube/constant/turbulenceProperties create mode 100644 tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/momentumTransport delete mode 100644 tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/turbulenceProperties rename tutorials/{incompressible/pisoFoam/LES/pitzDailyMapped/constant/turbulenceProperties => compressible/rhoPimpleFoam/LES/pitzDaily/constant/momentumTransport} (97%) rename tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/compressible/rhoPimpleFoam/RAS/{angledDuctLTS/constant/turbulenceProperties => angledDuct/constant/momentumTransport} (95%) rename tutorials/compressible/rhoPimpleFoam/RAS/{annularThermalMixer/constant/turbulenceProperties => angledDuctLTS/constant/momentumTransport} (95%) rename tutorials/compressible/rhoPimpleFoam/RAS/{angledDuct/constant/turbulenceProperties => annularThermalMixer/constant/momentumTransport} (95%) rename tutorials/{multiphase/interFoam/RAS/DTCHull/constant/turbulenceProperties => compressible/rhoPimpleFoam/RAS/cavity/constant/momentumTransport} (95%) rename tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/{combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/turbulenceProperties => compressible/rhoPimpleFoam/RAS/nacaAirfoil/constant/momentumTransport} (95%) create mode 100644 tutorials/compressible/rhoPimpleFoam/RAS/prism/constant/momentumTransport delete mode 100644 tutorials/compressible/rhoPimpleFoam/RAS/prism/constant/turbulenceProperties create mode 100644 tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/constant/momentumTransport delete mode 100644 tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/constant/turbulenceProperties rename tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/constant/{turbulenceProperties => momentumTransport} (94%) rename test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/turbulenceProperties.air3 => tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/constant/thermophysicalTransport (90%) rename tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/constant/{turbulenceProperties => momentumTransport} (94%) create mode 100644 tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/constant/momentumTransport delete mode 100644 tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/constant/turbulenceProperties create mode 100644 tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/momentumTransport delete mode 100644 tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/turbulenceProperties create mode 100644 tutorials/compressible/rhoPimpleFoam/laminar/shockTube/constant/momentumTransport delete mode 100644 tutorials/compressible/rhoPimpleFoam/laminar/shockTube/constant/turbulenceProperties rename tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/{turbulenceProperties => momentumTransport} (95%) create mode 100644 tutorials/compressible/rhoSimpleFoam/squareBend/constant/momentumTransport delete mode 100644 tutorials/compressible/rhoSimpleFoam/squareBend/constant/turbulenceProperties create mode 100644 tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/momentumTransport delete mode 100644 tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/turbulenceProperties rename tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/{turbulenceProperties => momentumTransport} (95%) create mode 100644 tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/momentumTransport delete mode 100644 tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/turbulenceProperties create mode 100644 tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/momentumTransport delete mode 100644 tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/turbulenceProperties rename tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/{turbulenceProperties => momentumTransport} (100%) rename tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/{turbulenceProperties => momentumTransport} (100%) rename tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/{turbulenceProperties => momentumTransport} (100%) rename tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/{turbulenceProperties => momentumTransport} (100%) rename tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/{turbulenceProperties => momentumTransport} (100%) rename tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/constant/{turbulenceProperties => momentumTransport} (95%) create mode 100644 tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/momentumTransport delete mode 100644 tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/turbulenceProperties rename tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/constant/{turbulenceProperties => momentumTransport} (96%) rename tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/materials/{water/turbulenceProperties => air/momentumTransport} (96%) rename tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/materials/{air/turbulenceProperties => water/momentumTransport} (96%) create mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/momentumTransport delete mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/turbulenceProperties rename tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/porous/{turbulenceProperties => momentumTransport} (94%) rename tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/constant/fluid/{turbulenceProperties => momentumTransport} (94%) rename tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/{turbulenceProperties => momentumTransport} (95%) rename tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/shell/{turbulenceProperties => momentumTransport} (95%) create mode 120000 tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/tube/momentumTransport delete mode 120000 tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/tube/turbulenceProperties create mode 100644 tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/momentumTransport delete mode 100644 tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/turbulenceProperties rename tutorials/incompressible/SRFSimpleFoam/mixer/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/{turbulenceProperties => momentumTransport} (100%) rename tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/incompressible/{pimpleFoam/laminar/pitzDailyPulse/constant/turbulenceProperties => boundaryFoam/boundaryNonNewtonian/constant/momentumTransport} (94%) create mode 100644 tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/momentumTransport delete mode 100644 tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties create mode 100644 tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/momentumTransport delete mode 100644 tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/turbulenceProperties rename tutorials/incompressible/pimpleFoam/LES/channel395/constant/{turbulenceProperties => momentumTransport} (97%) create mode 100644 tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/momentumTransport delete mode 100644 tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/turbulenceProperties create mode 100644 tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/momentumTransport delete mode 100644 tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/turbulenceProperties rename tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/constant/{turbulenceProperties => momentumTransport} (95%) create mode 100644 tutorials/incompressible/pimpleFoam/RAS/impeller/constant/momentumTransport delete mode 100644 tutorials/incompressible/pimpleFoam/RAS/impeller/constant/turbulenceProperties create mode 100644 tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/momentumTransport delete mode 100644 tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/turbulenceProperties rename tutorials/incompressible/pimpleFoam/RAS/pitzDaily/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/incompressible/pimpleFoam/RAS/pitzDailyLTS/constant/{turbulenceProperties => momentumTransport} (95%) create mode 100644 tutorials/incompressible/pimpleFoam/RAS/propeller/constant/momentumTransport delete mode 100644 tutorials/incompressible/pimpleFoam/RAS/propeller/constant/turbulenceProperties rename tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/incompressible/{boundaryFoam/boundaryNonNewtonian/constant/turbulenceProperties => pimpleFoam/laminar/blockedChannel/constant/momentumTransport} (94%) create mode 100644 tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/momentumTransport delete mode 100644 tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/turbulenceProperties create mode 100644 tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/momentumTransport delete mode 100644 tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/turbulenceProperties rename tutorials/incompressible/pimpleFoam/laminar/offsetCylinder/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/incompressible/pimpleFoam/laminar/{blockedChannel/constant/turbulenceProperties => pitzDailyPulse/constant/momentumTransport} (94%) rename tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/{turbulenceProperties => momentumTransport} (98%) rename tutorials/incompressible/pimpleFoam/laminar/planarCouette/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/{turbulenceProperties => momentumTransport} (98%) rename tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/{turbulenceProperties => momentumTransport} (100%) rename tutorials/incompressible/pisoFoam/LES/pitzDaily/constant/{turbulenceProperties => momentumTransport} (98%) rename tutorials/{compressible/rhoPimpleFoam/LES/pitzDaily/constant/turbulenceProperties => incompressible/pisoFoam/LES/pitzDailyMapped/constant/momentumTransport} (97%) rename tutorials/incompressible/pisoFoam/RAS/{cavityCoupledU/constant/turbulenceProperties => cavity/constant/momentumTransport} (95%) rename tutorials/{combustion/coldEngineFoam/freePiston/constant/turbulenceProperties => incompressible/pisoFoam/RAS/cavityCoupledU/constant/momentumTransport} (95%) create mode 100644 tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/momentumTransport delete mode 100644 tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/turbulenceProperties create mode 100644 tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/momentumTransport delete mode 100644 tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties create mode 100644 tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/momentumTransport delete mode 100644 tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/turbulenceProperties rename tutorials/incompressible/simpleFoam/T3A/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/incompressible/simpleFoam/airFoil2D/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/incompressible/simpleFoam/mixerVessel2D/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/incompressible/simpleFoam/motorBike/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/incompressible/simpleFoam/pipeCyclic/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/incompressible/simpleFoam/pitzDaily/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/{turbulenceProperties => momentumTransport} (95%) create mode 100644 tutorials/incompressible/simpleFoam/roomResidenceTime/constant/momentumTransport delete mode 100644 tutorials/incompressible/simpleFoam/roomResidenceTime/constant/turbulenceProperties rename tutorials/incompressible/simpleFoam/rotorDisk/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/incompressible/simpleFoam/turbineSiting/constant/{turbulenceProperties => momentumTransport} (96%) rename tutorials/incompressible/simpleFoam/windAroundBuildings/constant/{turbulenceProperties => momentumTransport} (100%) rename test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/drift/constant/turbulenceProperties.air => tutorials/lagrangian/DPMFoam/Goldschmidt/constant/momentumTransport.air (100%) rename test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/negativeDrift/constant/turbulenceProperties.air => tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/momentumTransport.air (100%) rename tutorials/lagrangian/{DPMFoam/Goldschmidt/constant/turbulenceProperties.air => MPPICFoam/column/constant/momentumTransport.air} (100%) rename tutorials/lagrangian/MPPICFoam/cyclone/constant/{turbulenceProperties.air => momentumTransport.air} (100%) rename tutorials/lagrangian/MPPICFoam/{Goldschmidt/constant/turbulenceProperties.air => injectionChannel/constant/momentumTransport.air} (100%) rename tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/{turbulenceProperties => momentumTransport} (95%) create mode 100644 tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/momentumTransport delete mode 100644 tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties create mode 100644 tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/momentumTransport delete mode 100644 tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties create mode 100644 tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/momentumTransport delete mode 100644 tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/turbulenceProperties rename tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/{turbulenceProperties => momentumTransport} (94%) create mode 100644 tutorials/lagrangian/reactingParcelFoam/cylinder/constant/momentumTransport delete mode 100644 tutorials/lagrangian/reactingParcelFoam/cylinder/constant/turbulenceProperties rename tutorials/lagrangian/reactingParcelFoam/filter/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/{turbulenceProperties => momentumTransport} (94%) create mode 100644 tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/momentumTransport delete mode 100644 tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/turbulenceProperties create mode 100644 tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/momentumTransport delete mode 100644 tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/turbulenceProperties rename tutorials/lagrangian/reactingParcelFoam/{verticalChannelLTS/constant/turbulenceProperties => verticalChannel/constant/momentumTransport} (95%) rename tutorials/lagrangian/reactingParcelFoam/{verticalChannel/constant/turbulenceProperties => verticalChannelLTS/constant/momentumTransport} (95%) rename tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/lagrangian/sprayFoam/aachenBomb/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/multiphase/cavitatingFoam/LES/throttle/constant/{turbulenceProperties => momentumTransport} (97%) rename tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/{turbulenceProperties => momentumTransport} (97%) rename tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/{turbulenceProperties => momentumTransport} (94%) rename tutorials/{IO/fileHandler/constant/turbulenceProperties => multiphase/compressibleInterFoam/laminar/climbingRod/constant/momentumTransport.air} (100%) rename tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/{turbulenceProperties.liquid => momentumTransport.liquid} (100%) delete mode 100644 tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.air create mode 100644 tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/momentumTransport delete mode 100644 tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/turbulenceProperties create mode 100644 tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/momentumTransport delete mode 100644 tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/turbulenceProperties create mode 100644 tutorials/multiphase/compressibleInterFoam/laminar/sloshingTank2D/constant/momentumTransport delete mode 100644 tutorials/multiphase/compressibleInterFoam/laminar/sloshingTank2D/constant/turbulenceProperties create mode 100644 tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/momentumTransport delete mode 100644 tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties rename tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/{turbulenceProperties => momentumTransport} (95%) rename tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/{turbulenceProperties => momentumTransport} (97%) rename tutorials/{compressible/rhoPimpleFoam/RAS/cavity/constant/turbulenceProperties => multiphase/interFoam/RAS/DTCHull/constant/momentumTransport} (95%) create mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/momentumTransport delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/turbulenceProperties create mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullWave/constant/momentumTransport delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullWave/constant/turbulenceProperties create mode 100644 tutorials/multiphase/interFoam/RAS/angledDuct/constant/momentumTransport delete mode 100644 tutorials/multiphase/interFoam/RAS/angledDuct/constant/turbulenceProperties create mode 100644 tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/momentumTransport delete mode 100644 tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/turbulenceProperties create mode 100644 tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/momentumTransport delete mode 100644 tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/turbulenceProperties create mode 100644 tutorials/multiphase/interFoam/RAS/floatingObject/constant/momentumTransport delete mode 100644 tutorials/multiphase/interFoam/RAS/floatingObject/constant/turbulenceProperties rename tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/{turbulenceProperties => momentumTransport} (95%) create mode 100644 tutorials/multiphase/interFoam/RAS/waterChannel/constant/momentumTransport delete mode 100644 tutorials/multiphase/interFoam/RAS/waterChannel/constant/turbulenceProperties create mode 100644 tutorials/multiphase/interFoam/RAS/weirOverflow/constant/momentumTransport delete mode 100644 tutorials/multiphase/interFoam/RAS/weirOverflow/constant/turbulenceProperties create mode 100644 tutorials/multiphase/interFoam/laminar/capillaryRise/constant/momentumTransport delete mode 100644 tutorials/multiphase/interFoam/laminar/capillaryRise/constant/turbulenceProperties create mode 100644 tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/momentumTransport delete mode 100644 tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/turbulenceProperties create mode 100644 tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/momentumTransport delete mode 100644 tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/turbulenceProperties create mode 100644 tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/momentumTransport delete mode 100644 tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/turbulenceProperties create mode 100644 tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/momentumTransport delete mode 100644 tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/turbulenceProperties create mode 100644 tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/momentumTransport delete mode 100644 tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/turbulenceProperties create mode 100644 tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/momentumTransport delete mode 100644 tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/turbulenceProperties create mode 100644 tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/momentumTransport delete mode 100644 tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/turbulenceProperties create mode 100644 tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/momentumTransport delete mode 100644 tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/turbulenceProperties create mode 100644 tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/momentumTransport delete mode 100644 tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/turbulenceProperties create mode 100644 tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/momentumTransport delete mode 100644 tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/turbulenceProperties create mode 100644 tutorials/multiphase/interFoam/laminar/wave/constant/momentumTransport delete mode 100644 tutorials/multiphase/interFoam/laminar/wave/constant/turbulenceProperties create mode 100644 tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/momentumTransport delete mode 100644 tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/turbulenceProperties rename tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/{turbulenceProperties => momentumTransport} (94%) create mode 100644 tutorials/multiphase/interPhaseChangeFoam/propeller/constant/momentumTransport delete mode 100644 tutorials/multiphase/interPhaseChangeFoam/propeller/constant/turbulenceProperties create mode 100644 tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/momentumTransport delete mode 100644 tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties create mode 100644 tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/momentumTransport delete mode 100644 tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/turbulenceProperties create mode 100644 tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/momentumTransport delete mode 100644 tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/turbulenceProperties create mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/momentumTransport delete mode 100644 tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties create mode 100644 tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/momentumTransport delete mode 100644 tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties create mode 100644 tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/momentumTransport delete mode 100644 tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties create mode 100644 tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/momentumTransport delete mode 100644 tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties create mode 100644 tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/constant/momentumTransport delete mode 100644 tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/constant/turbulenceProperties create mode 100644 tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/momentumTransport delete mode 100644 tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/turbulenceProperties rename tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/fluidisedBed/constant/{turbulenceProperties.air => momentumTransport.air} (100%) rename tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/fluidisedBed/constant/{turbulenceProperties.particles => momentumTransport.particles} (100%) rename tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/{turbulenceProperties.gas => momentumTransport.gas} (100%) rename tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/{turbulenceProperties.gas2 => momentumTransport.gas2} (100%) rename tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/{turbulenceProperties.liquid => momentumTransport.liquid} (100%) rename tutorials/{lagrangian/MPPICFoam/column/constant/turbulenceProperties.air => multiphase/reactingMultiphaseEulerFoam/laminar/bed/constant/momentumTransport.air} (100%) rename test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/turbulenceProperties.water => tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bed/constant/momentumTransport.water (100%) rename tutorials/{lagrangian/MPPICFoam/injectionChannel/constant/turbulenceProperties.air => multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/momentumTransport.air} (100%) rename test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/turbulenceProperties.water => tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/momentumTransport.water (100%) rename test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/turbulenceProperties.air1 => tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/momentumTransport.air1 (100%) rename test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/turbulenceProperties.air2 => tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/momentumTransport.air2 (100%) rename test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/turbulenceProperties.water => tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/momentumTransport.water (100%) delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/turbulenceProperties.air1 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/turbulenceProperties.air2 rename test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/turbulenceProperties.air1 => tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/momentumTransport.air1 (100%) rename test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/turbulenceProperties.air2 => tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/momentumTransport.air2 (100%) rename test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/turbulenceProperties.water => tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/momentumTransport.water (100%) delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/turbulenceProperties.air1 delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/turbulenceProperties.air2 create mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/momentumTransport rename tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/{bed/constant/turbulenceProperties.air => damBreak4phase/constant/momentumTransport.air} (100%) rename tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/{turbulenceProperties.mercury => momentumTransport.mercury} (100%) rename tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/{turbulenceProperties.oil => momentumTransport.oil} (100%) rename test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/drift/constant/turbulenceProperties.water => tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/momentumTransport.water (100%) delete mode 100644 tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/turbulenceProperties rename tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/{bubbleColumn/constant/turbulenceProperties.air => mixerVessel2D/constant/momentumTransport.air} (100%) rename tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/{turbulenceProperties.mercury => momentumTransport.mercury} (100%) rename tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/{turbulenceProperties.oil => momentumTransport.oil} (100%) rename test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/negativeDrift/constant/turbulenceProperties.water => tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/momentumTransport.water (100%) rename tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/{damBreak4phase/constant/turbulenceProperties.air => trickleBed/constant/momentumTransport.air} (100%) rename test/multiphase/reactingTwoPhaseEulerFoam/thermal/waterEvaporation/constant/turbulenceProperties.water => tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/constant/momentumTransport.water (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/{turbulenceProperties.air => momentumTransport.air} (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/{turbulenceProperties.water => momentumTransport.water} (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/{turbulenceProperties.gas => momentumTransport.gas} (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/{turbulenceProperties.solids => momentumTransport.solids} (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/{turbulenceProperties.air => momentumTransport.air} (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/{turbulenceProperties.water => momentumTransport.water} (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/{turbulenceProperties.gas => momentumTransport.gas} (100%) rename test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/turbulenceProperties.liquid => tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/momentumTransport.liquid (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/{turbulenceProperties.air => momentumTransport.air} (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/{turbulenceProperties.water => momentumTransport.water} (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubblePipe/constant/{turbulenceProperties.gas => momentumTransport.gas} (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubblePipe/constant/{turbulenceProperties.liquid => momentumTransport.liquid} (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/{turbulenceProperties.air => momentumTransport.air} (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/{turbulenceProperties.particles => momentumTransport.particles} (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/{turbulenceProperties.gas => momentumTransport.gas} (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/{turbulenceProperties.liquid => momentumTransport.liquid} (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/{turbulenceProperties.gas => momentumTransport.gas} (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/{turbulenceProperties.liquid => momentumTransport.liquid} (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/{turbulenceProperties.gas => momentumTransport.gas} (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/{turbulenceProperties.liquid => momentumTransport.liquid} (100%) rename tutorials/multiphase/{reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air => reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/momentumTransport.air} (100%) rename tutorials/multiphase/{reactingMultiphaseEulerFoam/laminar/bed/constant/turbulenceProperties.water => reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/momentumTransport.water} (100%) rename test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/turbulenceProperties.gas => tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/momentumTransport.gas (100%) rename test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterEvaporation/constant/turbulenceProperties.liquid => tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/momentumTransport.liquid (100%) delete mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.gas delete mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.liquid rename test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterEvaporation/constant/turbulenceProperties.gas => tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/momentumTransport.gas (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/{RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.liquid => laminar/bubbleColumnEvaporatingDissolving/constant/momentumTransport.liquid} (100%) delete mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.gas delete mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.liquid rename tutorials/multiphase/{reactingMultiphaseEulerFoam/laminar/trickleBed/constant/turbulenceProperties.air => reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/momentumTransport.air} (100%) rename tutorials/multiphase/{reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water => reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/momentumTransport.water} (100%) delete mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water rename tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/{bubbleColumn/constant/turbulenceProperties.air => fluidisedBed/constant/momentumTransport.air} (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/{turbulenceProperties.particles => momentumTransport.particles} (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/{bubbleColumnIATE/constant/turbulenceProperties.air => injection/constant/momentumTransport.air} (100%) rename tutorials/multiphase/{reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/turbulenceProperties.water => reactingTwoPhaseEulerFoam/laminar/injection/constant/momentumTransport.water} (100%) delete mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water rename tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/{fluidisedBed/constant/turbulenceProperties.air => mixerVessel2D/constant/momentumTransport.air} (100%) rename tutorials/multiphase/{reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/turbulenceProperties.water => reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/momentumTransport.water} (100%) delete mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water rename test/multiphase/reactingTwoPhaseEulerFoam/thermal/waterEvaporation/constant/turbulenceProperties.steam => tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/momentumTransport.steam (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/{turbulenceProperties.water => momentumTransport.water} (100%) delete mode 100644 tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam rename tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesis/constant/{turbulenceProperties.particles => momentumTransport.particles} (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesis/constant/{turbulenceProperties.vapor => momentumTransport.vapor} (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesisSurface/constant/{turbulenceProperties.particles => momentumTransport.particles} (100%) rename tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesisSurface/constant/{turbulenceProperties.vapor => momentumTransport.vapor} (100%) rename tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/{turbulenceProperties => momentumTransport} (94%) rename tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/{turbulenceProperties.air => momentumTransport.air} (100%) rename tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/{turbulenceProperties.water => momentumTransport.water} (100%) rename tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/{turbulenceProperties.air => momentumTransport.air} (100%) rename tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/{turbulenceProperties.water => momentumTransport.water} (100%) rename tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/{turbulenceProperties.air => momentumTransport.air} (100%) rename tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/{turbulenceProperties.particles => momentumTransport.particles} (100%) rename tutorials/multiphase/{reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air => twoPhaseEulerFoam/laminar/bubbleColumn/constant/momentumTransport.air} (100%) rename tutorials/multiphase/{reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/turbulenceProperties.water => twoPhaseEulerFoam/laminar/bubbleColumn/constant/momentumTransport.water} (100%) delete mode 100644 tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water rename tutorials/multiphase/{reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air => twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/momentumTransport.air} (100%) rename tutorials/multiphase/{reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water => twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/momentumTransport.water} (100%) delete mode 100644 tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water rename tutorials/multiphase/twoPhaseEulerFoam/laminar/{bubbleColumn/constant/turbulenceProperties.air => fluidisedBed/constant/momentumTransport.air} (100%) rename tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/{turbulenceProperties.particles => momentumTransport.particles} (100%) rename tutorials/multiphase/twoPhaseEulerFoam/laminar/{bubbleColumnIATE/constant/turbulenceProperties.air => injection/constant/momentumTransport.air} (100%) rename tutorials/multiphase/{reactingMultiphaseEulerFoam/laminar/trickleBed/constant/turbulenceProperties.water => twoPhaseEulerFoam/laminar/injection/constant/momentumTransport.water} (100%) delete mode 100644 tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air delete mode 100644 tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water rename tutorials/multiphase/twoPhaseEulerFoam/laminar/{fluidisedBed/constant/turbulenceProperties.air => mixerVessel2D/constant/momentumTransport.air} (100%) rename tutorials/multiphase/{reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water => twoPhaseEulerFoam/laminar/mixerVessel2D/constant/momentumTransport.water} (100%) delete mode 100644 tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air delete mode 100644 tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water diff --git a/applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H b/applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H index 0d6b417d5a..d02b602731 100644 --- a/applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H +++ b/applications/solvers/DNS/dnsFoam/readTurbulenceProperties.H @@ -1,10 +1,10 @@ - Info<< "Reading turbulenceProperties\n" << endl; + Info<< "Reading momentumTransport\n" << endl; - IOdictionary turbulenceProperties + IOdictionary momentumTransport ( IOobject ( - "turbulenceProperties", + "momentumTransport", runTime.constant(), mesh, IOobject::MUST_READ_IF_MODIFIED, @@ -18,4 +18,4 @@ ); Kmesh K(mesh); - UOprocess forceGen(K, runTime.deltaTValue(), turbulenceProperties); + UOprocess forceGen(K, runTime.deltaTValue(), momentumTransport); diff --git a/applications/utilities/preProcessing/foamSetupCHT/foamSetupCHT.C b/applications/utilities/preProcessing/foamSetupCHT/foamSetupCHT.C index 0e245dc5ce..a9568603a7 100644 --- a/applications/utilities/preProcessing/foamSetupCHT/foamSetupCHT.C +++ b/applications/utilities/preProcessing/foamSetupCHT/foamSetupCHT.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 @@ -52,7 +52,7 @@ Description + fluid: g + solid + materials - + air: radiationProperties, thermophysicalProperties, turbulenceProperties + + air: radiationProperties, thermophysicalProperties, momentumTransport + aluminium: radiationProperties, thermophysicalProperties + ... diff --git a/etc/templates/axisymmetricJet/constant/turbulenceProperties b/etc/templates/axisymmetricJet/constant/momentumTransport similarity index 96% rename from etc/templates/axisymmetricJet/constant/turbulenceProperties rename to etc/templates/axisymmetricJet/constant/momentumTransport index a1e11ee5ec..a135e7cf6f 100644 --- a/etc/templates/axisymmetricJet/constant/turbulenceProperties +++ b/etc/templates/axisymmetricJet/constant/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/etc/templates/closedVolume/constant/turbulenceProperties b/etc/templates/closedVolume/constant/momentumTransport similarity index 96% rename from etc/templates/closedVolume/constant/turbulenceProperties rename to etc/templates/closedVolume/constant/momentumTransport index fea7013f63..4ae597cf41 100644 --- a/etc/templates/closedVolume/constant/turbulenceProperties +++ b/etc/templates/closedVolume/constant/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/etc/templates/inflowOutflow/constant/turbulenceProperties b/etc/templates/closedVolumeRotating/constant/momentumTransport similarity index 96% rename from etc/templates/inflowOutflow/constant/turbulenceProperties rename to etc/templates/closedVolumeRotating/constant/momentumTransport index a1e11ee5ec..a135e7cf6f 100644 --- a/etc/templates/inflowOutflow/constant/turbulenceProperties +++ b/etc/templates/closedVolumeRotating/constant/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/etc/templates/compressibleInflowOutflow/constant/turbulenceProperties b/etc/templates/compressibleInflowOutflow/constant/momentumTransport similarity index 96% rename from etc/templates/compressibleInflowOutflow/constant/turbulenceProperties rename to etc/templates/compressibleInflowOutflow/constant/momentumTransport index fea7013f63..4ae597cf41 100644 --- a/etc/templates/compressibleInflowOutflow/constant/turbulenceProperties +++ b/etc/templates/compressibleInflowOutflow/constant/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/etc/templates/closedVolumeRotating/constant/turbulenceProperties b/etc/templates/inflowOutflow/constant/momentumTransport similarity index 96% rename from etc/templates/closedVolumeRotating/constant/turbulenceProperties rename to etc/templates/inflowOutflow/constant/momentumTransport index a1e11ee5ec..a135e7cf6f 100644 --- a/etc/templates/closedVolumeRotating/constant/turbulenceProperties +++ b/etc/templates/inflowOutflow/constant/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/etc/templates/inflowOutflowRotating/constant/turbulenceProperties b/etc/templates/inflowOutflowRotating/constant/momentumTransport similarity index 96% rename from etc/templates/inflowOutflowRotating/constant/turbulenceProperties rename to etc/templates/inflowOutflowRotating/constant/momentumTransport index a1e11ee5ec..a135e7cf6f 100644 --- a/etc/templates/inflowOutflowRotating/constant/turbulenceProperties +++ b/etc/templates/inflowOutflowRotating/constant/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/etc/templates/singleFluidCHT/templates/materials/air/momentumTransport b/etc/templates/singleFluidCHT/templates/materials/air/momentumTransport new file mode 100644 index 0000000000..a135e7cf6f --- /dev/null +++ b/etc/templates/singleFluidCHT/templates/materials/air/momentumTransport @@ -0,0 +1,51 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + RASModel kOmegaSST; + + turbulence on; + printCoeffs on; +} + +LES +{ + LESModel SpalartAllmarasDDES; + delta cubeRootVol; + + turbulence on; + printCoeffs on; + + cubeRootVolCoeffs + { + deltaCoeff 1; + } + + smoothCoeffs + { + delta cubeRootVol; + cubeRootVolCoeffs + { + deltaCoeff 1; + } + maxDeltaRatio 1.1; + } +} + +// ************************************************************************* // diff --git a/etc/templates/singleFluidCHT/templates/materials/air/turbulenceProperties b/etc/templates/singleFluidCHT/templates/materials/air/turbulenceProperties deleted file mode 100644 index a1e11ee5ec..0000000000 --- a/etc/templates/singleFluidCHT/templates/materials/air/turbulenceProperties +++ /dev/null @@ -1,51 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - RASModel kOmegaSST; - - turbulence on; - printCoeffs on; -} - -LES -{ - LESModel SpalartAllmarasDDES; - delta cubeRootVol; - - turbulence on; - printCoeffs on; - - cubeRootVolCoeffs - { - deltaCoeff 1; - } - - smoothCoeffs - { - delta cubeRootVol; - cubeRootVolCoeffs - { - deltaCoeff 1; - } - maxDeltaRatio 1.1; - } -} - -// ************************************************************************* // diff --git a/etc/templates/singleFluidCHT/templates/materials/water/momentumTransport b/etc/templates/singleFluidCHT/templates/materials/water/momentumTransport new file mode 100644 index 0000000000..a135e7cf6f --- /dev/null +++ b/etc/templates/singleFluidCHT/templates/materials/water/momentumTransport @@ -0,0 +1,51 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + RASModel kOmegaSST; + + turbulence on; + printCoeffs on; +} + +LES +{ + LESModel SpalartAllmarasDDES; + delta cubeRootVol; + + turbulence on; + printCoeffs on; + + cubeRootVolCoeffs + { + deltaCoeff 1; + } + + smoothCoeffs + { + delta cubeRootVol; + cubeRootVolCoeffs + { + deltaCoeff 1; + } + maxDeltaRatio 1.1; + } +} + +// ************************************************************************* // diff --git a/etc/templates/singleFluidCHT/templates/materials/water/turbulenceProperties b/etc/templates/singleFluidCHT/templates/materials/water/turbulenceProperties deleted file mode 100644 index a1e11ee5ec..0000000000 --- a/etc/templates/singleFluidCHT/templates/materials/water/turbulenceProperties +++ /dev/null @@ -1,51 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - RASModel kOmegaSST; - - turbulence on; - printCoeffs on; -} - -LES -{ - LESModel SpalartAllmarasDDES; - delta cubeRootVol; - - turbulence on; - printCoeffs on; - - cubeRootVolCoeffs - { - deltaCoeff 1; - } - - smoothCoeffs - { - delta cubeRootVol; - cubeRootVolCoeffs - { - deltaCoeff 1; - } - maxDeltaRatio 1.1; - } -} - -// ************************************************************************* // diff --git a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H index 2a739ab58c..5e1f77b326 100644 --- a/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H +++ b/src/TurbulenceModels/compressible/compressibleTurbulenceModel.H @@ -72,7 +72,7 @@ protected: public: //- Runtime type information - TypeName("compressibleTurbulenceModel"); + TypeName(turbulenceModel::typeName_()); // Constructors diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C index 6c9f47fb47..f2e36ce4eb 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.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 @@ -115,7 +115,7 @@ void convectiveHeatTransferFvPatchScalarField::updateCoeffs() ( IOobject::groupName ( - compressible::turbulenceModel::propertiesName, + compressible::turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C index 01d8e705af..517e741df4 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.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 @@ -132,7 +132,7 @@ void Foam::externalCoupledTemperatureMixedFvPatchScalarField::transferData ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C index 2aeee04fa6..e540f8c91b 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C @@ -85,7 +85,7 @@ Foam::tmp Foam::temperatureCoupledBase::kappa const word turbulenceModelName ( - IOobject::groupName(turbulenceModel::propertiesName, phase) + IOobject::groupName(turbulenceModel::typeName, phase) ); if (mesh.foundObject(turbulenceModelName)) diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C index 76b9bdf406..eb50ed4162 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.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 @@ -354,7 +354,7 @@ void thermalBaffle1DFvPatchScalarField::updateCoeffs() const compressible::turbulenceModel& turbModel = db().template lookupObject ( - turbulenceModel::propertiesName + turbulenceModel::typeName ); // local properties diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C index 78da057b19..57c6a1da2d 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.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 @@ -159,7 +159,7 @@ void Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::updateCoeffs() ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C index eaa6ff8c2b..848d27a033 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.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 @@ -165,7 +165,7 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs() ( IOobject::groupName ( - compressible::turbulenceModel::propertiesName, + compressible::turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C index 9b380f3ee2..f241653af9 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.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 @@ -112,7 +112,7 @@ void alphatWallFunctionFvPatchScalarField::updateCoeffs() ( IOobject::groupName ( - compressibleTurbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H index 1fc2274514..d6bb7d4723 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/turbulentFluidThermoModel.H @@ -24,6 +24,9 @@ License Typedef Foam::compressible::turbulenceModel +Typedef + Foam::compressible::laminarModel + Typedef Foam::compressible::RASModel diff --git a/src/TurbulenceModels/incompressible/Make/files b/src/TurbulenceModels/incompressible/Make/files index 9f5893a0fe..75a13bc966 100644 --- a/src/TurbulenceModels/incompressible/Make/files +++ b/src/TurbulenceModels/incompressible/Make/files @@ -8,7 +8,4 @@ turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.C turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.C turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.C -BCs = turbulentTransportModels/RAS/derivedFvPatchFields -turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C - LIB = $(FOAM_LIBBIN)/libincompressibleTurbulenceModels diff --git a/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.H b/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.H index 119a356829..a74d6dc4fa 100644 --- a/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.H +++ b/src/TurbulenceModels/incompressible/incompressibleTurbulenceModel.H @@ -72,7 +72,7 @@ protected: public: //- Runtime type information - TypeName("incompressibleTurbulenceModel"); + TypeName(turbulenceModel::typeName_()); // Constructors diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C deleted file mode 100644 index 9fcb872a3e..0000000000 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C +++ /dev/null @@ -1,252 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "alphatJayatillekeWallFunctionFvPatchScalarField.H" -#include "turbulenceModel.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ -namespace incompressible -{ - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -scalar alphatJayatillekeWallFunctionFvPatchScalarField::tolerance_ = 0.01; -label alphatJayatillekeWallFunctionFvPatchScalarField::maxIters_ = 10; - -// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // - -scalar alphatJayatillekeWallFunctionFvPatchScalarField::Psmooth -( - const scalar Prat -) const -{ - return 9.24*(pow(Prat, 0.75) - 1.0)*(1.0 + 0.28*exp(-0.007*Prat)); -} - - -scalar alphatJayatillekeWallFunctionFvPatchScalarField::yPlusTherm -( - const nutWallFunctionFvPatchScalarField& nutw, - const scalar P, - const scalar Prat -) const -{ - scalar ypt = 11.0; - - for (int i=0; i& iF -) -: - fixedValueFvPatchScalarField(p, iF), - Prt_(0.85) -{} - - -alphatJayatillekeWallFunctionFvPatchScalarField:: -alphatJayatillekeWallFunctionFvPatchScalarField -( - const alphatJayatillekeWallFunctionFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - fixedValueFvPatchScalarField(ptf, p, iF, mapper), - Prt_(ptf.Prt_) -{} - - -alphatJayatillekeWallFunctionFvPatchScalarField:: -alphatJayatillekeWallFunctionFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchScalarField(p, iF, dict), - Prt_(dict.lookup("Prt")) // force read to avoid ambiguity -{} - - -alphatJayatillekeWallFunctionFvPatchScalarField:: -alphatJayatillekeWallFunctionFvPatchScalarField -( - const alphatJayatillekeWallFunctionFvPatchScalarField& wfpsf -) -: - fixedValueFvPatchScalarField(wfpsf), - Prt_(wfpsf.Prt_) -{} - - -alphatJayatillekeWallFunctionFvPatchScalarField:: -alphatJayatillekeWallFunctionFvPatchScalarField -( - const alphatJayatillekeWallFunctionFvPatchScalarField& wfpsf, - const DimensionedField& iF -) -: - fixedValueFvPatchScalarField(wfpsf, iF), - Prt_(wfpsf.Prt_) -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -void alphatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs() -{ - if (updated()) - { - return; - } - - const label patchi = patch().index(); - - // Retrieve turbulence properties from model - - const turbulenceModel& turbModel = db().lookupObject - ( - IOobject::groupName - ( - turbulenceModel::propertiesName, - internalField().group() - ) - ); - - const nutWallFunctionFvPatchScalarField& nutw = - nutWallFunctionFvPatchScalarField::nutw(turbModel, patchi); - - const scalar Cmu25 = pow(nutw.Cmu(), 0.25); - const scalarField& y = turbModel.y()[patchi]; - const tmp tnu = turbModel.nu(); - const volScalarField& nu = tnu(); - const scalarField& nuw = nu.boundaryField()[patchi]; - const tmp tk = turbModel.k(); - const volScalarField& k = tk(); - - const IOdictionary& transportProperties = - db().lookupObject("transportProperties"); - - // Molecular Prandtl number - const scalar Pr - ( - dimensionedScalar - ( - "Pr", - dimless, - transportProperties.lookup("Pr") - ).value() - ); - - // Populate boundary values - scalarField& alphatw = *this; - forAll(alphatw, facei) - { - const label celli = patch().faceCells()[facei]; - - const scalar yPlus = Cmu25*sqrt(k[celli])*y[facei]/nuw[facei]; - - // Molecular-to-turbulent Prandtl number ratio - const scalar Prat = Pr/Prt_; - - // Thermal sublayer thickness - const scalar P = Psmooth(Prat); - const scalar yPlusTherm = this->yPlusTherm(nutw, P, Prat); - - // Update turbulent thermal conductivity - if (yPlus > yPlusTherm) - { - const scalar nu = nuw[facei]; - const scalar kt = - nu*(yPlus/(Prt_*(log(nutw.E()*yPlus)/nutw.kappa() + P)) - 1/Pr); - - alphatw[facei] = max(0.0, kt); - } - else - { - alphatw[facei] = 0.0; - } - } - - fixedValueFvPatchField::updateCoeffs(); -} - - -void alphatJayatillekeWallFunctionFvPatchScalarField::write(Ostream& os) const -{ - fvPatchField::write(os); - writeEntry(os, "Prt", Prt_); - writeEntry(os, "value", *this); -} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -makePatchTypeField -( - fvPatchScalarField, - alphatJayatillekeWallFunctionFvPatchScalarField -); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace incompressible -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H deleted file mode 100644 index 8c8aac5a4c..0000000000 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H +++ /dev/null @@ -1,210 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 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::incompressible::alphatJayatillekeWallFunctionFvPatchScalarField - -Description - This boundary condition provides a kinematic turbulent thermal conductivity - for using wall functions, using the Jayatilleke 'P' function. - -Usage - \table - Property | Description | Required | Default value - Prt | turbulent Prandtl number | no | 0.85 - Cmu | model coefficient | no | 0.09 - kappa | Von Karman constant | no | 0.41 - E | model coefficient | no | 9.8 - \endtable - - Example of the boundary condition specification: - \verbatim - - { - type alphatJayatillekeWallFunction; - } - \endverbatim - -Note - The units of kinematic turbulent thermal conductivity are [m^2/s] - -See also - Foam::fixedValueFvPatchField - -SourceFiles - alphatJayatillekeWallFunctionFvPatchScalarField.C - -\*---------------------------------------------------------------------------*/ - -#ifndef alphatJayatillekeWallFunctionFvPatchScalarField_H -#define alphatJayatillekeWallFunctionFvPatchScalarField_H - -#include "fixedValueFvPatchFields.H" -#include "nutWallFunctionFvPatchScalarField.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ -namespace incompressible -{ - -/*---------------------------------------------------------------------------*\ - Class alphatJayatillekeWallFunctionFvPatchScalarField Declaration -\*---------------------------------------------------------------------------*/ - -class alphatJayatillekeWallFunctionFvPatchScalarField -: - public fixedValueFvPatchScalarField -{ -protected: - - // Protected data - - //- Turbulent Prandtl number - scalar Prt_; - - //- Cmu coefficient - scalar Cmu_; - - //- Von Karman constant - scalar kappa_; - - //- E coefficient - scalar E_; - - - // Solution parameters - - static scalar tolerance_; - static label maxIters_; - - - // Protected member functions - - //- `P' function - scalar Psmooth(const scalar Prat) const; - - //- Calculate y+ at the edge of the thermal laminar sublayer - scalar yPlusTherm - ( - const nutWallFunctionFvPatchScalarField& nutw, - const scalar P, - const scalar Prat - ) const; - - -public: - - //- Runtime type information - TypeName("alphatJayatillekeWallFunction"); - - - // Constructors - - //- Construct from patch and internal field - alphatJayatillekeWallFunctionFvPatchScalarField - ( - const fvPatch&, - const DimensionedField& - ); - - //- Construct from patch, internal field and dictionary - alphatJayatillekeWallFunctionFvPatchScalarField - ( - const fvPatch&, - const DimensionedField&, - const dictionary& - ); - - //- Construct by mapping given - // alphatJayatillekeWallFunctionFvPatchScalarField - // onto a new patch - alphatJayatillekeWallFunctionFvPatchScalarField - ( - const alphatJayatillekeWallFunctionFvPatchScalarField&, - const fvPatch&, - const DimensionedField&, - const fvPatchFieldMapper& - ); - - //- Copy constructor - alphatJayatillekeWallFunctionFvPatchScalarField - ( - const alphatJayatillekeWallFunctionFvPatchScalarField& - ); - - //- Construct and return a clone - virtual tmp clone() const - { - return tmp - ( - new alphatJayatillekeWallFunctionFvPatchScalarField(*this) - ); - } - - //- Copy constructor setting internal field reference - alphatJayatillekeWallFunctionFvPatchScalarField - ( - const alphatJayatillekeWallFunctionFvPatchScalarField&, - const DimensionedField& - ); - - //- Construct and return a clone setting internal field reference - virtual tmp clone - ( - const DimensionedField& iF - ) const - { - return tmp - ( - new alphatJayatillekeWallFunctionFvPatchScalarField(*this, iF) - ); - } - - - // Member Functions - - // Evaluation functions - - //- Update the coefficients associated with the patch field - virtual void updateCoeffs(); - - - // I-O - - //- Write - virtual void write(Ostream&) const; -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace incompressible -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C b/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C index 7dea4b4bd2..10a5f5d092 100644 --- a/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C +++ b/src/TurbulenceModels/phaseCompressible/LES/Niceno/NicenoKEqn.C @@ -141,7 +141,7 @@ NicenoKEqn::gasTurbulence() const ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, gas.name() ) ); diff --git a/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C b/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C index eead3f97e3..db8b557148 100644 --- a/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C +++ b/src/TurbulenceModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C @@ -117,7 +117,7 @@ SmagorinskyZhang::gasTurbulence() const ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, gas.name() ) ); diff --git a/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C b/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C index 5b9839b5ef..b03af26e34 100644 --- a/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C +++ b/src/TurbulenceModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C @@ -113,7 +113,7 @@ continuousGasKEqn::liquidTurbulence() const ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, liquid.name() ) ); diff --git a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C b/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C index 594cade363..f2667d22e0 100644 --- a/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C +++ b/src/TurbulenceModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C @@ -152,7 +152,7 @@ LaheyKEpsilon::gasTurbulence() const ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, gas.name() ) ); diff --git a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C b/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C index c8f39246bd..92caa8ba9b 100644 --- a/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C +++ b/src/TurbulenceModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C @@ -160,7 +160,7 @@ continuousGasKEpsilon::liquidTurbulence() const ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, liquid.name() ) ); diff --git a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C index f480b0595b..cb7009d0a9 100644 --- a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C +++ b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C @@ -369,7 +369,7 @@ mixtureKEpsilon::liquidTurbulence() const ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, liquid.name() ) ) diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C index fa8d0cf2c9..ef7fb5a30b 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C @@ -130,20 +130,12 @@ Foam::LESModel::New const transportModel& transport ) { - IOdictionary modelDict + const IOdictionary modelDict ( - IOobject + turbulenceModel::readModelDict ( - IOobject::groupName - ( - turbulenceModel::propertiesName, - alphaRhoPhi.group() - ), - U.time().constant(), U.db(), - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE, - false + alphaRhoPhi.group() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H index 78f856aa7c..05984f3d4f 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H +++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.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 @@ -32,7 +32,7 @@ Description delta = min(geometricDelta, (kappa/Cdelta)*y) \endverbatim - Example specification in the turbulenceProperties dictionary: + Example specification in the momentumTransport dictionary: \verbatim delta Prandtl; diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C index ce30a99535..5b59d03c9c 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C @@ -120,20 +120,12 @@ Foam::RASModel::New const transportModel& transport ) { - IOdictionary modelDict + const IOdictionary modelDict ( - IOobject + turbulenceModel::readModelDict ( - IOobject::groupName - ( - turbulenceModel::propertiesName, - alphaRhoPhi.group() - ), - U.time().constant(), U.db(), - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE, - false + alphaRhoPhi.group() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C index f730663db8..6dc6339418 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.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 @@ -130,7 +130,7 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs() ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C index e3dc430b8f..fc66cbdbd3 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.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 @@ -126,7 +126,7 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs() ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C index 28803250c3..059a915bcc 100644 --- a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C +++ b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C @@ -82,25 +82,12 @@ Foam::TurbulenceModel::New const transportModel& transport ) { - // get model name, but do not register the dictionary - // otherwise it is registered in the database twice const word modelType ( - IOdictionary + turbulenceModel::readModelDict ( - IOobject - ( - IOobject::groupName - ( - turbulenceModel::propertiesName, - alphaRhoPhi.group() - ), - U.time().constant(), - U.db(), - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE, - false - ) + U.db(), + alphaRhoPhi.group() ).lookup("simulationType") ); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C index 373fff1700..78e82f9a9a 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/fixedShearStress/fixedShearStressFvPatchVectorField.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 @@ -104,7 +104,7 @@ void Foam::fixedShearStressFvPatchVectorField::updateCoeffs() ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C index e4e26332d2..a6d27defe7 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.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 @@ -140,7 +140,7 @@ void Foam::porousBafflePressureFvPatchField::updateCoeffs() ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C index fe680779fa..2eb4672c23 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.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 @@ -365,7 +365,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::updateCoeffs() ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); @@ -417,7 +417,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::updateWeightedCoeffs ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C index 2ef17fb222..453f58fa97 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C @@ -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 @@ -105,7 +105,7 @@ void fWallFunctionFvPatchScalarField::updateCoeffs() ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C index 240528ab33..babea90440 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C @@ -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 @@ -107,7 +107,7 @@ void kLowReWallFunctionFvPatchScalarField::updateCoeffs() ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C index 06e90c37ea..8e671c7e86 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.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 @@ -105,7 +105,7 @@ tmp nutLowReWallFunctionFvPatchScalarField::yPlus() const ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C index b37315a4bc..070d11967d 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.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 @@ -44,7 +44,7 @@ tmp nutURoughWallFunctionFvPatchScalarField::nut() const ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); @@ -90,7 +90,7 @@ tmp nutURoughWallFunctionFvPatchScalarField::yPlus ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C index 4f90bb60bc..5449f2f4ae 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.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 @@ -44,7 +44,7 @@ tmp nutUSpaldingWallFunctionFvPatchScalarField::nut() const ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); @@ -72,7 +72,7 @@ tmp nutUSpaldingWallFunctionFvPatchScalarField::calcUTau ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); @@ -196,7 +196,7 @@ tmp nutUSpaldingWallFunctionFvPatchScalarField::yPlus() const ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C index 9ba1ed64a4..40bd3d2827 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.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 @@ -44,7 +44,7 @@ tmp nutUTabulatedWallFunctionFvPatchScalarField::nut() const ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); @@ -186,7 +186,7 @@ tmp nutUTabulatedWallFunctionFvPatchScalarField::yPlus() const ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C index 72aa0328f2..759080ee4a 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.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 @@ -44,7 +44,7 @@ tmp nutUWallFunctionFvPatchScalarField::nut() const ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); @@ -83,7 +83,7 @@ tmp nutUWallFunctionFvPatchScalarField::yPlus ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); @@ -186,7 +186,7 @@ tmp nutUWallFunctionFvPatchScalarField::yPlus() const ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C index 4409d06070..f15bfaef6d 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.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 @@ -74,7 +74,7 @@ tmp nutkRoughWallFunctionFvPatchScalarField::nut() const ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C index dac91477c7..807ebbc924 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.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 @@ -45,7 +45,7 @@ tmp nutkWallFunctionFvPatchScalarField::nut() const ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); @@ -141,7 +141,7 @@ tmp nutkWallFunctionFvPatchScalarField::yPlus() const ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C index 0910d00e32..cd7bd21bbd 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.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 @@ -409,7 +409,7 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs() ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); @@ -459,7 +459,7 @@ void omegaWallFunctionFvPatchScalarField::updateWeightedCoeffs ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C index 67f39c7dd3..4df98b3b0f 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C @@ -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 @@ -104,7 +104,7 @@ void v2WallFunctionFvPatchScalarField::updateCoeffs() ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.H b/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.H index e65cef08a1..c2589fe9be 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.H +++ b/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.H @@ -104,7 +104,7 @@ public: //- Const access to the coefficients dictionary virtual const dictionary& coeffDict() const; - //- Read turbulenceProperties dictionary + //- Read momentumTransport dictionary virtual bool read(); //- Return the turbulence viscosity, i.e. 0 for Stokes flow diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.H b/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.H index 0281164a0e..dbd1dd20ce 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.H +++ b/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.H @@ -118,7 +118,7 @@ public: // Member Functions - //- Read turbulenceProperties dictionary + //- Read momentumTransport dictionary virtual bool read(); //- Return the turbulence viscosity, diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C index f50c68c48d..00752383c9 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C +++ b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C @@ -87,20 +87,12 @@ Foam::laminarModel::New const transportModel& transport ) { - IOdictionary modelDict + const IOdictionary modelDict ( - IOobject + turbulenceModel::readModelDict ( - IOobject::groupName - ( - turbulenceModel::propertiesName, - alphaRhoPhi.group() - ), - U.time().constant(), U.db(), - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE, - false + alphaRhoPhi.group() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/turbulenceModel.C b/src/TurbulenceModels/turbulenceModels/turbulenceModel.C index 271103c52f..e4aa56017e 100644 --- a/src/TurbulenceModels/turbulenceModels/turbulenceModel.C +++ b/src/TurbulenceModels/turbulenceModels/turbulenceModel.C @@ -35,7 +35,52 @@ namespace Foam defineTypeNameAndDebug(turbulenceModel, 0); } -const Foam::word Foam::turbulenceModel::propertiesName("turbulenceProperties"); + +// * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // + +Foam::IOdictionary Foam::turbulenceModel::readModelDict +( + const objectRegistry& obr, + const word& group, + bool registerObject +) +{ + IOobject momentumTransport + ( + IOobject::groupName(typeName, group), + obr.time().constant(), + obr, + IOobject::MUST_READ_IF_MODIFIED, + IOobject::NO_WRITE, + registerObject + ); + + if (momentumTransport.typeHeaderOk(true)) + { + return momentumTransport; + } + else + { + IOobject momentumTransport + ( + IOobject::groupName("momentumTransport", group), + obr.time().constant(), + obr, + IOobject::MUST_READ_IF_MODIFIED, + IOobject::NO_WRITE, + registerObject + ); + + if (momentumTransport.typeHeaderOk(true)) + { + return momentumTransport; + } + else + { + return momentumTransport; + } + } +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -47,17 +92,7 @@ Foam::turbulenceModel::turbulenceModel const surfaceScalarField& phi ) : - IOdictionary - ( - IOobject - ( - IOobject::groupName(propertiesName, alphaRhoPhi.group()), - U.time().constant(), - U.db(), - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE - ) - ), + IOdictionary(readModelDict(U.db(), alphaRhoPhi.group(), true)), runTime_(U.time()), mesh_(U.mesh()), @@ -66,7 +101,10 @@ Foam::turbulenceModel::turbulenceModel alphaRhoPhi_(alphaRhoPhi), phi_(phi), y_(mesh_) -{} +{ + // Ensure name of IOdictionary is typeName + rename(IOobject::groupName(typeName, alphaRhoPhi.group())); +} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // diff --git a/src/TurbulenceModels/turbulenceModels/turbulenceModel.H b/src/TurbulenceModels/turbulenceModels/turbulenceModel.H index 7841f7330e..057cfc4ff6 100644 --- a/src/TurbulenceModels/turbulenceModels/turbulenceModel.H +++ b/src/TurbulenceModels/turbulenceModels/turbulenceModel.H @@ -74,13 +74,20 @@ protected: nearWallDist y_; + // Protected member functions + + static IOdictionary readModelDict + ( + const objectRegistry& obr, + const word& group, + bool registerObject = false + ); + + public: //- Runtime type information - TypeName("turbulenceModel"); - - //- Default name of the turbulence properties dictionary - static const word propertiesName; + TypeName("momentumTransport"); // Constructors diff --git a/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C index bfb0985646..513cff9c2f 100644 --- a/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C +++ b/src/atmosphericModels/derivedFvPatchFields/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C @@ -44,7 +44,7 @@ tmp nutkAtmRoughWallFunctionFvPatchScalarField::nut() const ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/combustionModels/FSD/FSD.C b/src/combustionModels/FSD/FSD.C index c26c5d324a..1b184b2650 100644 --- a/src/combustionModels/FSD/FSD.C +++ b/src/combustionModels/FSD/FSD.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 @@ -174,7 +174,7 @@ void FSD::calculateSourceNorm() const compressible::LESModel& lesModel = YO2.db().lookupObject ( - turbulenceModel::propertiesName + turbulenceModel::typeName ); const volScalarField& delta = lesModel.delta(); diff --git a/src/functionObjects/field/PecletNo/PecletNo.C b/src/functionObjects/field/PecletNo/PecletNo.C index 441faa7889..25b6d3ee05 100644 --- a/src/functionObjects/field/PecletNo/PecletNo.C +++ b/src/functionObjects/field/PecletNo/PecletNo.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 @@ -56,7 +56,7 @@ bool Foam::functionObjects::PecletNo::calc() ( mesh_.lookupObject ( - turbulenceModel::propertiesName + turbulenceModel::typeName ).nuEff() ); diff --git a/src/functionObjects/field/age/age.C b/src/functionObjects/field/age/age.C index 75953dd601..c7d2297c26 100644 --- a/src/functionObjects/field/age/age.C +++ b/src/functionObjects/field/age/age.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 @@ -175,7 +175,7 @@ bool Foam::functionObjects::age::execute() tmuEff = mesh_.lookupObject ( - turbulenceModel::propertiesName + turbulenceModel::typeName ).muEff(); laplacianScheme = @@ -212,7 +212,7 @@ bool Foam::functionObjects::age::execute() tnuEff = mesh_.lookupObject ( - turbulenceModel::propertiesName + turbulenceModel::typeName ).nuEff(); laplacianScheme = diff --git a/src/functionObjects/field/shearStress/shearStress.C b/src/functionObjects/field/shearStress/shearStress.C index bcd6c892a9..74a553fb5a 100644 --- a/src/functionObjects/field/shearStress/shearStress.C +++ b/src/functionObjects/field/shearStress/shearStress.C @@ -91,7 +91,7 @@ bool Foam::functionObjects::shearStress::execute() const word turbulenceModelName ( - IOobject::groupName(turbulenceModel::propertiesName, phaseName_) + IOobject::groupName(turbulenceModel::typeName, phaseName_) ); if (mesh_.foundObject(turbulenceModelName)) diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFields.C b/src/functionObjects/field/turbulenceFields/turbulenceFields.C index 51811391db..047e62d1a6 100644 --- a/src/functionObjects/field/turbulenceFields/turbulenceFields.C +++ b/src/functionObjects/field/turbulenceFields/turbulenceFields.C @@ -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 @@ -118,7 +118,7 @@ Foam::functionObjects::turbulenceFields::~turbulenceFields() const Foam::word& Foam::functionObjects::turbulenceFields::modelName() { - return Foam::turbulenceModel::propertiesName; + return Foam::turbulenceModel::typeName; } diff --git a/src/functionObjects/field/turbulenceIntensity/turbulenceIntensity.C b/src/functionObjects/field/turbulenceIntensity/turbulenceIntensity.C index 7cae40ee08..20640c6aa3 100644 --- a/src/functionObjects/field/turbulenceIntensity/turbulenceIntensity.C +++ b/src/functionObjects/field/turbulenceIntensity/turbulenceIntensity.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 @@ -96,11 +96,11 @@ bool Foam::functionObjects::turbulenceIntensity::read(const dictionary& dict) bool Foam::functionObjects::turbulenceIntensity::execute() { - if (mesh_.foundObject(turbulenceModel::propertiesName)) + if (mesh_.foundObject(turbulenceModel::typeName)) { const turbulenceModel& turbModel = mesh_.lookupObject ( - turbulenceModel::propertiesName + turbulenceModel::typeName ); volScalarField uPrime(sqrt((2.0/3.0)*turbModel.k())); diff --git a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C index 5135791c63..e57e822ca8 100644 --- a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C +++ b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.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 @@ -204,14 +204,14 @@ bool Foam::functionObjects::wallHeatFlux::execute() ( foundObject ( - turbulenceModel::propertiesName + turbulenceModel::typeName ) ) { const compressible::turbulenceModel& turbModel = lookupObject ( - turbulenceModel::propertiesName + turbulenceModel::typeName ); return store diff --git a/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.C b/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.C index 9eede06113..87f5b0922d 100644 --- a/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.C +++ b/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -200,14 +200,14 @@ bool Foam::functionObjects::wallHeatTransferCoeff::execute() ( foundObject ( - turbulenceModel::propertiesName + turbulenceModel::typeName ) ) { const incompressible::turbulenceModel& turbModel = lookupObject ( - turbulenceModel::propertiesName + turbulenceModel::typeName ); return store diff --git a/src/functionObjects/field/wallShearStress/wallShearStress.C b/src/functionObjects/field/wallShearStress/wallShearStress.C index 76f24e485c..835f4bc565 100644 --- a/src/functionObjects/field/wallShearStress/wallShearStress.C +++ b/src/functionObjects/field/wallShearStress/wallShearStress.C @@ -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 @@ -181,17 +181,17 @@ bool Foam::functionObjects::wallShearStress::execute() typedef incompressible::turbulenceModel icoModel; tmp Reff; - if (mesh_.foundObject(turbulenceModel::propertiesName)) + if (mesh_.foundObject(turbulenceModel::typeName)) { const cmpModel& model = - mesh_.lookupObject(turbulenceModel::propertiesName); + mesh_.lookupObject(turbulenceModel::typeName); Reff = model.devRhoReff(); } - else if (mesh_.foundObject(turbulenceModel::propertiesName)) + else if (mesh_.foundObject(turbulenceModel::typeName)) { const icoModel& model = - mesh_.lookupObject(turbulenceModel::propertiesName); + mesh_.lookupObject(turbulenceModel::typeName); Reff = model.devReff(); } diff --git a/src/functionObjects/field/yPlus/yPlus.C b/src/functionObjects/field/yPlus/yPlus.C index 3eede62949..16eac05f20 100644 --- a/src/functionObjects/field/yPlus/yPlus.C +++ b/src/functionObjects/field/yPlus/yPlus.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 @@ -163,12 +163,12 @@ bool Foam::functionObjects::yPlus::execute() { if (mesh_.foundObject ( - IOobject::groupName(turbulenceModel::propertiesName, phaseName_)) + IOobject::groupName(turbulenceModel::typeName, phaseName_)) ) { const turbulenceModel& model = mesh_.lookupObject ( - IOobject::groupName(turbulenceModel::propertiesName, phaseName_) + IOobject::groupName(turbulenceModel::typeName, phaseName_) ); word name(IOobject::groupName(type(), phaseName_)); diff --git a/src/functionObjects/forces/forces/forces.C b/src/functionObjects/forces/forces/forces.C index b8cb5218d6..6e35d8c847 100644 --- a/src/functionObjects/forces/forces/forces.C +++ b/src/functionObjects/forces/forces/forces.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 @@ -221,17 +221,17 @@ Foam::functionObjects::forces::devRhoReff() const typedef compressible::turbulenceModel cmpTurbModel; typedef incompressible::turbulenceModel icoTurbModel; - if (obr_.foundObject(cmpTurbModel::propertiesName)) + if (obr_.foundObject(turbulenceModel::typeName)) { const cmpTurbModel& turb = - obr_.lookupObject(cmpTurbModel::propertiesName); + obr_.lookupObject(turbulenceModel::typeName); return turb.devRhoReff(); } - else if (obr_.foundObject(icoTurbModel::propertiesName)) + else if (obr_.foundObject(turbulenceModel::typeName)) { const incompressible::turbulenceModel& turb = - obr_.lookupObject(icoTurbModel::propertiesName); + obr_.lookupObject(turbulenceModel::typeName); return rho()*turb.devReff(); } diff --git a/src/functionObjects/solvers/phaseScalarTransport/phaseScalarTransport.C b/src/functionObjects/solvers/phaseScalarTransport/phaseScalarTransport.C index 36586ca10b..21b2b315e7 100644 --- a/src/functionObjects/solvers/phaseScalarTransport/phaseScalarTransport.C +++ b/src/functionObjects/solvers/phaseScalarTransport/phaseScalarTransport.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 @@ -247,7 +247,7 @@ Foam::functionObjects::phaseScalarTransport::D ); } - const word& nameNoPhase = turbulenceModel::propertiesName; + const word& nameNoPhase = turbulenceModel::typeName; const word namePhase = IOobject::groupName(nameNoPhase, phaseName_); const word& name = diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.C b/src/functionObjects/solvers/scalarTransport/scalarTransport.C index 429f28f76c..e37da81773 100644 --- a/src/functionObjects/solvers/scalarTransport/scalarTransport.C +++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.C @@ -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 @@ -72,20 +72,20 @@ Foam::tmp Foam::functionObjects::scalarTransport::D dimensionedScalar(Dname, phi.dimensions()/dimLength, D_) ); } - else if (mesh_.foundObject(turbulenceModel::propertiesName)) + else if (mesh_.foundObject(turbulenceModel::typeName)) { const icoModel& model = mesh_.lookupObject ( - turbulenceModel::propertiesName + turbulenceModel::typeName ); return alphaD_*model.nu() + alphaDt_*model.nut(); } - else if (mesh_.foundObject(turbulenceModel::propertiesName)) + else if (mesh_.foundObject(turbulenceModel::typeName)) { const cmpModel& model = mesh_.lookupObject ( - turbulenceModel::propertiesName + turbulenceModel::typeName ); return alphaD_*model.mu() + alphaDt_*model.mut(); diff --git a/src/fvOptions/sources/derived/volumeFractionSource/volumeFractionSource.C b/src/fvOptions/sources/derived/volumeFractionSource/volumeFractionSource.C index 07406836f0..a231c4c1c9 100644 --- a/src/fvOptions/sources/derived/volumeFractionSource/volumeFractionSource.C +++ b/src/fvOptions/sources/derived/volumeFractionSource/volumeFractionSource.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 @@ -90,7 +90,7 @@ Foam::tmp Foam::fv::volumeFractionSource::D const turbulenceModel& turbulence = mesh().lookupObject ( - turbulenceModel::propertiesName + turbulenceModel::typeName ); return turbulence.nuEff(); @@ -100,7 +100,7 @@ Foam::tmp Foam::fv::volumeFractionSource::D const compressible::turbulenceModel& turbulence = mesh().lookupObject ( - turbulenceModel::propertiesName + turbulenceModel::typeName ); return diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C index aebf50895d..d34e556c54 100644 --- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.C +++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/variableHeatTransfer/variableHeatTransfer.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 @@ -105,7 +105,7 @@ void Foam::fv::variableHeatTransfer::calculateHtc() const compressible::turbulenceModel& nbrTurb = nbrMesh.lookupObject ( - turbulenceModel::propertiesName + turbulenceModel::typeName ); const fluidThermo& nbrThermo = diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C index 6b42715463..b41317d3b9 100644 --- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C +++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.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 @@ Foam::DispersionRASModel::kModel() const const word turbName = IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, this->owner().U().group() ); @@ -67,7 +67,7 @@ Foam::DispersionRASModel::epsilonModel() const const word turbName = IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, this->owner().U().group() ); diff --git a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C index 2430564aa0..92d112a9d0 100644 --- a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C +++ b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.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 @@ -60,7 +60,7 @@ Foam::BrownianMotionForce::kModel() const const word turbName = IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, this->owner().U().group() ); diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C index a0cf813847..f08a48a834 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.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 @@ -167,7 +167,7 @@ void alphatFilmWallFunctionFvPatchScalarField::updateCoeffs() ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C index 895645bba1..3e39242382 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C @@ -80,7 +80,7 @@ tmp nutkFilmWallFunctionFvPatchScalarField::calcUTau ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); @@ -131,7 +131,7 @@ tmp nutkFilmWallFunctionFvPatchScalarField::nut() const ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); @@ -223,7 +223,7 @@ tmp nutkFilmWallFunctionFvPatchScalarField::yPlus() const ( IOobject::groupName ( - turbulenceModel::propertiesName, + turbulenceModel::typeName, internalField().group() ) ); diff --git a/src/specieTransfer/derivedFvPatchFields/adsorptionMassFraction/adsorptionMassFractionFvPatchScalarField.C b/src/specieTransfer/derivedFvPatchFields/adsorptionMassFraction/adsorptionMassFractionFvPatchScalarField.C index 3ed91275a4..74f8972152 100644 --- a/src/specieTransfer/derivedFvPatchFields/adsorptionMassFraction/adsorptionMassFractionFvPatchScalarField.C +++ b/src/specieTransfer/derivedFvPatchFields/adsorptionMassFraction/adsorptionMassFractionFvPatchScalarField.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 @@ -112,7 +112,7 @@ Foam::adsorptionMassFractionFvPatchScalarField::calcPhiYp() const const compressible::turbulenceModel& turb = db().lookupObject ( - turbulenceModel::propertiesName + turbulenceModel::typeName ); const scalarField alphaEffDeltap ( diff --git a/src/specieTransfer/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C b/src/specieTransfer/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C index 8b65c7f7fa..226a641156 100644 --- a/src/specieTransfer/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C +++ b/src/specieTransfer/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C @@ -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 @@ -127,7 +127,7 @@ Foam::semiPermeableBaffleMassFractionFvPatchScalarField::calcPhiYp() const const compressible::turbulenceModel& turb = db().lookupObject ( - turbulenceModel::propertiesName + turbulenceModel::typeName ); const scalarField alphaEffDeltap ( diff --git a/src/specieTransfer/derivedFvPatchFields/specieTransferMassFraction/specieTransferMassFractionFvPatchScalarField.C b/src/specieTransfer/derivedFvPatchFields/specieTransferMassFraction/specieTransferMassFractionFvPatchScalarField.C index fc5ffb5ccb..94b6df738e 100644 --- a/src/specieTransfer/derivedFvPatchFields/specieTransferMassFraction/specieTransferMassFractionFvPatchScalarField.C +++ b/src/specieTransfer/derivedFvPatchFields/specieTransferMassFraction/specieTransferMassFractionFvPatchScalarField.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 @@ -255,7 +255,7 @@ void Foam::specieTransferMassFractionFvPatchScalarField::updateCoeffs() patch().magSf() *db().lookupObject ( - turbulenceModel::propertiesName + turbulenceModel::typeName ) .alphaEff(patch().index()) ); diff --git a/src/specieTransfer/derivedFvPatchFields/specieTransferTemperature/specieTransferTemperatureFvPatchScalarField.C b/src/specieTransfer/derivedFvPatchFields/specieTransferTemperature/specieTransferTemperatureFvPatchScalarField.C index 6bce174225..d67cd28ef8 100644 --- a/src/specieTransfer/derivedFvPatchFields/specieTransferTemperature/specieTransferTemperatureFvPatchScalarField.C +++ b/src/specieTransfer/derivedFvPatchFields/specieTransferTemperature/specieTransferTemperatureFvPatchScalarField.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 @@ -168,7 +168,7 @@ void Foam::specieTransferTemperatureFvPatchScalarField::updateCoeffs() patch().magSf() *db().lookupObject ( - turbulenceModel::propertiesName + turbulenceModel::typeName ).alphaEff(patch().index()) ); diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/momentumTransport.air1 b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/momentumTransport.air1 new file mode 100644 index 0000000000..3c3b2564e9 --- /dev/null +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/momentumTransport.air1 @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.air1; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/momentumTransport.air2 b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/momentumTransport.air2 new file mode 100644 index 0000000000..217f7e40ef --- /dev/null +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/momentumTransport.air2 @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.air2; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/momentumTransport.air3 b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/momentumTransport.air3 new file mode 100644 index 0000000000..f46ee3b790 --- /dev/null +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/momentumTransport.air3 @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.air3; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/momentumTransport.water b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/momentumTransport.water new file mode 100644 index 0000000000..8f42ef3c8a --- /dev/null +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/momentumTransport.water @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.water; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/momentumTransport.air1 b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/momentumTransport.air1 new file mode 100644 index 0000000000..3c3b2564e9 --- /dev/null +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/momentumTransport.air1 @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.air1; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/momentumTransport.air2 b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/momentumTransport.air2 new file mode 100644 index 0000000000..217f7e40ef --- /dev/null +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/momentumTransport.air2 @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.air2; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/momentumTransport.air3 b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/momentumTransport.air3 new file mode 100644 index 0000000000..f46ee3b790 --- /dev/null +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/momentumTransport.air3 @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.air3; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/momentumTransport.water b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/momentumTransport.water new file mode 100644 index 0000000000..8f42ef3c8a --- /dev/null +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/momentumTransport.water @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.water; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/turbulenceProperties.air3 b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/turbulenceProperties.air3 deleted file mode 100644 index 3b60ac9238..0000000000 --- a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/turbulenceProperties.air3 +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.air3; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/momentumTransport.air1 b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/momentumTransport.air1 new file mode 100644 index 0000000000..3c3b2564e9 --- /dev/null +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/momentumTransport.air1 @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.air1; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/momentumTransport.air2 b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/momentumTransport.air2 new file mode 100644 index 0000000000..217f7e40ef --- /dev/null +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/momentumTransport.air2 @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.air2; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/momentumTransport.air3 b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/momentumTransport.air3 new file mode 100644 index 0000000000..f46ee3b790 --- /dev/null +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/momentumTransport.air3 @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.air3; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/momentumTransport.water b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/momentumTransport.water new file mode 100644 index 0000000000..8f42ef3c8a --- /dev/null +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/momentumTransport.water @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.water; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/turbulenceProperties.air1 b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/turbulenceProperties.air1 deleted file mode 100644 index e929d82a62..0000000000 --- a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/turbulenceProperties.air1 +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.air1; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/turbulenceProperties.air2 b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/turbulenceProperties.air2 deleted file mode 100644 index 544717914f..0000000000 --- a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/turbulenceProperties.air2 +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.air2; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/turbulenceProperties.air3 b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/turbulenceProperties.air3 deleted file mode 100644 index 3b60ac9238..0000000000 --- a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/turbulenceProperties.air3 +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.air3; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/momentumTransport.air1 b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/momentumTransport.air1 new file mode 100644 index 0000000000..3c3b2564e9 --- /dev/null +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/momentumTransport.air1 @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.air1; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/momentumTransport.air2 b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/momentumTransport.air2 new file mode 100644 index 0000000000..217f7e40ef --- /dev/null +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/momentumTransport.air2 @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.air2; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/momentumTransport.air3 b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/momentumTransport.air3 new file mode 100644 index 0000000000..f46ee3b790 --- /dev/null +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/momentumTransport.air3 @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.air3; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/momentumTransport.water b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/momentumTransport.water new file mode 100644 index 0000000000..8f42ef3c8a --- /dev/null +++ b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/momentumTransport.water @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.water; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/turbulenceProperties.air1 b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/turbulenceProperties.air1 deleted file mode 100644 index e929d82a62..0000000000 --- a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/turbulenceProperties.air1 +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.air1; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/turbulenceProperties.air2 b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/turbulenceProperties.air2 deleted file mode 100644 index 544717914f..0000000000 --- a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/turbulenceProperties.air2 +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.air2; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/turbulenceProperties.air3 b/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/turbulenceProperties.air3 deleted file mode 100644 index 3b60ac9238..0000000000 --- a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/turbulenceProperties.air3 +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.air3; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/momentumTransport.gas b/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/momentumTransport.gas new file mode 100644 index 0000000000..a33e17a274 --- /dev/null +++ b/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/momentumTransport.gas @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.gas; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/momentumTransport.liquid b/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/momentumTransport.liquid new file mode 100644 index 0000000000..4b970b8c2e --- /dev/null +++ b/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/momentumTransport.liquid @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.liquid; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterEvaporation/constant/momentumTransport.gas b/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterEvaporation/constant/momentumTransport.gas new file mode 100644 index 0000000000..a33e17a274 --- /dev/null +++ b/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterEvaporation/constant/momentumTransport.gas @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.gas; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterEvaporation/constant/momentumTransport.liquid b/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterEvaporation/constant/momentumTransport.liquid new file mode 100644 index 0000000000..4b970b8c2e --- /dev/null +++ b/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterEvaporation/constant/momentumTransport.liquid @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.liquid; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/drift/constant/momentumTransport.air b/test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/drift/constant/momentumTransport.air new file mode 100644 index 0000000000..31424d6c73 --- /dev/null +++ b/test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/drift/constant/momentumTransport.air @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.air; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/drift/constant/momentumTransport.water b/test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/drift/constant/momentumTransport.water new file mode 100644 index 0000000000..8f42ef3c8a --- /dev/null +++ b/test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/drift/constant/momentumTransport.water @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.water; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/negativeDrift/constant/momentumTransport.air b/test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/negativeDrift/constant/momentumTransport.air new file mode 100644 index 0000000000..31424d6c73 --- /dev/null +++ b/test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/negativeDrift/constant/momentumTransport.air @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.air; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/negativeDrift/constant/momentumTransport.water b/test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/negativeDrift/constant/momentumTransport.water new file mode 100644 index 0000000000..8f42ef3c8a --- /dev/null +++ b/test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/negativeDrift/constant/momentumTransport.water @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.water; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/thermal/waterEvaporation/constant/momentumTransport.steam b/test/multiphase/reactingTwoPhaseEulerFoam/thermal/waterEvaporation/constant/momentumTransport.steam new file mode 100644 index 0000000000..661950d8f4 --- /dev/null +++ b/test/multiphase/reactingTwoPhaseEulerFoam/thermal/waterEvaporation/constant/momentumTransport.steam @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.steam; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/thermal/waterEvaporation/constant/momentumTransport.water b/test/multiphase/reactingTwoPhaseEulerFoam/thermal/waterEvaporation/constant/momentumTransport.water new file mode 100644 index 0000000000..8f42ef3c8a --- /dev/null +++ b/test/multiphase/reactingTwoPhaseEulerFoam/thermal/waterEvaporation/constant/momentumTransport.water @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport.water; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/tutorials/DNS/dnsFoam/boxTurb16/constant/turbulenceProperties b/tutorials/DNS/dnsFoam/boxTurb16/constant/momentumTransport similarity index 95% rename from tutorials/DNS/dnsFoam/boxTurb16/constant/turbulenceProperties rename to tutorials/DNS/dnsFoam/boxTurb16/constant/momentumTransport index ef4d45de5e..554d76fc39 100644 --- a/tutorials/DNS/dnsFoam/boxTurb16/constant/turbulenceProperties +++ b/tutorials/DNS/dnsFoam/boxTurb16/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/turbulenceProperties b/tutorials/IO/fileHandler/constant/momentumTransport similarity index 94% rename from tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/turbulenceProperties rename to tutorials/IO/fileHandler/constant/momentumTransport index ff13edf0a6..ad347cd981 100644 --- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/turbulenceProperties +++ b/tutorials/IO/fileHandler/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/turbulenceProperties b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/momentumTransport similarity index 96% rename from tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/turbulenceProperties rename to tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/momentumTransport index 5ab322c80c..360b92931b 100644 --- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/turbulenceProperties +++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/constant/turbulenceProperties b/tutorials/combustion/XiEngineFoam/kivaTest/constant/momentumTransport similarity index 95% rename from tutorials/combustion/XiEngineFoam/kivaTest/constant/turbulenceProperties rename to tutorials/combustion/XiEngineFoam/kivaTest/constant/momentumTransport index 300ff48999..54e9211ffd 100644 --- a/tutorials/combustion/XiEngineFoam/kivaTest/constant/turbulenceProperties +++ b/tutorials/combustion/XiEngineFoam/kivaTest/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/constant/turbulenceProperties b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/momentumTransport similarity index 95% rename from tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/constant/turbulenceProperties rename to tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/momentumTransport index 7f44a8906b..cfe0684791 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/constant/turbulenceProperties +++ b/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/pisoFoam/RAS/cavity/constant/turbulenceProperties b/tutorials/combustion/coldEngineFoam/freePiston/constant/momentumTransport similarity index 95% rename from tutorials/incompressible/pisoFoam/RAS/cavity/constant/turbulenceProperties rename to tutorials/combustion/coldEngineFoam/freePiston/constant/momentumTransport index cba9ffa8ca..86ce7c7b42 100644 --- a/tutorials/incompressible/pisoFoam/RAS/cavity/constant/turbulenceProperties +++ b/tutorials/combustion/coldEngineFoam/freePiston/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/turbulenceProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/momentumTransport similarity index 97% rename from tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/turbulenceProperties rename to tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/momentumTransport index e81a7eebe5..b072b89ed4 100644 --- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/turbulenceProperties +++ b/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/momentumTransport @@ -12,7 +12,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/turbulenceProperties b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/momentumTransport similarity index 98% rename from tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/turbulenceProperties rename to tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/momentumTransport index 2a8388dd47..d97eb014a8 100644 --- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/turbulenceProperties +++ b/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/momentumTransport similarity index 95% rename from tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/turbulenceProperties rename to tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/momentumTransport index eae8ee47a7..d1f7a85813 100644 --- a/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/turbulenceProperties +++ b/tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/momentumTransport similarity index 95% rename from tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/turbulenceProperties rename to tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/momentumTransport index 6edea40468..5c513ab4d7 100644 --- a/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/turbulenceProperties +++ b/tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/combustion/reactingFoam/RAS/membrane/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/RAS/membrane/constant/momentumTransport similarity index 95% rename from tutorials/combustion/reactingFoam/RAS/membrane/constant/turbulenceProperties rename to tutorials/combustion/reactingFoam/RAS/membrane/constant/momentumTransport index 6d0b635202..f7710c7718 100644 --- a/tutorials/combustion/reactingFoam/RAS/membrane/constant/turbulenceProperties +++ b/tutorials/combustion/reactingFoam/RAS/membrane/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/momentumTransport similarity index 94% rename from tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/turbulenceProperties rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/momentumTransport index ff13edf0a6..ad347cd981 100644 --- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/turbulenceProperties +++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/momentumTransport similarity index 94% rename from tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/turbulenceProperties rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/momentumTransport index ff13edf0a6..ad347cd981 100644 --- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/turbulenceProperties +++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/momentumTransport similarity index 94% rename from tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/turbulenceProperties rename to tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/momentumTransport index ff13edf0a6..ad347cd981 100644 --- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/turbulenceProperties +++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2DLTS_GRI_TDAC/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/momentumTransport b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/momentumTransport b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/turbulenceProperties b/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/combustion/reactingFoam/laminar/counterFlowFlame2D_GRI_TDAC/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/momentumTransport b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/momentumTransport b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/momentumTransport b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/movingCone/constant/momentumTransport b/tutorials/compressible/rhoCentralFoam/movingCone/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/compressible/rhoCentralFoam/movingCone/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/movingCone/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/movingCone/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/compressible/rhoCentralFoam/movingCone/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/momentumTransport b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/momentumTransport b/tutorials/compressible/rhoCentralFoam/shockTube/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/shockTube/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/momentumTransport b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/constant/momentumTransport similarity index 97% rename from tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/constant/turbulenceProperties rename to tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/constant/momentumTransport index 88cba2cb14..5db21216b8 100644 --- a/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/constant/turbulenceProperties +++ b/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -89,4 +89,5 @@ LES } } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/constant/momentumTransport similarity index 95% rename from tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/constant/turbulenceProperties rename to tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/constant/momentumTransport index fdbbd66a95..692e4c4b24 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/constant/turbulenceProperties +++ b/tutorials/compressible/rhoPimpleFoam/RAS/aerofoilNACA0012/constant/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/momentumTransport similarity index 95% rename from tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/turbulenceProperties rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/momentumTransport index 52a27c8502..8aee35a5df 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/turbulenceProperties +++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/momentumTransport similarity index 95% rename from tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/turbulenceProperties rename to tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/momentumTransport index 52a27c8502..8aee35a5df 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/turbulenceProperties +++ b/tutorials/compressible/rhoPimpleFoam/RAS/angledDuctLTS/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/momentumTransport similarity index 95% rename from tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/turbulenceProperties rename to tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/momentumTransport index 52a27c8502..8aee35a5df 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/angledDuct/constant/turbulenceProperties +++ b/tutorials/compressible/rhoPimpleFoam/RAS/annularThermalMixer/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/constant/momentumTransport similarity index 95% rename from tutorials/multiphase/interFoam/RAS/DTCHull/constant/turbulenceProperties rename to tutorials/compressible/rhoPimpleFoam/RAS/cavity/constant/momentumTransport index eeb9a72635..c91f505558 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/constant/turbulenceProperties +++ b/tutorials/compressible/rhoPimpleFoam/RAS/cavity/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/momentumTransport similarity index 95% rename from tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/turbulenceProperties rename to tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/momentumTransport index 52a27c8502..8aee35a5df 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/turbulenceProperties +++ b/tutorials/compressible/rhoPimpleFoam/RAS/mixerVessel2D/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/constant/momentumTransport similarity index 95% rename from tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/turbulenceProperties rename to tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/constant/momentumTransport index 7f44a8906b..cfe0684791 100644 --- a/tutorials/combustion/XiFoam/RAS/moriyoshiHomogeneous/constant/turbulenceProperties +++ b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/prism/constant/momentumTransport b/tutorials/compressible/rhoPimpleFoam/RAS/prism/constant/momentumTransport new file mode 100644 index 0000000000..8aee35a5df --- /dev/null +++ b/tutorials/compressible/rhoPimpleFoam/RAS/prism/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/prism/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/prism/constant/turbulenceProperties deleted file mode 100644 index 52a27c8502..0000000000 --- a/tutorials/compressible/rhoPimpleFoam/RAS/prism/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/constant/momentumTransport b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/constant/momentumTransport new file mode 100644 index 0000000000..8aee35a5df --- /dev/null +++ b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/constant/turbulenceProperties deleted file mode 100644 index 52a27c8502..0000000000 --- a/tutorials/compressible/rhoPimpleFoam/RAS/squareBendLiq/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/constant/momentumTransport similarity index 94% rename from tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/constant/turbulenceProperties rename to tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/constant/momentumTransport index e61cb31334..2f01fc7e26 100644 --- a/tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/constant/turbulenceProperties +++ b/tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/turbulenceProperties.air3 b/tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/constant/thermophysicalTransport similarity index 90% rename from test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/turbulenceProperties.air3 rename to tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/constant/thermophysicalTransport index 3b60ac9238..9eade51dcd 100644 --- a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/turbulenceProperties.air3 +++ b/tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/constant/thermophysicalTransport @@ -11,10 +11,13 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties.air3; + object thermophysicalTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -simulationType laminar; +laminar +{ + model Fourier; +} // ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/constant/momentumTransport similarity index 94% rename from tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/constant/turbulenceProperties rename to tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/constant/momentumTransport index 46b3810858..008d821a72 100644 --- a/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/constant/turbulenceProperties +++ b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/constant/momentumTransport b/tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/momentumTransport b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/constant/momentumTransport b/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/momentumTransport similarity index 95% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/momentumTransport index 53d4504f8e..66ead6ea43 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/constant/turbulenceProperties b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/constant/momentumTransport similarity index 95% rename from tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/constant/turbulenceProperties rename to tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/constant/momentumTransport index fdbbd66a95..692e4c4b24 100644 --- a/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/constant/turbulenceProperties +++ b/tutorials/compressible/rhoSimpleFoam/aerofoilNACA0012/constant/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/turbulenceProperties b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/momentumTransport similarity index 95% rename from tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/turbulenceProperties rename to tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/momentumTransport index 53d4504f8e..66ead6ea43 100644 --- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/turbulenceProperties +++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/constant/momentumTransport b/tutorials/compressible/rhoSimpleFoam/squareBend/constant/momentumTransport new file mode 100644 index 0000000000..8aee35a5df --- /dev/null +++ b/tutorials/compressible/rhoSimpleFoam/squareBend/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoSimpleFoam/squareBend/constant/turbulenceProperties b/tutorials/compressible/rhoSimpleFoam/squareBend/constant/turbulenceProperties deleted file mode 100644 index 52a27c8502..0000000000 --- a/tutorials/compressible/rhoSimpleFoam/squareBend/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/momentumTransport b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/momentumTransport new file mode 100644 index 0000000000..8aee35a5df --- /dev/null +++ b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/turbulenceProperties b/tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/turbulenceProperties deleted file mode 100644 index 52a27c8502..0000000000 --- a/tutorials/compressible/rhoSimpleFoam/squareBendLiq/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/momentumTransport similarity index 95% rename from tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/turbulenceProperties rename to tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/momentumTransport index fc963bd05d..d163d1a0da 100644 --- a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/turbulenceProperties +++ b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/momentumTransport b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/momentumTransport new file mode 100644 index 0000000000..8aee35a5df --- /dev/null +++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/turbulenceProperties deleted file mode 100644 index 52a27c8502..0000000000 --- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/momentumTransport b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/momentumTransport new file mode 100644 index 0000000000..8aee35a5df --- /dev/null +++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/turbulenceProperties deleted file mode 100644 index 52a27c8502..0000000000 --- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoomBoussinesq/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/momentumTransport similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/turbulenceProperties rename to tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/momentumTransport diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/momentumTransport similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/turbulenceProperties rename to tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/constant/momentumTransport diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/momentumTransport similarity index 95% rename from tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/turbulenceProperties rename to tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/momentumTransport index 53d4504f8e..66ead6ea43 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/turbulenceProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/comfortHotRoom/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/momentumTransport similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/turbulenceProperties rename to tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/constant/momentumTransport diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/momentumTransport similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/turbulenceProperties rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoom/constant/momentumTransport diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/momentumTransport similarity index 100% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/turbulenceProperties rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRadiationRoomFvDOM/constant/momentumTransport diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/constant/momentumTransport similarity index 95% rename from tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/constant/turbulenceProperties rename to tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/constant/momentumTransport index 53d4504f8e..66ead6ea43 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/constant/turbulenceProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoomBoussinesq/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/momentumTransport b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/momentumTransport new file mode 100644 index 0000000000..66ead6ea43 --- /dev/null +++ b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/turbulenceProperties b/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/turbulenceProperties deleted file mode 100644 index 53d4504f8e..0000000000 --- a/tutorials/heatTransfer/buoyantSimpleFoam/iglooWithFridges/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/constant/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/constant/momentumTransport similarity index 96% rename from tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/constant/turbulenceProperties rename to tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/constant/momentumTransport index dc84b83b4d..a17e104a89 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/constant/turbulenceProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/constant/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/materials/water/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/materials/air/momentumTransport similarity index 96% rename from tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/materials/water/turbulenceProperties rename to tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/materials/air/momentumTransport index dc84b83b4d..a17e104a89 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/materials/water/turbulenceProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/materials/air/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/materials/air/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/materials/water/momentumTransport similarity index 96% rename from tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/materials/air/turbulenceProperties rename to tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/materials/water/momentumTransport index dc84b83b4d..a17e104a89 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/materials/air/turbulenceProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/materials/water/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/momentumTransport b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/momentumTransport new file mode 100644 index 0000000000..8aee35a5df --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/turbulenceProperties deleted file mode 100644 index 52a27c8502..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/air/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/porous/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/porous/momentumTransport similarity index 94% rename from tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/porous/turbulenceProperties rename to tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/porous/momentumTransport index b9f6ef5f2a..8c89a07008 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/porous/turbulenceProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/heatExchanger/constant/porous/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/constant/fluid/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/constant/fluid/momentumTransport similarity index 94% rename from tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/constant/fluid/turbulenceProperties rename to tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/constant/fluid/momentumTransport index f3911835dc..edf95eec50 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/constant/fluid/turbulenceProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/heatedDuct/constant/fluid/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant/fluid"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/momentumTransport similarity index 95% rename from tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/turbulenceProperties rename to tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/momentumTransport index 196bb91aed..652c382925 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/turbulenceProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/shell/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/shell/momentumTransport similarity index 95% rename from tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/shell/turbulenceProperties rename to tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/shell/momentumTransport index ecb9516bad..fb47490e49 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/shell/turbulenceProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/shell/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant/shell"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/tube/momentumTransport b/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/tube/momentumTransport new file mode 120000 index 0000000000..5f2ed768c1 --- /dev/null +++ b/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/tube/momentumTransport @@ -0,0 +1 @@ +../shell/momentumTransport \ No newline at end of file diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/tube/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/tube/turbulenceProperties deleted file mode 120000 index 5ef4ef227d..0000000000 --- a/tutorials/heatTransfer/chtMultiRegionFoam/shellAndTubeHeatExchanger/constant/tube/turbulenceProperties +++ /dev/null @@ -1 +0,0 @@ -../shell/turbulenceProperties \ No newline at end of file diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/momentumTransport b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/momentumTransport new file mode 100644 index 0000000000..66ead6ea43 --- /dev/null +++ b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/turbulenceProperties b/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/turbulenceProperties deleted file mode 100644 index 53d4504f8e..0000000000 --- a/tutorials/incompressible/SRFPimpleFoam/rotor2D/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/incompressible/SRFSimpleFoam/mixer/constant/turbulenceProperties b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/momentumTransport similarity index 95% rename from tutorials/incompressible/SRFSimpleFoam/mixer/constant/turbulenceProperties rename to tutorials/incompressible/SRFSimpleFoam/mixer/constant/momentumTransport index a22a32cd34..1064dcbd3d 100644 --- a/tutorials/incompressible/SRFSimpleFoam/mixer/constant/turbulenceProperties +++ b/tutorials/incompressible/SRFSimpleFoam/mixer/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/turbulenceProperties b/tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/momentumTransport similarity index 100% rename from tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/turbulenceProperties rename to tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/constant/momentumTransport diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/momentumTransport similarity index 95% rename from tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties rename to tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/momentumTransport index df3dd58a2a..5e472644a7 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/turbulenceProperties +++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/pimpleFoam/laminar/pitzDailyPulse/constant/turbulenceProperties b/tutorials/incompressible/boundaryFoam/boundaryNonNewtonian/constant/momentumTransport similarity index 94% rename from tutorials/incompressible/pimpleFoam/laminar/pitzDailyPulse/constant/turbulenceProperties rename to tutorials/incompressible/boundaryFoam/boundaryNonNewtonian/constant/momentumTransport index e61cb31334..2f01fc7e26 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/pitzDailyPulse/constant/turbulenceProperties +++ b/tutorials/incompressible/boundaryFoam/boundaryNonNewtonian/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/momentumTransport b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/momentumTransport new file mode 100644 index 0000000000..66ead6ea43 --- /dev/null +++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties deleted file mode 100644 index 53d4504f8e..0000000000 --- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/momentumTransport b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/momentumTransport new file mode 100644 index 0000000000..66ead6ea43 --- /dev/null +++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/turbulenceProperties b/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/turbulenceProperties deleted file mode 100644 index 53d4504f8e..0000000000 --- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctionsProfile/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/LES/channel395/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/LES/channel395/constant/momentumTransport similarity index 97% rename from tutorials/incompressible/pimpleFoam/LES/channel395/constant/turbulenceProperties rename to tutorials/incompressible/pimpleFoam/LES/channel395/constant/momentumTransport index a9cc11e017..58fb2355fb 100644 --- a/tutorials/incompressible/pimpleFoam/LES/channel395/constant/turbulenceProperties +++ b/tutorials/incompressible/pimpleFoam/LES/channel395/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/momentumTransport b/tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/momentumTransport new file mode 100644 index 0000000000..66ead6ea43 --- /dev/null +++ b/tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/turbulenceProperties deleted file mode 100644 index 53d4504f8e..0000000000 --- a/tutorials/incompressible/pimpleFoam/RAS/TJunction/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/momentumTransport b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/momentumTransport new file mode 100644 index 0000000000..66ead6ea43 --- /dev/null +++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/turbulenceProperties deleted file mode 100644 index 53d4504f8e..0000000000 --- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/constant/momentumTransport similarity index 95% rename from tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/constant/turbulenceProperties rename to tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/constant/momentumTransport index aeafae6e48..339c027ad4 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/constant/turbulenceProperties +++ b/tutorials/incompressible/pimpleFoam/RAS/elipsekkLOmega/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/pimpleFoam/RAS/impeller/constant/momentumTransport b/tutorials/incompressible/pimpleFoam/RAS/impeller/constant/momentumTransport new file mode 100644 index 0000000000..8aee35a5df --- /dev/null +++ b/tutorials/incompressible/pimpleFoam/RAS/impeller/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/RAS/impeller/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/impeller/constant/turbulenceProperties deleted file mode 100644 index 52a27c8502..0000000000 --- a/tutorials/incompressible/pimpleFoam/RAS/impeller/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/momentumTransport b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/momentumTransport new file mode 100644 index 0000000000..8aee35a5df --- /dev/null +++ b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/turbulenceProperties deleted file mode 100644 index 52a27c8502..0000000000 --- a/tutorials/incompressible/pimpleFoam/RAS/oscillatingInletACMI2D/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/constant/momentumTransport similarity index 95% rename from tutorials/incompressible/pimpleFoam/RAS/pitzDaily/constant/turbulenceProperties rename to tutorials/incompressible/pimpleFoam/RAS/pitzDaily/constant/momentumTransport index ea7fed7428..75b58fc011 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/constant/turbulenceProperties +++ b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/pimpleFoam/RAS/pitzDailyLTS/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/pitzDailyLTS/constant/momentumTransport similarity index 95% rename from tutorials/incompressible/pimpleFoam/RAS/pitzDailyLTS/constant/turbulenceProperties rename to tutorials/incompressible/pimpleFoam/RAS/pitzDailyLTS/constant/momentumTransport index ea7fed7428..75b58fc011 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/pitzDailyLTS/constant/turbulenceProperties +++ b/tutorials/incompressible/pimpleFoam/RAS/pitzDailyLTS/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/momentumTransport b/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/momentumTransport new file mode 100644 index 0000000000..8aee35a5df --- /dev/null +++ b/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/turbulenceProperties deleted file mode 100644 index 52a27c8502..0000000000 --- a/tutorials/incompressible/pimpleFoam/RAS/propeller/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/momentumTransport similarity index 95% rename from tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/turbulenceProperties rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/momentumTransport index eeb9a72635..c91f505558 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/turbulenceProperties +++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_pimpleFoam/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/constant/momentumTransport similarity index 95% rename from tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/constant/turbulenceProperties rename to tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/constant/momentumTransport index 1cd2b94418..ab054d14f4 100644 --- a/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/constant/turbulenceProperties +++ b/tutorials/incompressible/pimpleFoam/RAS/wingMotion/wingMotion2D_simpleFoam/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/boundaryFoam/boundaryNonNewtonian/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/blockedChannel/constant/momentumTransport similarity index 94% rename from tutorials/incompressible/boundaryFoam/boundaryNonNewtonian/constant/turbulenceProperties rename to tutorials/incompressible/pimpleFoam/laminar/blockedChannel/constant/momentumTransport index e61cb31334..2f01fc7e26 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryNonNewtonian/constant/turbulenceProperties +++ b/tutorials/incompressible/pimpleFoam/laminar/blockedChannel/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/momentumTransport b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/incompressible/pimpleFoam/laminar/mixerVesselAMI2D/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/momentumTransport b/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/incompressible/pimpleFoam/laminar/movingCone/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/laminar/offsetCylinder/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/offsetCylinder/constant/momentumTransport similarity index 95% rename from tutorials/incompressible/pimpleFoam/laminar/offsetCylinder/constant/turbulenceProperties rename to tutorials/incompressible/pimpleFoam/laminar/offsetCylinder/constant/momentumTransport index 6abfa64a4f..5aea4a727f 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/offsetCylinder/constant/turbulenceProperties +++ b/tutorials/incompressible/pimpleFoam/laminar/offsetCylinder/constant/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/pimpleFoam/laminar/blockedChannel/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/pitzDailyPulse/constant/momentumTransport similarity index 94% rename from tutorials/incompressible/pimpleFoam/laminar/blockedChannel/constant/turbulenceProperties rename to tutorials/incompressible/pimpleFoam/laminar/pitzDailyPulse/constant/momentumTransport index e61cb31334..2f01fc7e26 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/blockedChannel/constant/turbulenceProperties +++ b/tutorials/incompressible/pimpleFoam/laminar/pitzDailyPulse/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/momentumTransport similarity index 98% rename from tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/turbulenceProperties rename to tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/momentumTransport index 96552ff0fc..c53afcc40d 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/turbulenceProperties +++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/constant/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarCouette/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/planarCouette/constant/momentumTransport similarity index 95% rename from tutorials/incompressible/pimpleFoam/laminar/planarCouette/constant/turbulenceProperties rename to tutorials/incompressible/pimpleFoam/laminar/planarCouette/constant/momentumTransport index b19a38e673..98849a1e3c 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/planarCouette/constant/turbulenceProperties +++ b/tutorials/incompressible/pimpleFoam/laminar/planarCouette/constant/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/turbulenceProperties b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/momentumTransport similarity index 95% rename from tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/turbulenceProperties rename to tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/momentumTransport index b19a38e673..98849a1e3c 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/turbulenceProperties +++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/constant/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/createFields.H b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/createFields.H index 0bdc85c920..3863cbbf37 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/createFields.H +++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/createFields.H @@ -19,11 +19,11 @@ const scalar nu2 = ).value(); Info<< "Reading viscoelastic properties\n" << endl; -IOdictionary turbulenceProperties +IOdictionary momentumTransport ( IOobject ( - "turbulenceProperties", + "momentumTransport", runTime.constant(), mesh, IOobject::MUST_READ, @@ -31,7 +31,7 @@ IOdictionary turbulenceProperties ) ); const dictionary& MaxwellCoeffs = - turbulenceProperties.subDict("laminar").subDict("MaxwellCoeffs"); + momentumTransport.subDict("laminar").subDict("MaxwellCoeffs"); const scalar nu1 = MaxwellCoeffs.lookup("nuM"); const scalar lambda = MaxwellCoeffs.lookup("lambda"); diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/Allrun b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/Allrun index 9f1f3fed03..a1d518cded 100755 --- a/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/Allrun +++ b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/Allrun @@ -5,7 +5,7 @@ # Set-up the LES case cp ../lesFiles/fvS* ../lesFiles/controlDict system/ -cp ../lesFiles/turbulenceProperties constant/ +cp ../lesFiles/momentumTransport constant/ ls -d processor* | xargs -I {} rm -rf ./{}/0 ls -d processor* | xargs -I {} mv ./{}/500 ./{}/0 diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/turbulenceProperties b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/momentumTransport similarity index 98% rename from tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/turbulenceProperties rename to tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/momentumTransport index a0cedfe79a..0dff68fdba 100644 --- a/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/turbulenceProperties +++ b/tutorials/incompressible/pisoFoam/LES/motorBike/lesFiles/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/momentumTransport similarity index 100% rename from tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/turbulenceProperties rename to tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/constant/momentumTransport diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDaily/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/LES/pitzDaily/constant/momentumTransport similarity index 98% rename from tutorials/incompressible/pisoFoam/LES/pitzDaily/constant/turbulenceProperties rename to tutorials/incompressible/pisoFoam/LES/pitzDaily/constant/momentumTransport index 3d1ba7b544..1bfcb35273 100644 --- a/tutorials/incompressible/pisoFoam/LES/pitzDaily/constant/turbulenceProperties +++ b/tutorials/incompressible/pisoFoam/LES/pitzDaily/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/constant/momentumTransport similarity index 97% rename from tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/constant/turbulenceProperties rename to tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/constant/momentumTransport index 65ec155e0b..8527dcbd3e 100644 --- a/tutorials/compressible/rhoPimpleFoam/LES/pitzDaily/constant/turbulenceProperties +++ b/tutorials/incompressible/pisoFoam/LES/pitzDailyMapped/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -89,5 +89,4 @@ LES } } - // ************************************************************************* // diff --git a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/RAS/cavity/constant/momentumTransport similarity index 95% rename from tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/constant/turbulenceProperties rename to tutorials/incompressible/pisoFoam/RAS/cavity/constant/momentumTransport index cba9ffa8ca..86ce7c7b42 100644 --- a/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/constant/turbulenceProperties +++ b/tutorials/incompressible/pisoFoam/RAS/cavity/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/combustion/coldEngineFoam/freePiston/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/constant/momentumTransport similarity index 95% rename from tutorials/combustion/coldEngineFoam/freePiston/constant/turbulenceProperties rename to tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/constant/momentumTransport index cba9ffa8ca..86ce7c7b42 100644 --- a/tutorials/combustion/coldEngineFoam/freePiston/constant/turbulenceProperties +++ b/tutorials/incompressible/pisoFoam/RAS/cavityCoupledU/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/momentumTransport b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/momentumTransport new file mode 100644 index 0000000000..2f01fc7e26 --- /dev/null +++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/momentumTransport @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + +// ************************************************************************* // diff --git a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/turbulenceProperties b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/turbulenceProperties deleted file mode 100644 index e61cb31334..0000000000 --- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/constant/turbulenceProperties +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/momentumTransport b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/momentumTransport new file mode 100644 index 0000000000..66ead6ea43 --- /dev/null +++ b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties b/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties deleted file mode 100644 index 53d4504f8e..0000000000 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/momentumTransport b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/momentumTransport new file mode 100644 index 0000000000..66ead6ea43 --- /dev/null +++ b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/turbulenceProperties b/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/turbulenceProperties deleted file mode 100644 index 53d4504f8e..0000000000 --- a/tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/incompressible/simpleFoam/T3A/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/T3A/constant/momentumTransport similarity index 95% rename from tutorials/incompressible/simpleFoam/T3A/constant/turbulenceProperties rename to tutorials/incompressible/simpleFoam/T3A/constant/momentumTransport index 90d9c24d34..2829241845 100644 --- a/tutorials/incompressible/simpleFoam/T3A/constant/turbulenceProperties +++ b/tutorials/incompressible/simpleFoam/T3A/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/airFoil2D/constant/momentumTransport similarity index 95% rename from tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties rename to tutorials/incompressible/simpleFoam/airFoil2D/constant/momentumTransport index 4b041c4885..1ae3e373bc 100644 --- a/tutorials/incompressible/simpleFoam/airFoil2D/constant/turbulenceProperties +++ b/tutorials/incompressible/simpleFoam/airFoil2D/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/momentumTransport similarity index 95% rename from tutorials/incompressible/simpleFoam/mixerVessel2D/constant/turbulenceProperties rename to tutorials/incompressible/simpleFoam/mixerVessel2D/constant/momentumTransport index ea7fed7428..75b58fc011 100644 --- a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/turbulenceProperties +++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/motorBike/constant/momentumTransport similarity index 95% rename from tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties rename to tutorials/incompressible/simpleFoam/motorBike/constant/momentumTransport index c954a7977c..7b9bfba2dd 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/constant/turbulenceProperties +++ b/tutorials/incompressible/simpleFoam/motorBike/constant/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/simpleFoam/pipeCyclic/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/pipeCyclic/constant/momentumTransport similarity index 95% rename from tutorials/incompressible/simpleFoam/pipeCyclic/constant/turbulenceProperties rename to tutorials/incompressible/simpleFoam/pipeCyclic/constant/momentumTransport index ec1331235e..55375dc677 100644 --- a/tutorials/incompressible/simpleFoam/pipeCyclic/constant/turbulenceProperties +++ b/tutorials/incompressible/simpleFoam/pipeCyclic/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/pitzDaily/constant/momentumTransport similarity index 95% rename from tutorials/incompressible/simpleFoam/pitzDaily/constant/turbulenceProperties rename to tutorials/incompressible/simpleFoam/pitzDaily/constant/momentumTransport index d5e7ebe480..4ff23a92c3 100644 --- a/tutorials/incompressible/simpleFoam/pitzDaily/constant/turbulenceProperties +++ b/tutorials/incompressible/simpleFoam/pitzDaily/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/momentumTransport similarity index 95% rename from tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties rename to tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/momentumTransport index ea7fed7428..75b58fc011 100644 --- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/turbulenceProperties +++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/simpleFoam/roomResidenceTime/constant/momentumTransport b/tutorials/incompressible/simpleFoam/roomResidenceTime/constant/momentumTransport new file mode 100644 index 0000000000..66ead6ea43 --- /dev/null +++ b/tutorials/incompressible/simpleFoam/roomResidenceTime/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/incompressible/simpleFoam/roomResidenceTime/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/roomResidenceTime/constant/turbulenceProperties deleted file mode 100644 index 53d4504f8e..0000000000 --- a/tutorials/incompressible/simpleFoam/roomResidenceTime/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/incompressible/simpleFoam/rotorDisk/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/rotorDisk/constant/momentumTransport similarity index 95% rename from tutorials/incompressible/simpleFoam/rotorDisk/constant/turbulenceProperties rename to tutorials/incompressible/simpleFoam/rotorDisk/constant/momentumTransport index 80588c18d0..4f4ddc4ff3 100644 --- a/tutorials/incompressible/simpleFoam/rotorDisk/constant/turbulenceProperties +++ b/tutorials/incompressible/simpleFoam/rotorDisk/constant/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/turbineSiting/constant/momentumTransport similarity index 96% rename from tutorials/incompressible/simpleFoam/turbineSiting/constant/turbulenceProperties rename to tutorials/incompressible/simpleFoam/turbineSiting/constant/momentumTransport index 87498de822..0712c09d25 100644 --- a/tutorials/incompressible/simpleFoam/turbineSiting/constant/turbulenceProperties +++ b/tutorials/incompressible/simpleFoam/turbineSiting/constant/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/turbulenceProperties b/tutorials/incompressible/simpleFoam/windAroundBuildings/constant/momentumTransport similarity index 100% rename from tutorials/incompressible/simpleFoam/windAroundBuildings/constant/turbulenceProperties rename to tutorials/incompressible/simpleFoam/windAroundBuildings/constant/momentumTransport diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/drift/constant/turbulenceProperties.air b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/momentumTransport.air similarity index 100% rename from test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/drift/constant/turbulenceProperties.air rename to tutorials/lagrangian/DPMFoam/Goldschmidt/constant/momentumTransport.air diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/negativeDrift/constant/turbulenceProperties.air b/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/momentumTransport.air similarity index 100% rename from test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/negativeDrift/constant/turbulenceProperties.air rename to tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/momentumTransport.air diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/turbulenceProperties.air b/tutorials/lagrangian/MPPICFoam/column/constant/momentumTransport.air similarity index 100% rename from tutorials/lagrangian/DPMFoam/Goldschmidt/constant/turbulenceProperties.air rename to tutorials/lagrangian/MPPICFoam/column/constant/momentumTransport.air diff --git a/tutorials/lagrangian/MPPICFoam/cyclone/constant/turbulenceProperties.air b/tutorials/lagrangian/MPPICFoam/cyclone/constant/momentumTransport.air similarity index 100% rename from tutorials/lagrangian/MPPICFoam/cyclone/constant/turbulenceProperties.air rename to tutorials/lagrangian/MPPICFoam/cyclone/constant/momentumTransport.air diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/turbulenceProperties.air b/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/momentumTransport.air similarity index 100% rename from tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/turbulenceProperties.air rename to tutorials/lagrangian/MPPICFoam/injectionChannel/constant/momentumTransport.air diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/momentumTransport similarity index 95% rename from tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties rename to tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/momentumTransport index af40a785ae..407eed87e7 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/momentumTransport b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/momentumTransport b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/momentumTransport b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/turbulenceProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/momentumTransport similarity index 94% rename from tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/turbulenceProperties rename to tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/momentumTransport index 46b3810858..008d821a72 100644 --- a/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/turbulenceProperties +++ b/tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/momentumTransport b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/lagrangian/reactingParcelFoam/cylinder/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/momentumTransport similarity index 95% rename from tutorials/lagrangian/reactingParcelFoam/filter/constant/turbulenceProperties rename to tutorials/lagrangian/reactingParcelFoam/filter/constant/momentumTransport index 60d00ffbd5..aea33b994f 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/turbulenceProperties +++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/momentumTransport similarity index 95% rename from tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/turbulenceProperties rename to tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/momentumTransport index 7b54ba30ad..58c1a6a647 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/turbulenceProperties +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/momentumTransport similarity index 94% rename from tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/turbulenceProperties rename to tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/momentumTransport index 445193e815..33f5caa341 100644 --- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/turbulenceProperties +++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/momentumTransport b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/lagrangian/reactingParcelFoam/rivuletPanel/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/momentumTransport b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/lagrangian/reactingParcelFoam/splashPanel/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/momentumTransport similarity index 95% rename from tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/turbulenceProperties rename to tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/momentumTransport index 890d57f3cd..63c9900305 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/turbulenceProperties +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/turbulenceProperties b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/momentumTransport similarity index 95% rename from tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/turbulenceProperties rename to tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/momentumTransport index 890d57f3cd..63c9900305 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/turbulenceProperties +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/momentumTransport similarity index 95% rename from tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties rename to tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/momentumTransport index 927d875237..3b193ed98a 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/turbulenceProperties +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/momentumTransport similarity index 95% rename from tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties rename to tutorials/lagrangian/sprayFoam/aachenBomb/constant/momentumTransport index 6c0d13827e..6dbcde3d4b 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/turbulenceProperties +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format binary; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/momentumTransport similarity index 97% rename from tutorials/multiphase/cavitatingFoam/LES/throttle/constant/turbulenceProperties rename to tutorials/multiphase/cavitatingFoam/LES/throttle/constant/momentumTransport index dd141411fd..3c50df4a15 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/turbulenceProperties +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/momentumTransport similarity index 97% rename from tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/turbulenceProperties rename to tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/momentumTransport index dd141411fd..3c50df4a15 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/turbulenceProperties +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/momentumTransport similarity index 95% rename from tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/turbulenceProperties rename to tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/momentumTransport index eeb9a72635..c91f505558 100644 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/turbulenceProperties +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/README b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/README index 7d86d1f62f..b1c6e1071f 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/README +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/README @@ -5,7 +5,7 @@ Reference: A two-phase solver for complex fluids: Studies of the Weissenberg effect. International Journal of Multiphase Flow, 84, 98-115. -In compressibleInterFoam with turbulenceProperties simulationType set to +In compressibleInterFoam with momentumTransport simulationType set to twoPhaseTransport separate stress models (laminar, non-Newtonian, LES or RAS) are instantiated for each of the two phases allowing for different modeling for the phases. @@ -13,13 +13,13 @@ the phases. This example case uses: - phases "air" and "liquid" - air phase - - constant/turbulenceProperties.air: + - constant/momentumTransport.air: - stress model set to laminar, Newtonian - constant/thermophysicalProperties.air: - transport set to const (Newtonian) - mu (dynamic viscoity) = 1.84e-5 - liquid phase - - constant/turbulenceProperties.liquid: + - constant/momentumTransport.liquid: - stress model set to laminar, Maxwell non-Newtonian - nuM (kinematic viscosity) = 0.01476 - lambda = 0.018225 diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/momentumTransport similarity index 94% rename from tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties rename to tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/momentumTransport index 80958d0914..0275896237 100644 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties +++ b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/IO/fileHandler/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/momentumTransport.air similarity index 100% rename from tutorials/IO/fileHandler/constant/turbulenceProperties rename to tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/momentumTransport.air diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.liquid b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/momentumTransport.liquid similarity index 100% rename from tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.liquid rename to tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/momentumTransport.liquid diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.air b/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.air deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/compressibleInterFoam/laminar/climbingRod/constant/turbulenceProperties.air +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/momentumTransport b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge2D/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/momentumTransport b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/compressibleInterFoam/laminar/depthCharge3D/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/sloshingTank2D/constant/momentumTransport b/tutorials/multiphase/compressibleInterFoam/laminar/sloshingTank2D/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/compressibleInterFoam/laminar/sloshingTank2D/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/laminar/sloshingTank2D/constant/turbulenceProperties b/tutorials/multiphase/compressibleInterFoam/laminar/sloshingTank2D/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/compressibleInterFoam/laminar/sloshingTank2D/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/momentumTransport b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties b/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/compressibleMultiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/turbulenceProperties b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/momentumTransport similarity index 95% rename from tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/turbulenceProperties rename to tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/momentumTransport index a4ed6daba4..6e0d17ffa4 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/turbulenceProperties +++ b/tutorials/multiphase/driftFluxFoam/RAS/dahl/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/turbulenceProperties b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/momentumTransport similarity index 95% rename from tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/turbulenceProperties rename to tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/momentumTransport index a4ed6daba4..6e0d17ffa4 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/turbulenceProperties +++ b/tutorials/multiphase/driftFluxFoam/RAS/mixerVessel2D/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/turbulenceProperties b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/momentumTransport similarity index 95% rename from tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/turbulenceProperties rename to tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/momentumTransport index a4ed6daba4..6e0d17ffa4 100644 --- a/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/turbulenceProperties +++ b/tutorials/multiphase/driftFluxFoam/RAS/tank3D/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/turbulenceProperties b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/momentumTransport similarity index 97% rename from tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/turbulenceProperties rename to tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/momentumTransport index ea13737f59..c7a9a0a52f 100644 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/momentumTransport similarity index 95% rename from tutorials/compressible/rhoPimpleFoam/RAS/cavity/constant/turbulenceProperties rename to tutorials/multiphase/interFoam/RAS/DTCHull/constant/momentumTransport index eeb9a72635..c91f505558 100644 --- a/tutorials/compressible/rhoPimpleFoam/RAS/cavity/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/momentumTransport b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/momentumTransport new file mode 100644 index 0000000000..c91f505558 --- /dev/null +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kOmegaSST; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/turbulenceProperties deleted file mode 100644 index eeb9a72635..0000000000 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kOmegaSST; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/constant/momentumTransport b/tutorials/multiphase/interFoam/RAS/DTCHullWave/constant/momentumTransport new file mode 100644 index 0000000000..c91f505558 --- /dev/null +++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kOmegaSST; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/DTCHullWave/constant/turbulenceProperties deleted file mode 100644 index eeb9a72635..0000000000 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kOmegaSST; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/momentumTransport b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/momentumTransport new file mode 100644 index 0000000000..8aee35a5df --- /dev/null +++ b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/angledDuct/constant/turbulenceProperties deleted file mode 100644 index 52a27c8502..0000000000 --- a/tutorials/multiphase/interFoam/RAS/angledDuct/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/momentumTransport b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/momentumTransport new file mode 100644 index 0000000000..8aee35a5df --- /dev/null +++ b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/turbulenceProperties deleted file mode 100644 index 52a27c8502..0000000000 --- a/tutorials/multiphase/interFoam/RAS/damBreak/damBreak/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/momentumTransport b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/momentumTransport new file mode 100644 index 0000000000..8aee35a5df --- /dev/null +++ b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/turbulenceProperties deleted file mode 100644 index 52a27c8502..0000000000 --- a/tutorials/multiphase/interFoam/RAS/damBreakPorousBaffle/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/momentumTransport b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/momentumTransport new file mode 100644 index 0000000000..8aee35a5df --- /dev/null +++ b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/floatingObject/constant/turbulenceProperties deleted file mode 100644 index 52a27c8502..0000000000 --- a/tutorials/multiphase/interFoam/RAS/floatingObject/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/momentumTransport similarity index 95% rename from tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/turbulenceProperties rename to tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/momentumTransport index 3daf2fe8f1..9cbb8c139b 100644 --- a/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/turbulenceProperties +++ b/tutorials/multiphase/interFoam/RAS/mixerVesselAMI/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/constant/momentumTransport b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/momentumTransport new file mode 100644 index 0000000000..c91f505558 --- /dev/null +++ b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kOmegaSST; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/waterChannel/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/waterChannel/constant/turbulenceProperties deleted file mode 100644 index eeb9a72635..0000000000 --- a/tutorials/multiphase/interFoam/RAS/waterChannel/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kOmegaSST; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/momentumTransport b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/momentumTransport new file mode 100644 index 0000000000..8aee35a5df --- /dev/null +++ b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/turbulenceProperties b/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/turbulenceProperties deleted file mode 100644 index 52a27c8502..0000000000 --- a/tutorials/multiphase/interFoam/RAS/weirOverflow/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/momentumTransport b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/interFoam/laminar/capillaryRise/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/momentumTransport b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/interFoam/laminar/damBreak/damBreak/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/momentumTransport b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/interFoam/laminar/damBreakWithObstacle/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/momentumTransport b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/interFoam/laminar/mixerVessel2D/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/momentumTransport b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/interFoam/laminar/sloshingCylinder/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/momentumTransport b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/momentumTransport b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank2D3DoF/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/momentumTransport b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/momentumTransport b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D3DoF/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/momentumTransport b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/interFoam/laminar/sloshingTank3D6DoF/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/momentumTransport b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/interFoam/laminar/testTubeMixer/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/wave/constant/momentumTransport b/tutorials/multiphase/interFoam/laminar/wave/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/interFoam/laminar/wave/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/laminar/wave/constant/turbulenceProperties b/tutorials/multiphase/interFoam/laminar/wave/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/interFoam/laminar/wave/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/momentumTransport b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/turbulenceProperties b/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/turbulenceProperties b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/momentumTransport similarity index 94% rename from tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/turbulenceProperties rename to tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/momentumTransport index e29ec469cf..0f1d25a311 100644 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/turbulenceProperties +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/constant/momentumTransport @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class dictionary; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interPhaseChangeFoam/propeller/constant/momentumTransport b/tutorials/multiphase/interPhaseChangeFoam/propeller/constant/momentumTransport new file mode 100644 index 0000000000..8aee35a5df --- /dev/null +++ b/tutorials/multiphase/interPhaseChangeFoam/propeller/constant/momentumTransport @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RAS; + +RAS +{ + model kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interPhaseChangeFoam/propeller/constant/turbulenceProperties b/tutorials/multiphase/interPhaseChangeFoam/propeller/constant/turbulenceProperties deleted file mode 100644 index 52a27c8502..0000000000 --- a/tutorials/multiphase/interPhaseChangeFoam/propeller/constant/turbulenceProperties +++ /dev/null @@ -1,30 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType RAS; - -RAS -{ - model kEpsilon; - - turbulence on; - - printCoeffs on; -} - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/momentumTransport b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/momentumTransport b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/turbulenceProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/momentumTransport b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/turbulenceProperties b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/momentumTransport b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties b/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/momentumTransport b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/momentumTransport b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/momentumTransport b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/constant/momentumTransport b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/constant/turbulenceProperties b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/momentumTransport b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/turbulenceProperties b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/fluidisedBed/constant/momentumTransport.air similarity index 100% rename from tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air rename to tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/fluidisedBed/constant/momentumTransport.air diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/fluidisedBed/constant/momentumTransport.particles similarity index 100% rename from tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles rename to tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/fluidisedBed/constant/momentumTransport.particles diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/momentumTransport.gas similarity index 100% rename from tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/turbulenceProperties.gas rename to tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/momentumTransport.gas diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/turbulenceProperties.gas2 b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/momentumTransport.gas2 similarity index 100% rename from tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/turbulenceProperties.gas2 rename to tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/momentumTransport.gas2 diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/momentumTransport.liquid similarity index 100% rename from tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/turbulenceProperties.liquid rename to tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/constant/momentumTransport.liquid diff --git a/tutorials/lagrangian/MPPICFoam/column/constant/turbulenceProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bed/constant/momentumTransport.air similarity index 100% rename from tutorials/lagrangian/MPPICFoam/column/constant/turbulenceProperties.air rename to tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bed/constant/momentumTransport.air diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/turbulenceProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bed/constant/momentumTransport.water similarity index 100% rename from test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/turbulenceProperties.water rename to tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bed/constant/momentumTransport.water diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/constant/turbulenceProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/momentumTransport.air similarity index 100% rename from tutorials/lagrangian/MPPICFoam/injectionChannel/constant/turbulenceProperties.air rename to tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/momentumTransport.air diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/turbulenceProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/momentumTransport.water similarity index 100% rename from test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/turbulenceProperties.water rename to tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/momentumTransport.water diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/turbulenceProperties.air1 b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/momentumTransport.air1 similarity index 100% rename from test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/turbulenceProperties.air1 rename to tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/momentumTransport.air1 diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/turbulenceProperties.air2 b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/momentumTransport.air2 similarity index 100% rename from test/multiphase/reactingMultiphaseEulerFoam/populationBalance/binaryBreakup/constant/turbulenceProperties.air2 rename to tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/momentumTransport.air2 diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/turbulenceProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/momentumTransport.water similarity index 100% rename from test/multiphase/reactingMultiphaseEulerFoam/populationBalance/coalescence/constant/turbulenceProperties.water rename to tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/momentumTransport.water diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/turbulenceProperties.air1 b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/turbulenceProperties.air1 deleted file mode 100644 index e929d82a62..0000000000 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/turbulenceProperties.air1 +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.air1; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/turbulenceProperties.air2 b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/turbulenceProperties.air2 deleted file mode 100644 index 544717914f..0000000000 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/turbulenceProperties.air2 +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.air2; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/turbulenceProperties.air1 b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/momentumTransport.air1 similarity index 100% rename from test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/turbulenceProperties.air1 rename to tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/momentumTransport.air1 diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/turbulenceProperties.air2 b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/momentumTransport.air2 similarity index 100% rename from test/multiphase/reactingMultiphaseEulerFoam/populationBalance/breakup/constant/turbulenceProperties.air2 rename to tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/momentumTransport.air2 diff --git a/test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/turbulenceProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/momentumTransport.water similarity index 100% rename from test/multiphase/reactingMultiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/turbulenceProperties.water rename to tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/momentumTransport.water diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/turbulenceProperties.air1 b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/turbulenceProperties.air1 deleted file mode 100644 index e929d82a62..0000000000 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/turbulenceProperties.air1 +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.air1; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/turbulenceProperties.air2 b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/turbulenceProperties.air2 deleted file mode 100644 index 544717914f..0000000000 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/turbulenceProperties.air2 +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.air2; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/momentumTransport b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/momentumTransport new file mode 100644 index 0000000000..ad347cd981 --- /dev/null +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/momentumTransport @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object momentumTransport; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bed/constant/turbulenceProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/momentumTransport.air similarity index 100% rename from tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bed/constant/turbulenceProperties.air rename to tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/momentumTransport.air diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/turbulenceProperties.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/momentumTransport.mercury similarity index 100% rename from tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/turbulenceProperties.mercury rename to tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/momentumTransport.mercury diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/turbulenceProperties.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/momentumTransport.oil similarity index 100% rename from tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/turbulenceProperties.oil rename to tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/momentumTransport.oil diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/drift/constant/turbulenceProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/momentumTransport.water similarity index 100% rename from test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/drift/constant/turbulenceProperties.water rename to tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/momentumTransport.water diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/turbulenceProperties b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/turbulenceProperties deleted file mode 100644 index ff13edf0a6..0000000000 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/turbulenceProperties +++ /dev/null @@ -1,21 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Version: dev - \\/ M anipulation | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - - -// ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/momentumTransport.air similarity index 100% rename from tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air rename to tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/momentumTransport.air diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.mercury b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/momentumTransport.mercury similarity index 100% rename from tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.mercury rename to tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/momentumTransport.mercury diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.oil b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/momentumTransport.oil similarity index 100% rename from tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.oil rename to tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/momentumTransport.oil diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/negativeDrift/constant/turbulenceProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/momentumTransport.water similarity index 100% rename from test/multiphase/reactingTwoPhaseEulerFoam/populationBalance/negativeDrift/constant/turbulenceProperties.water rename to tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/momentumTransport.water diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/turbulenceProperties.air b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/constant/momentumTransport.air similarity index 100% rename from tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/turbulenceProperties.air rename to tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/constant/momentumTransport.air diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/thermal/waterEvaporation/constant/turbulenceProperties.water b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/constant/momentumTransport.water similarity index 100% rename from test/multiphase/reactingTwoPhaseEulerFoam/thermal/waterEvaporation/constant/turbulenceProperties.water rename to tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/constant/momentumTransport.water diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/momentumTransport.air similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/momentumTransport.air diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/momentumTransport.water similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/constant/momentumTransport.water diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/momentumTransport.gas similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.gas rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/momentumTransport.gas diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.solids b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/momentumTransport.solids similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/turbulenceProperties.solids rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/LBend/constant/momentumTransport.solids diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/momentumTransport.air similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/momentumTransport.air diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/momentumTransport.water similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/constant/momentumTransport.water diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/momentumTransport.gas similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.gas rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/momentumTransport.gas diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/momentumTransport.liquid similarity index 100% rename from test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/turbulenceProperties.liquid rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/momentumTransport.liquid diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/momentumTransport.air similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.air rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/momentumTransport.air diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/momentumTransport.water similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/turbulenceProperties.water rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnPolydisperse/constant/momentumTransport.water diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubblePipe/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubblePipe/constant/momentumTransport.gas similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubblePipe/constant/turbulenceProperties.gas rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubblePipe/constant/momentumTransport.gas diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubblePipe/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubblePipe/constant/momentumTransport.liquid similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubblePipe/constant/turbulenceProperties.liquid rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubblePipe/constant/momentumTransport.liquid diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/momentumTransport.air similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/momentumTransport.air diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/momentumTransport.particles similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/constant/momentumTransport.particles diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/momentumTransport.gas similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.gas rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/momentumTransport.gas diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/momentumTransport.liquid similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/turbulenceProperties.liquid rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/momentumTransport.liquid diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/momentumTransport.gas similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.gas rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/momentumTransport.gas diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/momentumTransport.liquid similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/turbulenceProperties.liquid rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/momentumTransport.liquid diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/momentumTransport.gas similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/turbulenceProperties.gas rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/momentumTransport.gas diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/momentumTransport.liquid similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/turbulenceProperties.liquid rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolydisperse/constant/momentumTransport.liquid diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/momentumTransport.air similarity index 100% rename from tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/momentumTransport.air diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bed/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/momentumTransport.water similarity index 100% rename from tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bed/constant/turbulenceProperties.water rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/momentumTransport.water diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/momentumTransport.gas similarity index 100% rename from test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/constant/turbulenceProperties.gas rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/momentumTransport.gas diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterEvaporation/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/momentumTransport.liquid similarity index 100% rename from test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterEvaporation/constant/turbulenceProperties.liquid rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/momentumTransport.liquid diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.gas deleted file mode 100644 index 285ddd77a9..0000000000 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.gas +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.gas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.liquid deleted file mode 100644 index 6e5db62329..0000000000 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/constant/turbulenceProperties.liquid +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.liquid; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterEvaporation/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/momentumTransport.gas similarity index 100% rename from test/multiphase/reactingTwoPhaseEulerFoam/interfaceComposition/waterEvaporation/constant/turbulenceProperties.gas rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/momentumTransport.gas diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/momentumTransport.liquid similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumnEvaporatingReacting/constant/turbulenceProperties.liquid rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/momentumTransport.liquid diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.gas deleted file mode 100644 index 285ddd77a9..0000000000 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.gas +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.gas; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.liquid deleted file mode 100644 index 6e5db62329..0000000000 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporatingDissolving/constant/turbulenceProperties.liquid +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.liquid; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/momentumTransport.air similarity index 100% rename from tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/constant/turbulenceProperties.air rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/momentumTransport.air diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/momentumTransport.water similarity index 100% rename from tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/momentumTransport.water diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water deleted file mode 100644 index e23bf545cc..0000000000 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/momentumTransport.air similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/momentumTransport.air diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/momentumTransport.particles similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/momentumTransport.particles diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/momentumTransport.air similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/momentumTransport.air diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/momentumTransport.water similarity index 100% rename from tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnFixedPolydisperse/constant/turbulenceProperties.water rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/momentumTransport.water diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water deleted file mode 100644 index e23bf545cc..0000000000 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/momentumTransport.air similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/momentumTransport.air diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/momentumTransport.water similarity index 100% rename from tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumnPolydisperse/constant/turbulenceProperties.water rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/momentumTransport.water diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water deleted file mode 100644 index e23bf545cc..0000000000 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/test/multiphase/reactingTwoPhaseEulerFoam/thermal/waterEvaporation/constant/turbulenceProperties.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/momentumTransport.steam similarity index 100% rename from test/multiphase/reactingTwoPhaseEulerFoam/thermal/waterEvaporation/constant/turbulenceProperties.steam rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/momentumTransport.steam diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/momentumTransport.water similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.water rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/momentumTransport.water diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam deleted file mode 100644 index 242dcd5467..0000000000 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/turbulenceProperties.steam +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.steam; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesis/constant/turbulenceProperties.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesis/constant/momentumTransport.particles similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesis/constant/turbulenceProperties.particles rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesis/constant/momentumTransport.particles diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesis/constant/turbulenceProperties.vapor b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesis/constant/momentumTransport.vapor similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesis/constant/turbulenceProperties.vapor rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesis/constant/momentumTransport.vapor diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesisSurface/constant/turbulenceProperties.particles b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesisSurface/constant/momentumTransport.particles similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesisSurface/constant/turbulenceProperties.particles rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesisSurface/constant/momentumTransport.particles diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesisSurface/constant/turbulenceProperties.vapor b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesisSurface/constant/momentumTransport.vapor similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesisSurface/constant/turbulenceProperties.vapor rename to tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/titaniaSynthesisSurface/constant/momentumTransport.vapor diff --git a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/turbulenceProperties b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/momentumTransport similarity index 94% rename from tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/turbulenceProperties rename to tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/momentumTransport index 46b3810858..008d821a72 100644 --- a/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/turbulenceProperties +++ b/tutorials/multiphase/twoLiquidMixingFoam/lockExchange/constant/momentumTransport @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "constant"; - object turbulenceProperties; + object momentumTransport; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/momentumTransport.air similarity index 100% rename from tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.air rename to tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/momentumTransport.air diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/momentumTransport.water similarity index 100% rename from tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/turbulenceProperties.water rename to tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/momentumTransport.water diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/momentumTransport.air similarity index 100% rename from tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.air rename to tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/momentumTransport.air diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/momentumTransport.water similarity index 100% rename from tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/turbulenceProperties.water rename to tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/momentumTransport.water diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/momentumTransport.air similarity index 100% rename from tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.air rename to tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/momentumTransport.air diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/momentumTransport.particles similarity index 100% rename from tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles rename to tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/momentumTransport.particles diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/momentumTransport.air similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air rename to tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/momentumTransport.air diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/momentumTransport.water similarity index 100% rename from tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/damBreak4phase/constant/turbulenceProperties.water rename to tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/momentumTransport.water diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water deleted file mode 100644 index e23bf545cc..0000000000 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/momentumTransport.air similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air rename to tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/momentumTransport.air diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/momentumTransport.water similarity index 100% rename from tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water rename to tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/momentumTransport.water diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water deleted file mode 100644 index e23bf545cc..0000000000 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/momentumTransport.air similarity index 100% rename from tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air rename to tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/momentumTransport.air diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/momentumTransport.particles similarity index 100% rename from tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles rename to tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/momentumTransport.particles diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/momentumTransport.air similarity index 100% rename from tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air rename to tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/momentumTransport.air diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/momentumTransport.water similarity index 100% rename from tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/trickleBed/constant/turbulenceProperties.water rename to tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/momentumTransport.water diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air deleted file mode 100644 index 32e9e1ba67..0000000000 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.air; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water deleted file mode 100644 index e23bf545cc..0000000000 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/momentumTransport.air similarity index 100% rename from tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air rename to tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/momentumTransport.air diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/momentumTransport.water similarity index 100% rename from tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water rename to tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/momentumTransport.water diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air deleted file mode 100644 index 32e9e1ba67..0000000000 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.air; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water deleted file mode 100644 index e23bf545cc..0000000000 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water +++ /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 | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - location "constant"; - object turbulenceProperties.water; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -simulationType laminar; - -// ************************************************************************* //