From 8a5ee8aac1c05482ba8a225c5218cef891021030 Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Thu, 25 Mar 2021 11:04:09 +0000 Subject: [PATCH] MomentumTransportModels: Library builds of multiphase models The MomentumTransportModels library now builds of a standard set of phase-incompressible and phase-compressible models. This replaces most solver-specific builds of these models. This has been made possible by the addition of a new "dynamicTransportModel" interface, from which all transport classes used by the momentum transport models now derive. For the purpose of disambiguation, the old "transportModel" has also been renamed "kinematicTransportModel". This change has been made in order to create a consistent definition of phase-incompressible and phase-compressible MomentumTransportModels, which can then be looked up by functionObjects, fvModels, and similar. Some solvers still build specific momentum transport models, but these are now in addition to the standard set. The solver does not build all the models it uses. There are also corresponding centralised builds of phase dependent ThermophysicalTransportModels. --- .../solvers/combustion/PDRFoam/Make/options | 5 +- .../solvers/combustion/PDRFoam/PDRFoam.C | 2 +- .../combustion/PDRFoam/PDRFoamAutoRefine.C | 4 +- .../dragModels/PDRDragModel/PDRDragModel.H | 4 +- .../turbulence/PDRkEpsilon/PDRkEpsilon.C | 6 +- .../turbulence/PDRkEpsilon/PDRkEpsilon.H | 6 +- .../XiModels/XiEqModels/XiEqModel/XiEqModel.H | 4 +- .../XiModels/XiGModels/XiGModel/XiGModel.H | 4 +- .../PDRFoam/XiModels/XiModel/XiModel.H | 4 +- .../solvers/combustion/XiFoam/Make/options | 3 +- .../XiFoam/XiEngineFoam/Make/options | 3 +- .../XiFoam/XiEngineFoam/XiEngineFoam.C | 2 +- .../solvers/combustion/XiFoam/XiFoam.C | 2 +- .../solvers/combustion/chemFoam/Make/options | 1 + .../combustion/coldEngineFoam/Make/options | 3 +- .../coldEngineFoam/coldEngineFoam.C | 2 +- .../solvers/combustion/fireFoam/Make/options | 3 +- .../solvers/combustion/fireFoam/fireFoam.C | 2 +- .../combustion/reactingFoam/Make/options | 3 +- .../buoyantReactingFoam/Make/options | 3 +- .../buoyantReactingFoam/buoyantReactingFoam.C | 2 +- .../combustion/reactingFoam/reactingFoam.C | 2 +- .../rhoCentralFoam/BCs/Make/options | 1 + .../compressible/rhoCentralFoam/Make/options | 3 +- .../rhoCentralFoam/rhoCentralFoam.C | 4 +- .../compressible/rhoPimpleFoam/Make/options | 3 +- .../rhoPimpleFoam/rhoPimpleFoam.C | 2 +- .../compressible/rhoSimpleFoam/Make/options | 3 +- .../rhoPorousSimpleFoam/Make/options | 3 +- .../rhoPorousSimpleFoam/rhoPorousSimpleFoam.C | 2 +- .../rhoSimpleFoam/rhoSimpleFoam.C | 2 +- .../buoyantPimpleFoam/Make/options | 3 +- .../buoyantPimpleFoam/buoyantPimpleFoam.C | 2 +- .../buoyantSimpleFoam/Make/options | 3 +- .../buoyantSimpleFoam/buoyantSimpleFoam.C | 2 +- .../chtMultiRegionFoam/Make/options | 3 +- .../chtMultiRegionFoam/chtMultiRegionFoam.C | 2 +- .../heatTransfer/thermoFoam/Make/options | 3 +- .../heatTransfer/thermoFoam/thermoFoam.C | 2 +- .../adjointShapeOptimizationFoam/Make/options | 2 +- .../incompressible/boundaryFoam/Make/options | 2 +- .../nonNewtonianIcoFoam/Make/options | 2 +- .../incompressible/pimpleFoam/Make/options | 2 +- .../pimpleFoam/SRFPimpleFoam/Make/options | 2 +- .../incompressible/pisoFoam/Make/options | 2 +- .../incompressible/simpleFoam/Make/options | 3 +- .../simpleFoam/SRFSimpleFoam/Make/options | 2 +- .../simpleFoam/porousSimpleFoam/Make/options | 2 +- .../lagrangian/denseParticleFoam/Allwclean | 9 - .../lagrangian/denseParticleFoam/Allwmake | 11 -- .../lagrangian/denseParticleFoam/Make/options | 7 +- .../denseParticleFoam/createFields.H | 5 +- .../denseParticleFoam/denseParticleFoam.C | 2 +- .../Make/files | 3 - .../Make/options | 8 - .../lagrangian/particleFoam/Make/options | 2 +- .../reactingParticleFoam/Make/options | 3 +- .../buoyantReactingParticleFoam/Make/options | 3 +- .../buoyantReactingParticleFoam.C | 2 +- .../engineFoam/Make/options | 3 +- .../engineFoam/engineFoam.C | 2 +- .../reactingParticleFoam.C | 2 +- .../lagrangian/rhoParticleFoam/Make/options | 3 +- .../rhoParticleFoam/rhoParticleFoam.C | 4 +- .../simpleReactingParticleFoam/Make/options | 3 +- .../simpleReactingParticleFoam.C | 2 +- .../compressibleInterFoam/Allwclean | 2 +- .../multiphase/compressibleInterFoam/Allwmake | 2 +- .../compressibleInterFoam/Make/options | 14 +- .../Make/files | 4 - .../Make/files | 3 + .../Make/options | 6 +- .../compressibleInterPhaseTransportModel.C | 6 +- .../compressibleInterPhaseTransportModel.H | 12 +- .../surfaceTensionModels/Make/options | 3 +- .../twoPhaseChange/Make/options | 3 +- .../twoPhaseMixtureThermo/Make/options | 1 + .../Make/options | 3 +- .../compressibleMultiphaseInterFoam.C | 4 +- .../multiphaseMixtureThermo/Make/options | 1 + .../multiphase/driftFluxFoam/Make/files | 1 - .../multiphase/driftFluxFoam/Make/options | 2 +- .../compressibleMomentumTransportModels.C | 104 ----------- .../multiphase/driftFluxFoam/createFields.H | 8 +- .../multiphase/driftFluxFoam/driftFluxFoam.C | 2 +- ...incompressibleTwoPhaseInteractingMixture.C | 3 +- ...incompressibleTwoPhaseInteractingMixture.H | 7 +- .../mixtureViscosityModels/Make/options | 2 +- .../relativeVelocityModels/Make/options | 2 +- .../interFoam/interMixingFoam/Make/options | 2 +- .../incompressibleThreePhaseMixture.C | 4 +- .../incompressibleThreePhaseMixture.H | 6 +- .../multiphase/multiphaseEulerFoam/Allwclean | 1 - .../multiphase/multiphaseEulerFoam/Allwmake | 1 - .../functionObjects/Make/options | 20 +- .../interfacialCompositionModels/Make/options | 1 + .../interfacialModels/Make/options | 1 + .../turbulentDispersionModels/Burns/Burns.C | 4 +- .../turbulentDispersionModels/Gosman/Gosman.C | 4 +- .../LopezDeBertodano/LopezDeBertodano.C | 4 +- .../constantTurbulentDispersionCoefficient.C | 4 +- .../turbulentDispersionModel.C | 8 +- .../turbulentDispersionModel.H | 10 +- .../Make/files | 4 +- .../Make/options | 6 +- ...ayatillekeWallFunctionFvPatchScalarField.C | 8 +- ...allBoilingWallFunctionFvPatchScalarField.C | 12 +- .../kineticTheoryModel/kineticTheoryModel.C | 21 ++- .../kineticTheoryModel/kineticTheoryModel.H | 10 +- .../Gidaspow/GidaspowViscosity.H | 4 +- .../HrenyaSinclair/HrenyaSinclairViscosity.H | 4 +- .../viscosityModel/Syamlal/SyamlalViscosity.H | 4 +- .../viscosityModel/none/noneViscosity.H | 4 +- ...yModel.C => kineticTheoryViscosityModel.C} | 4 +- ...yModel.H => kineticTheoryViscosityModel.H} | 6 +- ...New.C => kineticTheoryViscosityModelNew.C} | 4 +- ...phaseCompressibleMomentumTransportModels.C | 70 ++----- .../phasePressureModel/phasePressureModel.C | 13 +- .../phasePressureModel/phasePressureModel.H | 8 +- .../multiphaseEulerFoam/Make/options | 5 +- .../multiphaseEulerFoam/multiphaseEulerFoam.C | 2 +- .../multiphaseSystems/Make/options | 1 + .../multiphaseReactions/Make/options | 1 + .../Make/files | 4 - .../phaseSystems/Make/options | 1 + .../IATE/IATEsources/IATEsource/IATEsource.C | 4 +- .../MovingPhaseModel/MovingPhaseModel.C | 22 +-- .../MovingPhaseModel/MovingPhaseModel.H | 44 ++++- .../ThermoPhaseModel/ThermoPhaseModel.C | 3 +- .../ThermoPhaseModel/ThermoPhaseModel.H | 7 +- .../phaseModel/phaseModel/phaseModel.H | 1 - .../LehrMilliesMewes/LehrMilliesMewes.C | 4 +- .../LuoSvendsen/LuoSvendsen.C | 4 +- .../LaakkonenAlopaeusAittamaa.C | 4 +- .../CoulaloglouTavlaridesCoalescence.C | 4 +- .../LehrMilliesMewesCoalescence.C | 4 +- .../coalescenceModels/Luo/Luo.C | 4 +- .../PrinceBlanch/PrinceBlanch.C | 2 +- .../turbulentShear/turbulentShear.C | 4 +- .../populationBalanceModel.C | 6 +- .../populationBalanceModel.H | 6 +- .../multiphaseInterFoam/Make/options | 2 +- .../multiphaseMixture/Make/options | 2 +- .../multiphaseMixture/multiphaseMixture.C | 4 +- .../multiphaseMixture/multiphaseMixture.H | 10 +- .../potentialFreeSurfaceFoam/Make/options | 2 +- .../solidDisplacementFoam/Make/options | 1 + .../solidDisplacementThermo/Make/options | 1 + .../Make/options | 1 + .../mesh/advanced/PDRMesh/Make/options | 2 +- .../postProcessing/postProcess/Make/options | 6 +- .../applyBoundaryLayer/Make/options | 2 +- .../Make/options | 2 +- src/Allwmake | 3 +- src/MomentumTransportModels/Allwmake | 4 +- .../CompressibleMomentumTransportModel.H | 19 +- .../compressible/Make/files | 4 +- .../compressible/Make/options | 10 +- .../compressibleMomentumTransportModel.H | 17 +- .../dynamicMomentumTransportModel.C} | 4 +- .../dynamicMomentumTransportModel.H} | 16 +- .../dynamicMomentumTransportModels.C} | 6 +- .../dynamicMomentumTransportModels.H} | 12 +- .../makeMomentumTransportModel.H | 175 ------------------ .../incompressible/Make/options | 2 +- .../kinematicMomentumTransportModel.H | 6 +- .../kinematicMomentumTransportModels.C | 4 +- .../kinematicMomentumTransportModels.H | 16 +- .../makeMomentumTransportModel.H | 25 ++- .../phaseCompressible/LES/Niceno/NicenoKEqn.C | 14 +- .../LES/SmagorinskyZhang/SmagorinskyZhang.C | 10 +- .../LES/continuousGasKEqn/continuousGasKEqn.C | 6 +- .../phaseCompressible/Make/files | 3 + .../phaseCompressible/Make/options | 11 ++ .../PhaseCompressibleMomentumTransportModel.H | 19 +- .../RAS/LaheyKEpsilon/LaheyKEpsilon.C | 14 +- .../continuousGasKEpsilon.C | 15 +- .../RAS/kOmegaSSTSato/kOmegaSSTSato.C | 2 +- .../RAS/mixtureKEpsilon/mixtureKEpsilon.C | 18 +- .../phaseDynamicMomentumTransportModel.C | 47 +++-- .../phaseDynamicMomentumTransportModel.H | 92 +++++++++ .../phaseDynamicMomentumTransportModels.C | 85 +++++++++ .../phaseDynamicMomentumTransportModels.H | 54 +----- .../phaseIncompressible/Make/files | 3 + .../phaseIncompressible/Make/options | 11 ++ .../phaseKinematicMomentumTransportModel.C | 43 +++-- .../phaseKinematicMomentumTransportModel.H | 92 +++++++++ .../phaseKinematicMomentumTransportModels.C | 85 +++++++++ .../phaseKinematicMomentumTransportModels.H | 37 +--- src/OpenFOAM/include/listOptions.H | 2 +- src/OpenFOAM/include/listOutput.H | 2 +- src/ThermophysicalTransportModels/Allwmake | 2 + .../Make/options | 1 + .../fluidReactionThermo/Make/options | 1 + ...luidReactionThermophysicalTransportModel.H | 4 +- ...uidReactionThermophysicalTransportModels.C | 2 +- ...uidReactionThermophysicalTransportModels.H | 14 +- .../fluidThermophysicalTransportModel.H | 5 +- .../fluidThermophysicalTransportModels.C | 4 +- .../fluidThermophysicalTransportModels.H | 14 +- .../phaseFluidReactionThermo/Make/files | 3 + .../phaseFluidReactionThermo}/Make/options | 22 ++- ...luidReactionThermophysicalTransportModel.H | 82 ++++++++ ...uidReactionThermophysicalTransportModels.C | 71 +++++++ ...uidReactionThermophysicalTransportModels.H | 71 ++----- .../phaseFluidThermo/Make/files | 3 + .../phaseFluidThermo/Make/options | 17 ++ .../phaseFluidThermophysicalTransportModel.H | 82 ++++++++ .../phaseFluidThermophysicalTransportModels.C | 71 +++++++ .../phaseFluidThermophysicalTransportModels.H | 78 ++------ src/atmosphericModels/Make/options | 2 +- src/combustionModels/Make/options | 3 +- .../combustionModel/combustionModel.H | 4 +- src/functionObjects/field/Make/options | 5 +- .../field/shearStress/shearStress.C | 4 +- .../wallHeatTransferCoeff.C | 23 +-- .../ReynoldsAnalogy/ReynoldsAnalogy.C | 4 +- .../wallHeatTransferCoeffModel.C | 4 +- .../field/wallShearStress/wallShearStress.C | 2 +- src/functionObjects/forces/Make/options | 6 +- src/functionObjects/forces/forces/forces.C | 9 +- src/functionObjects/lagrangian/Make/options | 2 +- src/functionObjects/solvers/Make/options | 6 +- .../solvers/scalarTransport/scalarTransport.C | 2 +- src/fvConstraints/Make/options | 3 +- src/fvModels/Make/options | 3 +- src/lagrangian/parcel/Make/options | 3 +- src/lagrangian/parcelTurbulence/Make/options | 5 +- src/radiationModels/Make/options | 1 + .../surfaceFilmModels/Make/options | 1 + .../wallFunctions/Make/options | 3 +- .../nutkFilmWallFunctionFvPatchScalarField.C | 4 +- .../thermalBaffleModels/Make/options | 3 +- src/specieTransfer/Make/options | 3 +- src/thermophysicalModels/basic/Make/options | 2 + .../basic/fluidThermo/fluidThermo.H | 8 +- .../chemistryModel/Make/options | 1 + .../laminarFlameSpeed/Make/options | 1 + .../reactionThermo/Make/options | 1 + .../solidThermo/Make/options | 1 + src/transportModels/Make/files | 6 +- .../dynamicTransportModel.C | 34 ++-- .../dynamicTransportModel.H | 69 ++++--- .../kinematicTransportModel.C} | 18 +- .../kinematicTransportModel.H} | 31 ++-- .../singlePhaseTransportModel.C | 2 +- .../singlePhaseTransportModel.H | 6 +- .../viscosityModels/BirdCarreau/BirdCarreau.H | 2 +- .../viscosityModels/Casson/Casson.C | 2 +- .../viscosityModels/Casson/Casson.H | 2 +- .../CrossPowerLaw/CrossPowerLaw.C | 2 +- .../CrossPowerLaw/CrossPowerLaw.H | 2 +- .../HerschelBulkley/HerschelBulkley.C | 2 +- .../HerschelBulkley/HerschelBulkley.H | 2 +- .../viscosityModels/Newtonian/Newtonian.C | 2 +- .../viscosityModels/Newtonian/Newtonian.H | 2 +- .../viscosityModels/powerLaw/powerLaw.C | 2 +- .../viscosityModels/powerLaw/powerLaw.H | 2 +- .../strainRateFunction/strainRateFunction.C | 2 +- .../strainRateFunction/strainRateFunction.H | 2 +- .../viscosityModel/viscosityModel.C | 2 +- .../viscosityModel/viscosityModel.H | 2 +- .../viscosityModel/viscosityModelNew.C | 2 +- .../Make/options | 2 +- .../incompressibleTwoPhaseMixture.H | 6 +- .../system/continuity | 1 + .../waterEvaporation/system/continuity | 1 + .../waterEvaporation/system/continuity | 1 + .../validation/WatersKing/Make/options | 2 +- 269 files changed, 1509 insertions(+), 1181 deletions(-) delete mode 100755 applications/solvers/lagrangian/denseParticleFoam/Allwclean delete mode 100755 applications/solvers/lagrangian/denseParticleFoam/Allwmake delete mode 100644 applications/solvers/lagrangian/denseParticleFoam/denseParticleMomentumTransportModels/Make/files delete mode 100644 applications/solvers/lagrangian/denseParticleFoam/denseParticleMomentumTransportModels/Make/options delete mode 100644 applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/Make/files create mode 100644 applications/solvers/multiphase/compressibleInterFoam/compressibleInterPhaseTransportModel/Make/files rename applications/solvers/multiphase/compressibleInterFoam/{VoFphaseCompressibleMomentumTransportModels => compressibleInterPhaseTransportModel}/Make/options (82%) rename applications/solvers/multiphase/compressibleInterFoam/{VoFphaseCompressibleMomentumTransportModels => compressibleInterPhaseTransportModel}/compressibleInterPhaseTransportModel.C (96%) rename applications/solvers/multiphase/compressibleInterFoam/{VoFphaseCompressibleMomentumTransportModels => compressibleInterPhaseTransportModel}/compressibleInterPhaseTransportModel.H (93%) delete mode 100644 applications/solvers/multiphase/driftFluxFoam/compressibleMomentumTransportModels.C rename applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/{viscosityModel.C => kineticTheoryViscosityModel.C} (94%) rename applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/{viscosityModel.H => kineticTheoryViscosityModel.H} (95%) rename applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/{viscosityModelNew.C => kineticTheoryViscosityModelNew.C} (95%) delete mode 100644 applications/solvers/multiphase/multiphaseEulerFoam/multiphaseThermophysicalTransportModels/Make/files rename src/MomentumTransportModels/compressible/{fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModel.C => dynamicMomentumTransportModels/dynamicMomentumTransportModel.C} (94%) rename src/MomentumTransportModels/compressible/{fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModel.H => dynamicMomentumTransportModels/dynamicMomentumTransportModel.H} (87%) rename src/MomentumTransportModels/compressible/{fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModels.C => dynamicMomentumTransportModels/dynamicMomentumTransportModels.C} (96%) rename src/MomentumTransportModels/compressible/{fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModels.H => dynamicMomentumTransportModels/dynamicMomentumTransportModels.H} (85%) delete mode 100644 src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/makeMomentumTransportModel.H create mode 100644 src/MomentumTransportModels/phaseCompressible/Make/files create mode 100644 src/MomentumTransportModels/phaseCompressible/Make/options rename applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModelFwd.H => src/MomentumTransportModels/phaseCompressible/phaseDynamicMomentumTransportModels/phaseDynamicMomentumTransportModel.C (59%) create mode 100644 src/MomentumTransportModels/phaseCompressible/phaseDynamicMomentumTransportModels/phaseDynamicMomentumTransportModel.H create mode 100644 src/MomentumTransportModels/phaseCompressible/phaseDynamicMomentumTransportModels/phaseDynamicMomentumTransportModels.C rename applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModels.C => src/MomentumTransportModels/phaseCompressible/phaseDynamicMomentumTransportModels/phaseDynamicMomentumTransportModels.H (67%) create mode 100644 src/MomentumTransportModels/phaseIncompressible/Make/files create mode 100644 src/MomentumTransportModels/phaseIncompressible/Make/options rename applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModel.H => src/MomentumTransportModels/phaseIncompressible/phaseKinematicMomentumTransportModels/phaseKinematicMomentumTransportModel.C (60%) create mode 100644 src/MomentumTransportModels/phaseIncompressible/phaseKinematicMomentumTransportModels/phaseKinematicMomentumTransportModel.H create mode 100644 src/MomentumTransportModels/phaseIncompressible/phaseKinematicMomentumTransportModels/phaseKinematicMomentumTransportModels.C rename applications/solvers/lagrangian/denseParticleFoam/denseParticleMomentumTransportModels/denseParticleMomentumTransportModels.C => src/MomentumTransportModels/phaseIncompressible/phaseKinematicMomentumTransportModels/phaseKinematicMomentumTransportModels.H (76%) create mode 100644 src/ThermophysicalTransportModels/phaseFluidReactionThermo/Make/files rename {applications/solvers/multiphase/multiphaseEulerFoam/multiphaseThermophysicalTransportModels => src/ThermophysicalTransportModels/phaseFluidReactionThermo}/Make/options (68%) create mode 100644 src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModel.H create mode 100644 src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModels.C rename applications/solvers/multiphase/multiphaseEulerFoam/multiphaseThermophysicalTransportModels/multiphaseThermophysicalTransportModels.C => src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModels.H (61%) create mode 100644 src/ThermophysicalTransportModels/phaseFluidThermo/Make/files create mode 100644 src/ThermophysicalTransportModels/phaseFluidThermo/Make/options create mode 100644 src/ThermophysicalTransportModels/phaseFluidThermo/phaseFluidThermophysicalTransportModel.H create mode 100644 src/ThermophysicalTransportModels/phaseFluidThermo/phaseFluidThermophysicalTransportModels.C rename applications/solvers/multiphase/multiphaseEulerFoam/multiphaseThermophysicalTransportModels/rhoReactionMultiphaseThermophysicalTransportModels.C => src/ThermophysicalTransportModels/phaseFluidThermo/phaseFluidThermophysicalTransportModels.H (58%) rename applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleMomentumTransportModelFwd.H => src/transportModels/dynamicTransportModel/dynamicTransportModel.C (64%) rename applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleMomentumTransportModel.H => src/transportModels/dynamicTransportModel/dynamicTransportModel.H (52%) rename src/transportModels/{transportModel/transportModel.C => kinematicTransportModel/kinematicTransportModel.C} (80%) rename src/transportModels/{transportModel/transportModel.H => kinematicTransportModel/kinematicTransportModel.H} (79%) diff --git a/applications/solvers/combustion/PDRFoam/Make/options b/applications/solvers/combustion/PDRFoam/Make/options index 2b45f534eb..7f5edb28be 100644 --- a/applications/solvers/combustion/PDRFoam/Make/options +++ b/applications/solvers/combustion/PDRFoam/Make/options @@ -20,13 +20,14 @@ EXE_INC = \ -IPDRModels/turbulence/PDRkEpsilon \ -IlaminarFlameSpeed/SCOPE \ -I$(LIB_SRC)/engine/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ @@ -40,7 +41,7 @@ EXE_LIBS = \ -lreactionThermophysicalModels \ -lspecie \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -llaminarFlameSpeedModels \ -lfiniteVolume \ diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C index 291f74ed90..a717493468 100644 --- a/applications/solvers/combustion/PDRFoam/PDRFoam.C +++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C @@ -69,7 +69,7 @@ Description #include "fvCFD.H" #include "psiuReactionThermo.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "fluidThermophysicalTransportModel.H" #include "laminarFlameSpeed.H" #include "XiModel.H" diff --git a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C index 1b5d7bb527..6cc811992f 100644 --- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C +++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -58,7 +58,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "psiuReactionThermo.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "laminarFlameSpeed.H" #include "XiModel.H" #include "PDRDragModel.H" diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H index ec9a0f5e68..440583fbd5 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,7 +38,7 @@ SourceFiles #include "IOdictionary.H" #include "psiuReactionThermo.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "multivariateSurfaceInterpolationScheme.H" #include "runTimeSelectionTables.H" diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C index 113fcdccb7..322e3a441f 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,7 +50,7 @@ PDRkEpsilon::PDRkEpsilon const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const fluidThermo& thermophysicalModel, + const dynamicTransportModel& transport, const word& modelName ) : @@ -61,7 +61,7 @@ PDRkEpsilon::PDRkEpsilon U, phi, phi, - thermophysicalModel, + transport, modelName ), diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H index d6d039d970..7374218a44 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -61,7 +61,7 @@ SourceFiles #define compressible_PDRkEpsilon_H #include "kEpsilon.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -102,7 +102,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const fluidThermo& thermophysicalModel, + const dynamicTransportModel& transport, const word& modelName = typeName ); diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H index 12b7e3d535..e79d703503 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,7 @@ SourceFiles #include "IOdictionary.H" #include "psiuReactionThermo.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H index 017d2a06c4..4745b0b594 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,7 +40,7 @@ SourceFiles #include "IOdictionary.H" #include "psiuReactionThermo.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H index 918a758edd..b5fa2a80cd 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -92,7 +92,7 @@ SourceFiles #include "IOdictionary.H" #include "psiuReactionThermo.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "multivariateSurfaceInterpolationScheme.H" #include "fvcDiv.H" #include "runTimeSelectionTables.H" diff --git a/applications/solvers/combustion/XiFoam/Make/options b/applications/solvers/combustion/XiFoam/Make/options index 3e08145754..863ea89a1e 100644 --- a/applications/solvers/combustion/XiFoam/Make/options +++ b/applications/solvers/combustion/XiFoam/Make/options @@ -1,5 +1,6 @@ EXE_INC = \ -I$(LIB_SRC)/engine/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ @@ -14,7 +15,7 @@ EXE_INC = \ EXE_LIBS = \ -lengine \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ diff --git a/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options b/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options index b3244273b5..c6164aa831 100644 --- a/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options +++ b/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options @@ -4,6 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/engine/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ @@ -20,7 +21,7 @@ EXE_LIBS = \ -lmeshTools \ -lengine \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ diff --git a/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C b/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C index d4b1eb8447..5b236544cc 100644 --- a/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C +++ b/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C @@ -52,7 +52,7 @@ Description #include "engineTime.H" #include "engineMesh.H" #include "psiuReactionThermo.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "fluidThermophysicalTransportModel.H" #include "laminarFlameSpeed.H" #include "ignition.H" diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C index 5efa24d231..771d374a3e 100644 --- a/applications/solvers/combustion/XiFoam/XiFoam.C +++ b/applications/solvers/combustion/XiFoam/XiFoam.C @@ -51,7 +51,7 @@ Description #include "fvCFD.H" #include "psiuReactionThermo.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "fluidThermophysicalTransportModel.H" #include "laminarFlameSpeed.H" #include "ignition.H" diff --git a/applications/solvers/combustion/chemFoam/Make/options b/applications/solvers/combustion/chemFoam/Make/options index dd3d4a534a..57c07e83c3 100644 --- a/applications/solvers/combustion/chemFoam/Make/options +++ b/applications/solvers/combustion/chemFoam/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ diff --git a/applications/solvers/combustion/coldEngineFoam/Make/options b/applications/solvers/combustion/coldEngineFoam/Make/options index f90006861a..99ca8a8547 100644 --- a/applications/solvers/combustion/coldEngineFoam/Make/options +++ b/applications/solvers/combustion/coldEngineFoam/Make/options @@ -4,6 +4,7 @@ EXE_INC = \ -I../XiFoam \ -I../../compressible/rhoPimpleFoam \ -I$(LIB_SRC)/engine/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ @@ -18,7 +19,7 @@ EXE_LIBS = \ -lengine \ -lfluidThermophysicalModels \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -lspecie \ -lfiniteVolume \ diff --git a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C index e365399328..bf04c38388 100644 --- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C +++ b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C @@ -33,7 +33,7 @@ Description #include "engineTime.H" #include "engineMesh.H" #include "psiThermo.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "fluidThermophysicalTransportModel.H" #include "OFstream.H" #include "fvModels.H" diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options index 602150e9bf..93dd6fd81b 100644 --- a/applications/solvers/combustion/fireFoam/Make/options +++ b/applications/solvers/combustion/fireFoam/Make/options @@ -7,6 +7,7 @@ EXE_INC = \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ @@ -26,7 +27,7 @@ EXE_LIBS = \ -lmeshTools \ -lsampling \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -lfluidReactionThermophysicalTransportModels \ -lspecie \ diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C index f04b0727f7..215bfa3055 100644 --- a/applications/solvers/combustion/fireFoam/fireFoam.C +++ b/applications/solvers/combustion/fireFoam/fireFoam.C @@ -31,7 +31,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "fluidReactionThermophysicalTransportModel.H" #include "parcelCloudList.H" #include "surfaceFilmModel.H" diff --git a/applications/solvers/combustion/reactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/Make/options index 9f6717ea54..d1fe1ce4b6 100644 --- a/applications/solvers/combustion/reactingFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/Make/options @@ -3,6 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ @@ -23,7 +24,7 @@ EXE_LIBS = \ -lcombustionModels \ -lreactionThermophysicalModels \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -lfluidReactionThermophysicalTransportModels \ -lfiniteVolume \ diff --git a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/Make/options index bd003d5929..ea5b5f95bf 100644 --- a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/Make/options @@ -9,6 +9,7 @@ EXE_INC = \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ @@ -24,7 +25,7 @@ EXE_LIBS = \ -lmeshTools \ -lsampling \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -lfluidReactionThermophysicalTransportModels \ -lreactionThermophysicalModels \ diff --git a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/buoyantReactingFoam.C b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/buoyantReactingFoam.C index 925b639bfc..ac88c878b6 100644 --- a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/buoyantReactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/buoyantReactingFoam.C @@ -33,7 +33,7 @@ Description #include "fvCFD.H" #include "fluidReactionThermo.H" #include "combustionModel.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "fluidReactionThermophysicalTransportModel.H" #include "multivariateScheme.H" #include "pimpleControl.H" diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C index fd89761810..9048c9d697 100644 --- a/applications/solvers/combustion/reactingFoam/reactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C @@ -33,7 +33,7 @@ Description #include "dynamicFvMesh.H" #include "fluidReactionThermo.H" #include "combustionModel.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "fluidReactionThermophysicalTransportModel.H" #include "multivariateScheme.H" #include "pimpleControl.H" diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options b/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options index 6870682cf2..5c94e7683d 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options @@ -1,5 +1,6 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude diff --git a/applications/solvers/compressible/rhoCentralFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/Make/options index 2c2db76e50..8d64c06be7 100644 --- a/applications/solvers/compressible/rhoCentralFoam/Make/options +++ b/applications/solvers/compressible/rhoCentralFoam/Make/options @@ -1,6 +1,7 @@ EXE_INC = \ -IBCs/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ @@ -17,7 +18,7 @@ EXE_LIBS = \ -lspecie \ -lrhoCentralFoam \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -ldynamicFvMesh \ -ltopoChangerFvMesh \ diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C index 6dc92a5ce9..468353c388 100644 --- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C +++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,7 +33,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "psiThermo.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "fluidThermophysicalTransportModel.H" #include "fixedRhoFvPatchScalarField.H" #include "directionInterpolate.H" diff --git a/applications/solvers/compressible/rhoPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/Make/options index aae8ed46fe..785535e629 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoPimpleFoam/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ @@ -13,7 +14,7 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -lfiniteVolume \ -ldynamicFvMesh \ diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C index e774da479d..cad6df4039 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C @@ -36,7 +36,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "fluidThermo.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "fluidThermophysicalTransportModel.H" #include "pimpleControl.H" #include "pressureControl.H" diff --git a/applications/solvers/compressible/rhoSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/Make/options index f4fbdbccc4..30946d8e28 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoSimpleFoam/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ @@ -12,7 +13,7 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -lfiniteVolume \ -lsampling \ diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options index 11adf07def..f38d10dde2 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options @@ -1,6 +1,7 @@ EXE_INC = \ -I. \ -I.. \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ @@ -14,7 +15,7 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -lfiniteVolume \ -lsampling \ diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C index eb60392bd6..0aa727afa8 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "fluidThermo.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "fluidThermophysicalTransportModel.H" #include "simpleControl.H" #include "pressureControl.H" diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C index 4cb4ab2fdd..3b2384fd32 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C @@ -31,7 +31,7 @@ Description #include "fvCFD.H" #include "fluidThermo.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "fluidThermophysicalTransportModel.H" #include "simpleControl.H" #include "pressureControl.H" diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options index f65bfaa160..cb8c0b630d 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options @@ -1,6 +1,7 @@ EXE_INC = \ -I. \ -I../../compressible/rhoPimpleFoam \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ @@ -15,7 +16,7 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -lfiniteVolume \ -ldynamicFvMesh \ diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C index e77920a27b..45591737ae 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C @@ -37,7 +37,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "fluidThermo.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "fluidThermophysicalTransportModel.H" #include "pimpleControl.H" #include "pressureControl.H" diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options index f3a0633953..72a937ca70 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options @@ -3,6 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ @@ -18,5 +19,5 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lmeshTools diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C index b91b6eb74f..f796aa1b50 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C @@ -31,7 +31,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "fluidThermophysicalTransportModel.H" #include "simpleControl.H" #include "pressureControl.H" diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options index cefdcbfa00..cf7750245a 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options @@ -9,6 +9,7 @@ EXE_INC = \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/cfdTools \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ @@ -32,7 +33,7 @@ EXE_LIBS = \ -lODE \ -lcombustionModels \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -lfluidReactionThermophysicalTransportModels \ -lmeshTools \ diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C index e6d4842393..007aad8d11 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C @@ -32,7 +32,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "fluidReactionThermophysicalTransportModel.H" #include "fluidReactionThermo.H" #include "combustionModel.H" diff --git a/applications/solvers/heatTransfer/thermoFoam/Make/options b/applications/solvers/heatTransfer/thermoFoam/Make/options index 09c87fb1aa..03ee5e99fe 100644 --- a/applications/solvers/heatTransfer/thermoFoam/Make/options +++ b/applications/solvers/heatTransfer/thermoFoam/Make/options @@ -2,6 +2,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ @@ -16,5 +17,5 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels diff --git a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C index d92126b46e..c891b0da46 100644 --- a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C +++ b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C @@ -31,7 +31,7 @@ Description #include "fvCFD.H" #include "fluidThermo.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "fluidThermophysicalTransportModel.H" #include "LESModel.H" #include "fvModels.H" diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options b/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options index 4f5e9d97f7..9cd84523b3 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options +++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options @@ -11,7 +11,7 @@ EXE_INC = \ EXE_LIBS = \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ - -lincompressibleTransportModels \ + -ltransportModels \ -lfiniteVolume \ -lmeshTools \ -lfvModels \ diff --git a/applications/solvers/incompressible/boundaryFoam/Make/options b/applications/solvers/incompressible/boundaryFoam/Make/options index be1ef5cf89..e9fde509b2 100644 --- a/applications/solvers/incompressible/boundaryFoam/Make/options +++ b/applications/solvers/incompressible/boundaryFoam/Make/options @@ -9,7 +9,7 @@ EXE_INC = \ EXE_LIBS = \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ - -lincompressibleTransportModels \ + -ltransportModels \ -lfiniteVolume \ -lmeshTools \ -lfvModels \ diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/Make/options b/applications/solvers/incompressible/nonNewtonianIcoFoam/Make/options index 521ce3e3eb..6e8477ee1f 100644 --- a/applications/solvers/incompressible/nonNewtonianIcoFoam/Make/options +++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/Make/options @@ -4,6 +4,6 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lincompressibleTransportModels \ + -ltransportModels \ -lfiniteVolume \ -lmeshTools diff --git a/applications/solvers/incompressible/pimpleFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/Make/options index e265b5eb8f..2d8191a31a 100644 --- a/applications/solvers/incompressible/pimpleFoam/Make/options +++ b/applications/solvers/incompressible/pimpleFoam/Make/options @@ -11,7 +11,7 @@ EXE_INC = \ EXE_LIBS = \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ - -lincompressibleTransportModels \ + -ltransportModels \ -lfiniteVolume \ -lfvModels \ -lfvConstraints \ diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options index bcac406a6b..9a581d5469 100644 --- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options +++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options @@ -11,7 +11,7 @@ EXE_INC = \ EXE_LIBS = \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ - -lincompressibleTransportModels \ + -ltransportModels \ -lfiniteVolume \ -lmeshTools \ -lfvModels \ diff --git a/applications/solvers/incompressible/pisoFoam/Make/options b/applications/solvers/incompressible/pisoFoam/Make/options index be1ef5cf89..e9fde509b2 100644 --- a/applications/solvers/incompressible/pisoFoam/Make/options +++ b/applications/solvers/incompressible/pisoFoam/Make/options @@ -9,7 +9,7 @@ EXE_INC = \ EXE_LIBS = \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ - -lincompressibleTransportModels \ + -ltransportModels \ -lfiniteVolume \ -lmeshTools \ -lfvModels \ diff --git a/applications/solvers/incompressible/simpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/Make/options index 91fa0e6280..e9fde509b2 100644 --- a/applications/solvers/incompressible/simpleFoam/Make/options +++ b/applications/solvers/incompressible/simpleFoam/Make/options @@ -6,11 +6,10 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude - EXE_LIBS = \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ - -lincompressibleTransportModels \ + -ltransportModels \ -lfiniteVolume \ -lmeshTools \ -lfvModels \ diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options index bee2cd1d77..0b1a64dd42 100644 --- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options +++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options @@ -11,7 +11,7 @@ EXE_INC = \ EXE_LIBS = \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ - -lincompressibleTransportModels \ + -ltransportModels \ -lfiniteVolume \ -lmeshTools \ -lfvModels \ diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options index bee2cd1d77..0b1a64dd42 100644 --- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options +++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options @@ -11,7 +11,7 @@ EXE_INC = \ EXE_LIBS = \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ - -lincompressibleTransportModels \ + -ltransportModels \ -lfiniteVolume \ -lmeshTools \ -lfvModels \ diff --git a/applications/solvers/lagrangian/denseParticleFoam/Allwclean b/applications/solvers/lagrangian/denseParticleFoam/Allwclean deleted file mode 100755 index a5c588e6f9..0000000000 --- a/applications/solvers/lagrangian/denseParticleFoam/Allwclean +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -wclean libso denseParticleMomentumTransportModels - -wclean -wclean MPPICFoam - -#------------------------------------------------------------------------------ diff --git a/applications/solvers/lagrangian/denseParticleFoam/Allwmake b/applications/solvers/lagrangian/denseParticleFoam/Allwmake deleted file mode 100755 index d01195794f..0000000000 --- a/applications/solvers/lagrangian/denseParticleFoam/Allwmake +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Parse arguments for library compilation -. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments - -wmake $targetType denseParticleMomentumTransportModels - -wmake $targetType - -#------------------------------------------------------------------------------ diff --git a/applications/solvers/lagrangian/denseParticleFoam/Make/options b/applications/solvers/lagrangian/denseParticleFoam/Make/options index 03e92f2487..995bd9a7d5 100644 --- a/applications/solvers/lagrangian/denseParticleFoam/Make/options +++ b/applications/solvers/lagrangian/denseParticleFoam/Make/options @@ -1,11 +1,10 @@ EXE_INC = \ - -I./denseParticleMomentumTransportModels/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/parcel/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/phaseIncompressible/lnInclude \ @@ -19,10 +18,10 @@ EXE_LIBS = \ -llagrangian \ -llagrangianParcel \ -llagrangianParcelTurbulence \ - -lincompressibleTransportModels \ + -ltransportModels \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ - -ldenseParticleMomentumTransportModels \ + -lphaseIncompressibleMomentumTransportModels \ -lfiniteVolume \ -ldynamicFvMesh \ -ltopoChangerFvMesh \ diff --git a/applications/solvers/lagrangian/denseParticleFoam/createFields.H b/applications/solvers/lagrangian/denseParticleFoam/createFields.H index 16530ef9b7..5e9f7d217f 100644 --- a/applications/solvers/lagrangian/denseParticleFoam/createFields.H +++ b/applications/solvers/lagrangian/denseParticleFoam/createFields.H @@ -147,10 +147,9 @@ surfaceScalarField alphaPhic alphacf*phic ); -autoPtr> -continuousPhaseTurbulence +autoPtr continuousPhaseTurbulence ( - PhaseIncompressibleMomentumTransportModel::New + phaseIncompressible::momentumTransportModel::New ( alphac, Uc, diff --git a/applications/solvers/lagrangian/denseParticleFoam/denseParticleFoam.C b/applications/solvers/lagrangian/denseParticleFoam/denseParticleFoam.C index 075cbef36f..52c2cb2241 100644 --- a/applications/solvers/lagrangian/denseParticleFoam/denseParticleFoam.C +++ b/applications/solvers/lagrangian/denseParticleFoam/denseParticleFoam.C @@ -78,7 +78,7 @@ namespace Foam #include "fvCFD.H" #include "dynamicFvMesh.H" #include "singlePhaseTransportModel.H" -#include "PhaseIncompressibleMomentumTransportModel.H" +#include "phaseKinematicMomentumTransportModel.H" #include "pimpleControl.H" #include "CorrectPhi.H" #include "fvModels.H" diff --git a/applications/solvers/lagrangian/denseParticleFoam/denseParticleMomentumTransportModels/Make/files b/applications/solvers/lagrangian/denseParticleFoam/denseParticleMomentumTransportModels/Make/files deleted file mode 100644 index c2020ca982..0000000000 --- a/applications/solvers/lagrangian/denseParticleFoam/denseParticleMomentumTransportModels/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -denseParticleMomentumTransportModels.C - -LIB = $(FOAM_LIBBIN)/libdenseParticleMomentumTransportModels diff --git a/applications/solvers/lagrangian/denseParticleFoam/denseParticleMomentumTransportModels/Make/options b/applications/solvers/lagrangian/denseParticleFoam/denseParticleMomentumTransportModels/Make/options deleted file mode 100644 index d5f766c6a1..0000000000 --- a/applications/solvers/lagrangian/denseParticleFoam/denseParticleMomentumTransportModels/Make/options +++ /dev/null @@ -1,8 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/transportModels/lnInclude \ - -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ - -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/MomentumTransportModels/phaseIncompressible/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude diff --git a/applications/solvers/lagrangian/particleFoam/Make/options b/applications/solvers/lagrangian/particleFoam/Make/options index 992e22cfb5..82c02eaaba 100644 --- a/applications/solvers/lagrangian/particleFoam/Make/options +++ b/applications/solvers/lagrangian/particleFoam/Make/options @@ -16,7 +16,7 @@ EXE_LIBS = \ -llagrangianParcelTurbulence \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ - -lincompressibleTransportModels \ + -ltransportModels \ -lfiniteVolume \ -lregionModels \ -lsurfaceFilmModels \ diff --git a/applications/solvers/lagrangian/reactingParticleFoam/Make/options b/applications/solvers/lagrangian/reactingParticleFoam/Make/options index 1f4db9ada2..6e05589d1c 100644 --- a/applications/solvers/lagrangian/reactingParticleFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParticleFoam/Make/options @@ -9,6 +9,7 @@ EXE_INC = \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ @@ -29,7 +30,7 @@ EXE_LIBS = \ -lmeshTools \ -ldynamicFvMesh \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -lfluidReactionThermophysicalTransportModels \ -lspecie \ diff --git a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/Make/options b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/Make/options index 17c3321d21..4af6e07196 100644 --- a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/Make/options @@ -10,6 +10,7 @@ EXE_INC = \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ @@ -30,7 +31,7 @@ EXE_LIBS = \ -lmeshTools \ -ldynamicFvMesh \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -lfluidReactionThermophysicalTransportModels \ -lspecie \ diff --git a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/buoyantReactingParticleFoam.C b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/buoyantReactingParticleFoam.C index 9178e4bc72..7cc72ef8dd 100644 --- a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/buoyantReactingParticleFoam.C +++ b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/buoyantReactingParticleFoam.C @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "fluidReactionThermophysicalTransportModel.H" #include "parcelCloudList.H" #include "surfaceFilmModel.H" diff --git a/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/Make/options b/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/Make/options index ca8c37bf7b..e941446f61 100644 --- a/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/Make/options @@ -10,6 +10,7 @@ EXE_INC = \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ @@ -31,7 +32,7 @@ EXE_LIBS = \ -lmeshTools \ -ldynamicFvMesh \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -lfluidReactionThermophysicalTransportModels \ -lspecie \ diff --git a/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/engineFoam.C b/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/engineFoam.C index b29cd86501..587a795ea8 100644 --- a/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/engineFoam.C +++ b/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/engineFoam.C @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "engineMesh.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "fluidReactionThermophysicalTransportModel.H" #include "parcelCloudList.H" #include "surfaceFilmModel.H" diff --git a/applications/solvers/lagrangian/reactingParticleFoam/reactingParticleFoam.C b/applications/solvers/lagrangian/reactingParticleFoam/reactingParticleFoam.C index f77708e3cb..57c162dbaf 100644 --- a/applications/solvers/lagrangian/reactingParticleFoam/reactingParticleFoam.C +++ b/applications/solvers/lagrangian/reactingParticleFoam/reactingParticleFoam.C @@ -32,7 +32,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "fluidReactionThermophysicalTransportModel.H" #include "parcelCloudList.H" #include "surfaceFilmModel.H" diff --git a/applications/solvers/lagrangian/rhoParticleFoam/Make/options b/applications/solvers/lagrangian/rhoParticleFoam/Make/options index eed287f87a..162e6345ab 100644 --- a/applications/solvers/lagrangian/rhoParticleFoam/Make/options +++ b/applications/solvers/lagrangian/rhoParticleFoam/Make/options @@ -1,6 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/parcel/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ @@ -19,7 +20,7 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lfiniteVolume \ -lfvModels \ -lfvConstraints \ diff --git a/applications/solvers/lagrangian/rhoParticleFoam/rhoParticleFoam.C b/applications/solvers/lagrangian/rhoParticleFoam/rhoParticleFoam.C index 2abe857250..243f99c926 100644 --- a/applications/solvers/lagrangian/rhoParticleFoam/rhoParticleFoam.C +++ b/applications/solvers/lagrangian/rhoParticleFoam/rhoParticleFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "fluidThermo.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "parcelCloudList.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/lagrangian/simpleReactingParticleFoam/Make/options b/applications/solvers/lagrangian/simpleReactingParticleFoam/Make/options index b53da01822..36c56c199d 100644 --- a/applications/solvers/lagrangian/simpleReactingParticleFoam/Make/options +++ b/applications/solvers/lagrangian/simpleReactingParticleFoam/Make/options @@ -9,6 +9,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/parcel/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ @@ -25,7 +26,7 @@ EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -lfluidReactionThermophysicalTransportModels \ -llagrangian \ diff --git a/applications/solvers/lagrangian/simpleReactingParticleFoam/simpleReactingParticleFoam.C b/applications/solvers/lagrangian/simpleReactingParticleFoam/simpleReactingParticleFoam.C index 1dfb9a44a3..74e7299336 100644 --- a/applications/solvers/lagrangian/simpleReactingParticleFoam/simpleReactingParticleFoam.C +++ b/applications/solvers/lagrangian/simpleReactingParticleFoam/simpleReactingParticleFoam.C @@ -31,7 +31,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "fluidReactionThermophysicalTransportModel.H" #include "parcelCloudList.H" #include "fluidReactionThermo.H" diff --git a/applications/solvers/multiphase/compressibleInterFoam/Allwclean b/applications/solvers/multiphase/compressibleInterFoam/Allwclean index e88f51c4e6..b02e598e8b 100755 --- a/applications/solvers/multiphase/compressibleInterFoam/Allwclean +++ b/applications/solvers/multiphase/compressibleInterFoam/Allwclean @@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory wclean libso twoPhaseMixtureThermo wclean libso surfaceTensionModels wclean libso twoPhaseChange -wclean libso VoFphaseCompressibleMomentumTransportModels +wclean libso compressibleInterPhaseTransportModel wclean diff --git a/applications/solvers/multiphase/compressibleInterFoam/Allwmake b/applications/solvers/multiphase/compressibleInterFoam/Allwmake index c9f10c2df1..44d3ecea15 100755 --- a/applications/solvers/multiphase/compressibleInterFoam/Allwmake +++ b/applications/solvers/multiphase/compressibleInterFoam/Allwmake @@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # Run from this directory wmake $targetType twoPhaseMixtureThermo wmake $targetType surfaceTensionModels wmake $targetType twoPhaseChange -wmake $targetType VoFphaseCompressibleMomentumTransportModels +wmake $targetType compressibleInterPhaseTransportModel wmake $targetType diff --git a/applications/solvers/multiphase/compressibleInterFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/Make/options index 5bbd9133de..77d5ac0568 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/Make/options @@ -1,18 +1,18 @@ EXE_INC = \ -I. \ -ItwoPhaseMixtureThermo \ - -IVoFphaseCompressibleMomentumTransportModels/lnInclude \ + -IcompressibleInterPhaseTransportModel/lnInclude \ -ItwoPhaseChange/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ @@ -31,8 +31,8 @@ EXE_LIBS = \ -linterfaceProperties \ -lcompressibleTwoPhaseChangeModels \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ - -lVoFphaseCompressibleMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ + -lcompressibleInterPhaseTransportModel \ -lsurfaceFilmModels \ -lsurfaceFilmDerivedFvPatchFields \ -lfiniteVolume \ diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/Make/files b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/Make/files deleted file mode 100644 index 29c26315a0..0000000000 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/Make/files +++ /dev/null @@ -1,4 +0,0 @@ -VoFphaseCompressibleMomentumTransportModels.C -compressibleInterPhaseTransportModel.C - -LIB = $(FOAM_LIBBIN)/libVoFphaseCompressibleMomentumTransportModels diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterPhaseTransportModel/Make/files b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterPhaseTransportModel/Make/files new file mode 100644 index 0000000000..2b5f3be5be --- /dev/null +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterPhaseTransportModel/Make/files @@ -0,0 +1,3 @@ +compressibleInterPhaseTransportModel.C + +LIB = $(FOAM_LIBBIN)/libcompressibleInterPhaseTransportModel diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterPhaseTransportModel/Make/options similarity index 82% rename from applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/Make/options rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterPhaseTransportModel/Make/options index 9081b4a0c6..f74b227abb 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterPhaseTransportModel/Make/options @@ -1,5 +1,6 @@ EXE_INC = \ -I../twoPhaseMixtureThermo \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ @@ -17,7 +18,8 @@ LIB_LIBS = \ -ltwoPhaseProperties \ -linterfaceProperties \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ - -lincompressibleTransportModels \ + -lcompressibleMomentumTransportModels \ + -lphaseCompressibleMomentumTransportModels \ + -ltransportModels \ -lfiniteVolume \ -lmeshTools diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/compressibleInterPhaseTransportModel.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.C similarity index 96% rename from applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/compressibleInterPhaseTransportModel.C rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.C index 75e59b1477..6441548b2c 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/compressibleInterPhaseTransportModel.C +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -94,7 +94,7 @@ Foam::compressibleInterPhaseTransportModel::compressibleInterPhaseTransportModel turbulence1_ = ( - PhaseCompressibleMomentumTransportModel::New + phaseCompressible::momentumTransportModel::New ( alpha1, rho1, @@ -107,7 +107,7 @@ Foam::compressibleInterPhaseTransportModel::compressibleInterPhaseTransportModel turbulence2_ = ( - PhaseCompressibleMomentumTransportModel::New + phaseCompressible::momentumTransportModel::New ( alpha2, rho2, diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/compressibleInterPhaseTransportModel.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.H similarity index 93% rename from applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/compressibleInterPhaseTransportModel.H rename to applications/solvers/multiphase/compressibleInterFoam/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.H index 54ec8934e5..d08c97c646 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/compressibleInterPhaseTransportModel.H +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,8 +46,8 @@ SourceFiles #include "twoPhaseMixture.H" #include "twoPhaseMixtureThermo.H" -#include "fluidThermoMomentumTransportModel.H" -#include "VoFphaseCompressibleMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -84,12 +84,10 @@ class compressibleInterPhaseTransportModel autoPtr turbulence_; //- Phase-1 transport model (constructed for two-phase transport) - autoPtr> - turbulence1_; + autoPtr turbulence1_; //- Phase-2 transport model (constructed for two-phase transport) - autoPtr> - turbulence2_; + autoPtr turbulence2_; public: diff --git a/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/Make/options b/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/Make/options index 9005e5f1b1..01729bddac 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/Make/options @@ -1,8 +1,9 @@ EXE_INC = \ - -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ + -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ diff --git a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseChange/Make/options b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseChange/Make/options index 41ebeef4a1..f5822df687 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseChange/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseChange/Make/options @@ -1,8 +1,9 @@ EXE_INC = \ + -I../twoPhaseMixtureThermo/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ - -I../twoPhaseMixtureThermo/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude diff --git a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/Make/options b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/Make/options index 1b0966dea7..667db23a18 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options index bcef6fdb54..b241f5b32b 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options @@ -2,6 +2,7 @@ EXE_INC = \ -I. \ -I../interFoam \ -ImultiphaseMixtureThermo/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \ -I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \ @@ -16,6 +17,6 @@ EXE_LIBS = \ -lspecie \ -linterfaceProperties \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lfiniteVolume \ -lmeshTools diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C index b80fc31e87..47e0904f8f 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,7 +37,7 @@ Description #include "fvCFD.H" #include "multiphaseMixtureThermo.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/Make/options b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/Make/options index 18cbdd670a..473ce02238 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/Make/options +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude diff --git a/applications/solvers/multiphase/driftFluxFoam/Make/files b/applications/solvers/multiphase/driftFluxFoam/Make/files index 234f3f58d4..2a55d1c561 100644 --- a/applications/solvers/multiphase/driftFluxFoam/Make/files +++ b/applications/solvers/multiphase/driftFluxFoam/Make/files @@ -1,5 +1,4 @@ incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C -compressibleMomentumTransportModels.C driftFluxFoam.C EXE = $(FOAM_APPBIN)/driftFluxFoam diff --git a/applications/solvers/multiphase/driftFluxFoam/Make/options b/applications/solvers/multiphase/driftFluxFoam/Make/options index 2765511a0a..440ac32f2d 100644 --- a/applications/solvers/multiphase/driftFluxFoam/Make/options +++ b/applications/solvers/multiphase/driftFluxFoam/Make/options @@ -19,4 +19,4 @@ EXE_LIBS = \ -lfvModels \ -lfvConstraints \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels + -lcompressibleMomentumTransportModels diff --git a/applications/solvers/multiphase/driftFluxFoam/compressibleMomentumTransportModels.C b/applications/solvers/multiphase/driftFluxFoam/compressibleMomentumTransportModels.C deleted file mode 100644 index 29cb9f266d..0000000000 --- a/applications/solvers/multiphase/driftFluxFoam/compressibleMomentumTransportModels.C +++ /dev/null @@ -1,104 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "CompressibleMomentumTransportModel.H" -#include "incompressibleTwoPhaseInteractingMixture.H" -#include "addToRunTimeSelectionTable.H" -#include "makeMomentumTransportModel.H" - -#include "laminarModel.H" -#include "RASModel.H" -#include "LESModel.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -makeMomentumTransportModelTypes -( - geometricOneField, - volScalarField, - compressibleMomentumTransportModel, - CompressibleMomentumTransportModel, - incompressibleTwoPhaseInteractingMixture -); - -makeBaseMomentumTransportModel -( - geometricOneField, - volScalarField, - compressibleMomentumTransportModel, - CompressibleMomentumTransportModel, - incompressibleTwoPhaseInteractingMixture -); - -#define makeLaminarModel(Type) \ - makeTemplatedMomentumTransportModel \ - ( \ - incompressibleTwoPhaseInteractingMixture \ - ##CompressibleMomentumTransportModel, \ - laminar, \ - Type \ - ) - -#define makeRASModel(Type) \ - makeTemplatedMomentumTransportModel \ - ( \ - incompressibleTwoPhaseInteractingMixture \ - ##CompressibleMomentumTransportModel, \ - RAS, \ - Type \ - ) - -#define makeLESModel(Type) \ - makeTemplatedMomentumTransportModel \ - ( \ - incompressibleTwoPhaseInteractingMixture \ - ##CompressibleMomentumTransportModel, \ - LES, \ - Type \ - ) - -#include "Stokes.H" -makeLaminarModel(Stokes); - -#include "kEpsilon.H" -makeRASModel(kEpsilon); - -#include "buoyantKEpsilon.H" -makeRASModel(buoyantKEpsilon); - -#include "Smagorinsky.H" -makeLESModel(Smagorinsky); - -#include "kEqn.H" -makeLESModel(kEqn); - -#include "LRR.H" -makeRASModel(LRR); - -#include "SSG.H" -makeRASModel(SSG); - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/driftFluxFoam/createFields.H b/applications/solvers/multiphase/driftFluxFoam/createFields.H index 56c425f6ab..4f7b19a367 100644 --- a/applications/solvers/multiphase/driftFluxFoam/createFields.H +++ b/applications/solvers/multiphase/driftFluxFoam/createFields.H @@ -75,13 +75,9 @@ autoPtr UdmModelPtr // Construct compressible turbulence model -autoPtr -< - CompressibleMomentumTransportModel -> turbulence +autoPtr turbulence ( - CompressibleMomentumTransportModel - ::New(rho, U, rhoPhi, mixture) + compressible::momentumTransportModel::New(rho, U, rhoPhi, mixture) ); diff --git a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C index 924601960b..029008473d 100644 --- a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C +++ b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C @@ -39,7 +39,7 @@ Description #include "incompressibleTwoPhaseInteractingMixture.H" #include "relativeVelocityModel.H" #include "momentumTransportModel.H" -#include "CompressibleMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "pimpleControl.H" #include "fvModels.H" #include "fvConstraints.H" diff --git a/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C b/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C index fc4e909afa..454080ee78 100644 --- a/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C +++ b/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -57,6 +57,7 @@ incompressibleTwoPhaseInteractingMixture ) ), twoPhaseMixture(U.mesh(), *this), + dynamicTransportModel(), muModel_ ( diff --git a/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.H b/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.H index f64389d8d5..5841405d20 100644 --- a/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.H +++ b/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,9 +40,9 @@ SourceFiles #include "viscosityModel.H" #include "mixtureViscosityModel.H" #include "twoPhaseMixture.H" +#include "dynamicTransportModel.H" #include "IOdictionary.H" - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam @@ -55,7 +55,8 @@ namespace Foam class incompressibleTwoPhaseInteractingMixture : public IOdictionary, - public twoPhaseMixture + public twoPhaseMixture, + public dynamicTransportModel { protected: diff --git a/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/Make/options b/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/Make/options index 86a25f40e5..44d726f695 100644 --- a/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/Make/options +++ b/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/Make/options @@ -6,5 +6,5 @@ EXE_INC = \ LIB_LIBS = \ -ltwoPhaseMixture \ - -lincompressibleTransportModels \ + -ltransportModels \ -lfiniteVolume diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/Make/options b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/Make/options index 03fbfc7d78..449f1ea9bd 100644 --- a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/Make/options +++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/Make/options @@ -7,6 +7,6 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ - -lincompressibleTransportModels \ + -ltransportModels \ -lfiniteVolume \ -lmeshTools diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options index 086eeba1c9..e0f6fca14f 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options @@ -18,7 +18,7 @@ EXE_INC = \ EXE_LIBS = \ -ltwoPhaseMixture \ -ltwoPhaseProperties \ - -lincompressibleTransportModels \ + -ltransportModels \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ -lfiniteVolume \ diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C index 93919ad2cb..7839a14d80 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -213,7 +213,7 @@ Foam::incompressibleThreePhaseMixture::nuf() const bool Foam::incompressibleThreePhaseMixture::read() { - if (transportModel::read()) + if (regIOobject::read()) { if ( diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.H b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.H index 4f387b986c..1e65d4beb7 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.H +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ SourceFiles #ifndef incompressibleThreePhaseMixture_H #define incompressibleThreePhaseMixture_H -#include "transportModel.H" +#include "kinematicTransportModel.H" #include "IOdictionary.H" #include "viscosityModel.H" #include "dimensionedScalar.H" @@ -52,7 +52,7 @@ namespace Foam class incompressibleThreePhaseMixture : public IOdictionary, - public transportModel + public kinematicTransportModel { // Private Data diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Allwclean b/applications/solvers/multiphase/multiphaseEulerFoam/Allwclean index b8fe606783..aa5283387b 100755 --- a/applications/solvers/multiphase/multiphaseEulerFoam/Allwclean +++ b/applications/solvers/multiphase/multiphaseEulerFoam/Allwclean @@ -5,7 +5,6 @@ wclean libso phaseSystems wclean libso interfacialModels wclean libso interfacialCompositionModels wclean libso multiphaseCompressibleMomentumTransportModels -wclean libso multiphaseThermophysicalTransportModels multiphaseEulerFoam/Allwclean wclean libso functionObjects diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake b/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake index 6f26df52f3..f6c3a63e39 100755 --- a/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake +++ b/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake @@ -8,7 +8,6 @@ wmake $targetType phaseSystems wmake $targetType interfacialModels wmake $targetType interfacialCompositionModels wmake $targetType multiphaseCompressibleMomentumTransportModels -wmake $targetType multiphaseThermophysicalTransportModels wmake $targetType multiphaseReactions multiphaseEulerFoam/Allwmake $targetType $* wmake $targetType functionObjects diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/Make/options index 1da9ca9d33..60502197d3 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/Make/options @@ -1,12 +1,18 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/functionObjects/field/lnInclude \ - -I$(LIB_SRC)/fileFormats/lnInclude \ + -I../phaseSystems/lnInclude \ -I../interfacialModels/lnInclude \ - -I../phaseSystems/lnInclude + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ + -I$(LIB_SRC)/functionObjects/field/lnInclude \ LIB_LIBS = \ - -lfieldFunctionObjects \ + -lfiniteVolume \ + -lmeshTools \ -lfileFormats \ - -lfiniteVolume + -lfieldFunctionObjects diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/Make/options index 5e268a7105..0ba44f9d18 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/Make/options @@ -1,5 +1,6 @@ EXE_INC = \ -I../phaseSystems/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/Make/options index c3bce2a850..9141b2de87 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/Make/options @@ -1,5 +1,6 @@ EXE_INC = \ -I../phaseSystems/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C index 43b7816991..4f46cd7fb6 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "Burns.H" #include "phasePair.H" -#include "phaseCompressibleMomentumTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" #include "dragModel.H" diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C index 0f83472d16..aeb96011ac 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "Gosman.H" #include "phasePair.H" -#include "phaseCompressibleMomentumTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" #include "dragModel.H" diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C index 2fdb678b50..a2ca5c9e70 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "LopezDeBertodano.H" #include "phasePair.H" -#include "phaseCompressibleMomentumTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C index 35f8a14632..a8800c6453 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "constantTurbulentDispersionCoefficient.H" #include "phasePair.H" -#include "phaseCompressibleMomentumTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C index 0d43c40c3d..38982af8e8 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,7 +28,7 @@ License #include "fvcGrad.H" #include "surfaceInterpolate.H" #include "fvcSnGrad.H" -#include "phaseCompressibleMomentumTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" #include "BlendedInterfacialModel.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -64,13 +64,13 @@ Foam::turbulentDispersionModel::~turbulentDispersionModel() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -const Foam::phaseCompressibleMomentumTransportModel& +const Foam::phaseCompressible::momentumTransportModel& Foam::turbulentDispersionModel::continuousTurbulence() const { return pair_.phase1().mesh().lookupObject < - phaseCompressibleMomentumTransportModel + phaseCompressible::momentumTransportModel > ( IOobject::groupName diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H index ddab160c7e..d5f2061ef6 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,12 +35,12 @@ SourceFiles #ifndef turbulentDispersionModel_H #define turbulentDispersionModel_H -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - #include "volFields.H" #include "dictionary.H" #include "runTimeSelectionTables.H" -#include "phaseCompressibleMomentumTransportModelFwd.H" +#include "phaseDynamicMomentumTransportModel.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { @@ -116,7 +116,7 @@ public: // Member Functions //- Return a reference to the turbulence model for the continuous phase - const phaseCompressibleMomentumTransportModel& + const phaseCompressible::momentumTransportModel& continuousTurbulence() const; //- Turbulent diffusivity diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/Make/files b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/Make/files index 259abf6d58..1f833d70df 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/Make/files +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/Make/files @@ -6,8 +6,8 @@ phasePressureModel/phasePressureModel.C kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C -kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C -kineticTheoryModels/viscosityModel/viscosityModel/viscosityModelNew.C +kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.C +kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModelNew.C kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/Make/options index fee6197130..f5aac1545a 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/Make/options @@ -2,13 +2,15 @@ EXE_INC = \ -I../phaseSystems/lnInclude \ -I../interfacialModels/lnInclude\ -I../interfacialCompositionModels/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude -LIB_LIBS = +LIB_LIBS = \ + -lphaseCompressibleMomentumTransportModels diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C index 62dd97d035..3ffa36ffa5 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatPhaseJayatillekeWallFunction/alphatPhaseJayatillekeWallFunctionFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "alphatPhaseJayatillekeWallFunctionFvPatchScalarField.H" #include "phaseSystem.H" -#include "phaseCompressibleMomentumTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -169,8 +169,8 @@ alphatPhaseJayatillekeWallFunctionFvPatchScalarField::calcAlphat const label patchi = patch().index(); // Retrieve turbulence properties from model - const phaseCompressibleMomentumTransportModel& turbModel = - db().lookupObject + const phaseCompressible::momentumTransportModel& turbModel = + db().lookupObject ( IOobject::groupName(momentumTransportModel::typeName, phase.name()) ); diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C index 150a89d398..0ed81a44cf 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,7 +27,7 @@ License #include "phaseSystem.H" #include "heatTransferPhaseSystem.H" #include "compressibleMomentumTransportModel.H" -#include "phaseCompressibleMomentumTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" #include "saturationModel.H" #include "rhoReactionThermo.H" #include "addToRunTimeSelectionTable.H" @@ -325,8 +325,8 @@ void alphatWallBoilingWallFunctionFvPatchScalarField::updateCoeffs() ) { // Retrieve turbulence properties from models - const phaseCompressibleMomentumTransportModel& turbModel = - db().lookupObject + const phaseCompressible::momentumTransportModel& turbModel + = db().lookupObject ( IOobject::groupName ( @@ -334,8 +334,8 @@ void alphatWallBoilingWallFunctionFvPatchScalarField::updateCoeffs() liquid.name() ) ); - const phaseCompressibleMomentumTransportModel& vaporTurbModel = - db().lookupObject + const phaseCompressible::momentumTransportModel& vaporTurbModel + = db().lookupObject ( IOobject::groupName ( diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C index 2a09534e11..32c5d99b3a 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -70,11 +70,11 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& phase, + const transportModel& transport, const word& type ) : - eddyViscosity> + eddyViscosity> ( type, alpha, @@ -82,10 +82,10 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel U, alphaRhoPhi, phi, - phase + transport ), - phase_(phase), + phase_(refCast(transport)), continuousPhaseName_ ( @@ -155,7 +155,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel ( IOobject ( - IOobject::groupName("Theta", phase.name()), + IOobject::groupName("Theta", phase_.name()), U.time().timeName(), U.mesh(), IOobject::MUST_READ, @@ -168,7 +168,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel ( IOobject ( - IOobject::groupName("lambda", phase.name()), + IOobject::groupName("lambda", phase_.name()), U.time().timeName(), U.mesh(), IOobject::NO_READ, @@ -182,7 +182,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel ( IOobject ( - IOobject::groupName("gs0", phase.name()), + IOobject::groupName("gs0", phase_.name()), U.time().timeName(), U.mesh(), IOobject::NO_READ, @@ -196,7 +196,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel ( IOobject ( - IOobject::groupName("kappa", phase.name()), + IOobject::groupName("kappa", phase_.name()), U.time().timeName(), U.mesh(), IOobject::NO_READ, @@ -210,7 +210,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel ( IOobject ( - IOobject::groupName("nuFric", phase.name()), + IOobject::groupName("nuFric", phase_.name()), U.time().timeName(), U.mesh(), IOobject::NO_READ, @@ -239,7 +239,8 @@ bool Foam::RASModels::kineticTheoryModel::read() { if ( - eddyViscosity>::read() + eddyViscosity>:: + read() ) { coeffDict().lookup("equilibrium") >> equilibrium_; diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H index ac9fc781ea..048c129f3d 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,10 +47,10 @@ SourceFiles #include "RASModel.H" #include "eddyViscosity.H" -#include "phaseCompressibleMomentumTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" #include "phaseModel.H" #include "dragModel.H" -#include "viscosityModel.H" +#include "kineticTheoryViscosityModel.H" #include "conductivityModel.H" #include "radialModel.H" #include "granularPressureModel.H" @@ -70,7 +70,7 @@ namespace RASModels class kineticTheoryModel : - public eddyViscosity> + public eddyViscosity> { // Private Data @@ -168,7 +168,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const phaseModel& transport, + const transportModel& transport, const word& type = typeName ); diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H index 4395dc514e..6f0bd917ae 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ SourceFiles #ifndef GidaspowViscosity_H #define GidaspowViscosity_H -#include "viscosityModel.H" +#include "kineticTheoryViscosityModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H index 23c9595c54..20bd7f6978 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ SourceFiles #ifndef HrenyaSinclairViscosity_H #define HrenyaSinclairViscosity_H -#include "viscosityModel.H" +#include "kineticTheoryViscosityModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H index 0d9b819dc1..25c6f2fc5b 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ SourceFiles #ifndef SyamlalViscosity_H #define SyamlalViscosity_H -#include "viscosityModel.H" +#include "kineticTheoryViscosityModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H index cd8a2f4fc8..93fc6ff2da 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/none/noneViscosity.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ SourceFiles #ifndef noneViscosity_H #define noneViscosity_H -#include "viscosityModel.H" +#include "kineticTheoryViscosityModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.C similarity index 94% rename from applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C rename to applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.C index 66047a1abd..4f4a96c7fa 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "viscosityModel.H" +#include "kineticTheoryViscosityModel.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.H similarity index 95% rename from applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H rename to applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.H index 5b9507cc47..a8f68017fa 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,8 +31,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef viscosityModel_H -#define viscosityModel_H +#ifndef kineticTheoryViscosityModel_H +#define kineticTheoryViscosityModel_H #include "dictionary.H" #include "volFields.H" diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModelNew.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModelNew.C similarity index 95% rename from applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModelNew.C rename to applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModelNew.C index cd98323d50..b5a48cc966 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModelNew.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/kineticTheoryModels/viscosityModel/viscosityModel/kineticTheoryViscosityModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "viscosityModel.H" +#include "kineticTheoryViscosityModel.H" // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/multiphaseCompressibleMomentumTransportModels.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/multiphaseCompressibleMomentumTransportModels.C index ddeb9e25b7..a2efa499e4 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/multiphaseCompressibleMomentumTransportModels.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/multiphaseCompressibleMomentumTransportModels.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,61 +23,13 @@ License \*---------------------------------------------------------------------------*/ -#include "phaseCompressibleMomentumTransportModel.H" -#include "addToRunTimeSelectionTable.H" -#include "makeMomentumTransportModel.H" - -#include "laminarModel.H" -#include "RASModel.H" -#include "LESModel.H" +#include "phaseDynamicMomentumTransportModels.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makeMomentumTransportModelTypes -( - volScalarField, - volScalarField, - compressibleMomentumTransportModel, - PhaseCompressibleMomentumTransportModel, - phaseModel -); - -makeBaseMomentumTransportModel -( - volScalarField, - volScalarField, - compressibleMomentumTransportModel, - PhaseCompressibleMomentumTransportModel, - phaseModel -); - -#define makeLaminarModel(Type) \ - makeTemplatedLaminarModel \ - (phaseModelPhaseCompressibleMomentumTransportModel, laminar, Type) - -#define makeRASModel(Type) \ - makeTemplatedMomentumTransportModel \ - (phaseModelPhaseCompressibleMomentumTransportModel, RAS, Type) - -#define makeLESModel(Type) \ - makeTemplatedMomentumTransportModel \ - (phaseModelPhaseCompressibleMomentumTransportModel, LES, Type) - -#include "Stokes.H" -makeLaminarModel(Stokes); - -#include "generalizedNewtonian.H" -makeLaminarModel(generalizedNewtonian); - -#include "kEpsilon.H" -makeRASModel(kEpsilon); - #include "LaheyKEpsilon.H" makeRASModel(LaheyKEpsilon); -#include "kOmegaSST.H" -makeRASModel(kOmegaSST); - #include "kOmegaSSTSato.H" makeRASModel(kOmegaSSTSato); @@ -87,12 +39,6 @@ makeRASModel(continuousGasKEpsilon); #include "mixtureKEpsilon.H" makeRASModel(mixtureKEpsilon); -#include "Smagorinsky.H" -makeLESModel(Smagorinsky); - -#include "kEqn.H" -makeLESModel(kEqn); - #include "SmagorinskyZhang.H" makeLESModel(SmagorinskyZhang); @@ -104,11 +50,19 @@ makeLESModel(continuousGasKEqn); #include "kineticTheoryModel.H" makeMomentumTransportModel -(phaseModelPhaseCompressibleMomentumTransportModel, RAS, kineticTheoryModel); +( + dynamicTransportModelPhaseCompressibleMomentumTransportModel, + RAS, + kineticTheoryModel +); #include "phasePressureModel.H" makeMomentumTransportModel -(phaseModelPhaseCompressibleMomentumTransportModel, RAS, phasePressureModel); +( + dynamicTransportModelPhaseCompressibleMomentumTransportModel, + RAS, + phasePressureModel +); // ************************************************************************* // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.C index 083fddfee6..3c2bb7862f 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,11 +34,11 @@ Foam::RASModels::phasePressureModel::phasePressureModel const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const transportModel& phase, + const transportModel& transport, const word& type ) : - eddyViscosity> + eddyViscosity> ( type, alpha, @@ -46,7 +46,7 @@ Foam::RASModels::phasePressureModel::phasePressureModel U, alphaRhoPhi, phi, - phase + transport ), alphaMax_(coeffDict_.lookup("alphaMax")), @@ -80,8 +80,9 @@ bool Foam::RASModels::phasePressureModel::read() { if ( - eddyViscosity> - ::read()) + eddyViscosity>:: + read() + ) { coeffDict().lookup("alphaMax") >> alphaMax_; coeffDict().lookup("preAlphaExp") >> preAlphaExp_; diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.H index 7bfdcf31dd..ec9b96b53b 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseCompressibleMomentumTransportModels/phasePressureModel/phasePressureModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,7 +53,7 @@ SourceFiles #include "RASModel.H" #include "eddyViscosity.H" -#include "phaseCompressibleMomentumTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" #include "phaseModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -69,7 +69,7 @@ namespace RASModels class phasePressureModel : - public eddyViscosity> + public eddyViscosity> { // Private Data @@ -110,7 +110,7 @@ public: const volVectorField& U, const surfaceScalarField& alphaRhoPhi, const surfaceScalarField& phi, - const phaseModel& transport, + const transportModel& transport, const word& type = typeName ); diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/Make/options index 4db168fb06..29e015258c 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/Make/options @@ -3,6 +3,7 @@ EXE_INC = \ -I../phaseSystems/lnInclude \ -I../interfacialModels/lnInclude \ -I../interfacialCompositionModels/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ @@ -17,9 +18,9 @@ EXE_LIBS = \ -leulerianInterfacialModels \ -leulerianInterfacialCompositionModels \ -lmultiphaseMomentumTransportModels \ - -lmultiphaseThermophysicalTransportModels \ -lmultiphaseReactions \ - -lthermophysicalTransportModels \ + -lphaseFluidThermophysicalTransportModels \ + -lphaseFluidReactionThermophysicalTransportModels \ -lfiniteVolume \ -lfvModels \ -lfvConstraints \ diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/multiphaseEulerFoam.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/multiphaseEulerFoam.C index f648d534b6..15ce43cb3b 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/multiphaseEulerFoam.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/multiphaseEulerFoam.C @@ -36,7 +36,7 @@ Description #include "fvCFD.H" #include "dynamicFvMesh.H" #include "phaseSystem.H" -#include "phaseCompressibleMomentumTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" #include "pimpleControl.H" #include "pressureControl.H" #include "localEulerDdtScheme.H" diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/multiphaseSystems/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/multiphaseSystems/Make/options index e41b231125..0572ef7762 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/multiphaseSystems/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/multiphaseSystems/Make/options @@ -3,6 +3,7 @@ EXE_INC = \ -I../../interfacialCompositionModels/lnInclude \ -I../../phaseSystems/lnInclude \ -I../../multiphaseCompressibleMomentumTransportModels/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseReactions/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseReactions/Make/options index f614671d4e..22028cc703 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseReactions/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseReactions/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseThermophysicalTransportModels/Make/files b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseThermophysicalTransportModels/Make/files deleted file mode 100644 index 65626bcd4c..0000000000 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseThermophysicalTransportModels/Make/files +++ /dev/null @@ -1,4 +0,0 @@ -multiphaseThermophysicalTransportModels.C -rhoReactionMultiphaseThermophysicalTransportModels.C - -LIB = $(FOAM_LIBBIN)/libmultiphaseThermophysicalTransportModels diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/Make/options b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/Make/options index 339d710cca..297aa887fd 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/Make/options +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/Make/options @@ -2,6 +2,7 @@ EXE_INC = \ -I../interfacialModels/lnInclude \ -I../interfacialCompositionModels/lnInclude \ -I../multiphaseCompressibleMomentumTransportModels/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C index 0ef1ef259f..87b311befb 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "IATEsource.H" #include "fvMatrix.H" -#include "phaseCompressibleMomentumTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" #include "uniformDimensionedFields.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C index 9d9636f5c2..12ebd0b7df 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C @@ -163,7 +163,7 @@ Foam::MovingPhaseModel::MovingPhaseModel divU_(nullptr), turbulence_ ( - phaseCompressibleMomentumTransportModel::New + phaseCompressible::momentumTransportModel::New ( *this, this->thermo().rho(), @@ -177,8 +177,8 @@ Foam::MovingPhaseModel::MovingPhaseModel ( PhaseThermophysicalTransportModel < - phaseCompressibleMomentumTransportModel, - typename BasePhaseModel::thermoModel + phaseCompressible::momentumTransportModel, + transportThermoModel >::New(turbulence_, this->thermo_) ), continuityError_ @@ -519,14 +519,6 @@ void Foam::MovingPhaseModel::divU(tmp divU) } -template -Foam::tmp -Foam::MovingPhaseModel::kappaEff(const label patchi) const -{ - return thermophysicalTransport_->kappaEff(patchi); -} - - template Foam::tmp Foam::MovingPhaseModel::k() const @@ -543,6 +535,14 @@ Foam::MovingPhaseModel::pPrime() const } +template +Foam::tmp +Foam::MovingPhaseModel::kappaEff(const label patchi) const +{ + return thermophysicalTransport_->kappaEff(patchi); +} + + template Foam::tmp Foam::MovingPhaseModel::divq(volScalarField& he) const diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H index 572a41d210..82c61d46fd 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H @@ -45,14 +45,33 @@ SourceFiles #define MovingPhaseModel_H #include "phaseModel.H" -#include "phaseCompressibleMomentumTransportModel.H" #include "PhaseThermophysicalTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { +// Trait for converting the ThermoModel's thermo type to the thermo type needed +// for the thermophysical transport model type; i.e., from rho-type thermo to +// fluid-type thermo. + +template +struct MovingPhaseModelTransportThermoModel; + +template<> +struct MovingPhaseModelTransportThermoModel +{ + typedef fluidThermo type; +}; + +template<> +struct MovingPhaseModelTransportThermoModel +{ + typedef fluidReactionThermo type; +}; + /*---------------------------------------------------------------------------*\ Class MovingPhaseModel Declaration \*---------------------------------------------------------------------------*/ @@ -64,6 +83,17 @@ class MovingPhaseModel { protected: + // Protected typedefs + + //- Thermo type for the thermophysical transport model + typedef + typename MovingPhaseModelTransportThermoModel + < + typename BasePhaseModel::thermoModel + >::type + transportThermoModel; + + // Protected data //- Velocity field @@ -91,15 +121,15 @@ protected: tmp divU_; //- Turbulence model - autoPtr turbulence_; + autoPtr turbulence_; //- Thermophysical transport model autoPtr < PhaseThermophysicalTransportModel < - phaseCompressibleMomentumTransportModel, - typename BasePhaseModel::thermoModel + phaseCompressible::momentumTransportModel, + transportThermoModel > > thermophysicalTransport_; @@ -223,9 +253,6 @@ public: // Momentum transport - //- Return the effective thermal conductivity on a patch - virtual tmp kappaEff(const label patchi) const; - //- Return the turbulent kinetic energy virtual tmp k() const; @@ -236,6 +263,9 @@ public: // Thermophysical transport + //- Return the effective thermal conductivity on a patch + virtual tmp kappaEff(const label patchi) const; + //- Return the source term for the energy equation virtual tmp divq(volScalarField& he) const; diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C index 7e85626098..e91f7926ba 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,6 +38,7 @@ Foam::ThermoPhaseModel::ThermoPhaseModel ) : BasePhaseModel(fluid, phaseName, referencePhase, index), + dynamicTransportModel(), thermo_(ThermoModel::New(fluid.mesh(), this->name())) { thermo_->validate diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H index 5a5106168c..a802b311dc 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,6 +39,8 @@ SourceFiles #ifndef ThermoPhaseModel_H #define ThermoPhaseModel_H +#include "phaseModel.H" + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam @@ -53,7 +55,8 @@ class rhoThermo; template class ThermoPhaseModel : - public BasePhaseModel + public BasePhaseModel, + public dynamicTransportModel { protected: diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H index 9049df5dfe..4857f0a220 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.H @@ -38,7 +38,6 @@ SourceFiles #include "surfaceFields.H" #include "fvMatricesFwd.H" #include "rhoThermo.H" -#include "phaseCompressibleMomentumTransportModelFwd.H" #include "runTimeSelectionTables.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C index 9840d59e0e..d3c0abf887 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "LehrMilliesMewes.H" #include "addToRunTimeSelectionTable.H" -#include "phaseCompressibleMomentumTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" #include "mathematicalConstants.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C index f0280ddfe1..7f0c6a492c 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "LuoSvendsen.H" #include "addToRunTimeSelectionTable.H" -#include "phaseCompressibleMomentumTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" #include "linearInterpolationWeights.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C index a29ee3e37c..54eaa2a6b4 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "LaakkonenAlopaeusAittamaa.H" #include "addToRunTimeSelectionTable.H" -#include "phaseCompressibleMomentumTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C index 2ef60e59be..4b07150b4e 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "CoulaloglouTavlaridesCoalescence.H" #include "addToRunTimeSelectionTable.H" -#include "phaseCompressibleMomentumTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C index 63f5e4fbc9..076a076fd0 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,7 +26,7 @@ License #include "LehrMilliesMewesCoalescence.H" #include "addToRunTimeSelectionTable.H" #include "mathematicalConstants.H" -#include "phaseCompressibleMomentumTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C index e137eb117e..aadb3114d3 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/Luo/Luo.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,7 +26,7 @@ License #include "Luo.H" #include "addToRunTimeSelectionTable.H" #include "mathematicalConstants.H" -#include "phaseCompressibleMomentumTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" #include "virtualMassModel.H" #include "phaseSystem.H" diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C index bb25491398..14cddf651f 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C @@ -26,7 +26,7 @@ License #include "PrinceBlanch.H" #include "addToRunTimeSelectionTable.H" #include "mathematicalConstants.H" -#include "phaseCompressibleMomentumTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" #include "fvcGrad.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.C index ddd043e452..d02ac7ed7f 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/coalescenceModels/turbulentShear/turbulentShear.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2019-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "turbulentShear.H" #include "addToRunTimeSelectionTable.H" -#include "phaseCompressibleMomentumTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C index 22ea1b44ba..3240198eea 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C @@ -33,7 +33,7 @@ License #include "surfaceTensionModel.H" #include "fvm.H" #include "fvcDdt.H" -#include "phaseCompressibleMomentumTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" #include "shapeModel.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -1205,11 +1205,11 @@ Foam::diameterModels::populationBalanceModel::sigmaWithContinuousPhase } -const Foam::phaseCompressibleMomentumTransportModel& +const Foam::phaseCompressible::momentumTransportModel& Foam::diameterModels::populationBalanceModel::continuousTurbulence() const { return - mesh_.lookupObject + mesh_.lookupObject ( IOobject::groupName ( diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H index 54c1314157..ca214368e4 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -152,7 +152,7 @@ SourceFiles #include "sizeGroup.H" #include "phasePair.H" #include "pimpleControl.H" -#include "phaseCompressibleMomentumTransportModelFwd.H" +#include "phaseDynamicMomentumTransportModel.H" #include "HashPtrTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -450,7 +450,7 @@ public: ) const; //- Return reference to turbulence model of the continuous phase - const phaseCompressibleMomentumTransportModel& + const phaseCompressible::momentumTransportModel& continuousTurbulence() const; //- Solve the population balance equation diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Make/options b/applications/solvers/multiphase/multiphaseInterFoam/Make/options index 5409f2d81c..cbf53b4812 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/Make/options +++ b/applications/solvers/multiphase/multiphaseInterFoam/Make/options @@ -13,7 +13,7 @@ EXE_INC = \ EXE_LIBS = \ -lmultiphaseInterFoam \ -linterfaceProperties \ - -lincompressibleTransportModels \ + -ltransportModels \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ -lfiniteVolume \ diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/Make/options b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/Make/options index be24289a0f..2b7d2ae98e 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/Make/options +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/Make/options @@ -7,6 +7,6 @@ EXE_INC = \ LIB_LIBS = \ -linterfaceProperties \ - -lincompressibleTransportModels \ + -ltransportModels \ -lfiniteVolume \ -lmeshTools diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C index 92fde17855..e003518593 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -677,7 +677,7 @@ void Foam::multiphaseMixture::solveAlphas bool Foam::multiphaseMixture::read() { - if (transportModel::read()) + if (regIOobject::read()) { bool readOK = true; diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H index 163270e8a5..b28040a8c9 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,8 +28,8 @@ Description Incompressible multi-phase mixture with built in solution for the phase fractions with interface compression for interface-capturing. - Derived from transportModel so that it can be used in conjunction with - the incompressible turbulence models. + Derived from kinematicTransportModel so that it can be used in conjunction + with the incompressible turbulence models. Surface tension and contact-angle is handled for the interface between each phase-pair. @@ -42,7 +42,7 @@ SourceFiles #ifndef multiphaseMixture_H #define multiphaseMixture_H -#include "transportModel.H" +#include "kinematicTransportModel.H" #include "IOdictionary.H" #include "phase.H" #include "PtrDictionary.H" @@ -61,7 +61,7 @@ namespace Foam class multiphaseMixture : public IOdictionary, - public transportModel + public kinematicTransportModel { public: diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options b/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options index 16732b80ce..234f8d3967 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options +++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options @@ -8,7 +8,7 @@ EXE_INC = \ -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ - -lincompressibleTransportModels \ + -ltransportModels \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ -lfiniteVolume \ diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/Make/options b/applications/solvers/stressAnalysis/solidDisplacementFoam/Make/options index cc1e51ca8a..c870dc0ef4 100644 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/Make/options +++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/Make/options @@ -3,6 +3,7 @@ EXE_INC = \ -IsolidDisplacementThermo \ -IderivedFvPatchFields/tractionDisplacement \ -IderivedFvPatchFields/hydrostaticDisplacement \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementThermo/Make/options b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementThermo/Make/options index 376d161acb..dccaba6150 100644 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementThermo/Make/options +++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementThermo/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/Make/options b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/Make/options index 76059b4b75..a91b17d444 100644 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/Make/options +++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidEquilibriumDisplacementFoam/Make/options @@ -3,6 +3,7 @@ EXE_INC = \ -I.. \ -I../solidDisplacementThermo \ -ItractionDisplacementCorrection \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ diff --git a/applications/utilities/mesh/advanced/PDRMesh/Make/options b/applications/utilities/mesh/advanced/PDRMesh/Make/options index afdf612f46..c914252157 100644 --- a/applications/utilities/mesh/advanced/PDRMesh/Make/options +++ b/applications/utilities/mesh/advanced/PDRMesh/Make/options @@ -5,7 +5,7 @@ EXE_INC = \ EXE_LIBS = \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lfluidThermophysicalModels \ -lmeshTools \ -ldynamicMesh \ diff --git a/applications/utilities/postProcessing/postProcess/Make/options b/applications/utilities/postProcessing/postProcess/Make/options index c36a50dca2..18dfa9feb6 100644 --- a/applications/utilities/postProcessing/postProcess/Make/options +++ b/applications/utilities/postProcessing/postProcess/Make/options @@ -1,9 +1,9 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/fvModels/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ @@ -12,8 +12,8 @@ EXE_INC = \ EXE_LIBS = \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ - -lincompressibleTransportModels \ + -lcompressibleMomentumTransportModels \ + -ltransportModels \ -lfluidThermophysicalModels \ -lspecie \ -lfiniteVolume \ diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/Make/options b/applications/utilities/preProcessing/applyBoundaryLayer/Make/options index 0d242e09b3..43018716c6 100644 --- a/applications/utilities/preProcessing/applyBoundaryLayer/Make/options +++ b/applications/utilities/preProcessing/applyBoundaryLayer/Make/options @@ -8,7 +8,7 @@ EXE_INC = \ EXE_LIBS = \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ - -lincompressibleTransportModels \ + -ltransportModels \ -lgenericPatchFields \ -lfiniteVolume \ -lmeshTools \ diff --git a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options index 5aadde5cbe..94ed75e29e 100644 --- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options +++ b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options @@ -4,7 +4,7 @@ EXE_INC = \ EXE_LIBS = \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lfiniteVolume \ -lfvModels \ -lmeshTools diff --git a/src/Allwmake b/src/Allwmake index 6f86a0e218..8382f8fa09 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -54,8 +54,9 @@ wmake $targetType ODE wmake $targetType randomProcesses wmake $targetType transportModels -twoPhaseModels/Allwmake $targetType $* + thermophysicalModels/Allwmake $targetType $* +twoPhaseModels/Allwmake $targetType $* MomentumTransportModels/Allwmake $targetType $* ThermophysicalTransportModels/Allwmake $targetType $* wmake $targetType radiationModels diff --git a/src/MomentumTransportModels/Allwmake b/src/MomentumTransportModels/Allwmake index 3cc394a5d0..3712bd3ccc 100755 --- a/src/MomentumTransportModels/Allwmake +++ b/src/MomentumTransportModels/Allwmake @@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # Run from this directory wmake $targetType momentumTransportModels wmake $targetType incompressible wmake $targetType compressible -wmakeLnInclude phaseIncompressible -wmakeLnInclude phaseCompressible +wmake $targetType phaseIncompressible +wmake $targetType phaseCompressible #------------------------------------------------------------------------------ diff --git a/src/MomentumTransportModels/compressible/CompressibleMomentumTransportModel/CompressibleMomentumTransportModel.H b/src/MomentumTransportModels/compressible/CompressibleMomentumTransportModel/CompressibleMomentumTransportModel.H index 24b37579fe..dd1522780a 100644 --- a/src/MomentumTransportModels/compressible/CompressibleMomentumTransportModel/CompressibleMomentumTransportModel.H +++ b/src/MomentumTransportModels/compressible/CompressibleMomentumTransportModel/CompressibleMomentumTransportModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -65,7 +65,6 @@ public: typedef geometricOneField alphaField; typedef volScalarField rhoField; typedef TransportModel transportModel; - typedef typename TransportTraits::thermoModel thermoModel; // Constructors @@ -102,34 +101,30 @@ public: // Member Functions - //- Access function to incompressible transport model - virtual const thermoModel& thermo() const - { - return TransportTraits::thermo(this->transport_); - } - //- Return the laminar dynamic viscosity virtual tmp mu() const { - return thermo().mu(); + return this->transport_.mu(); } //- Return the laminar dynamic viscosity on patch virtual tmp mu(const label patchi) const { - return thermo().mu(patchi); + return this->transport_.mu(patchi); } //- Return the laminar viscosity virtual tmp nu() const { - return thermo().mu()/this->rho_; + return this->transport_.mu()/this->rho_; } //- Return the laminar viscosity on patchi virtual tmp nu(const label patchi) const { - return thermo().mu(patchi)/this->rho_.boundaryField()[patchi]; + return + this->transport_.mu(patchi) + /this->rho_.boundaryField()[patchi]; } //- Return the turbulence dynamic viscosity diff --git a/src/MomentumTransportModels/compressible/Make/files b/src/MomentumTransportModels/compressible/Make/files index cd4a2c2073..34eed772a2 100644 --- a/src/MomentumTransportModels/compressible/Make/files +++ b/src/MomentumTransportModels/compressible/Make/files @@ -1,4 +1,4 @@ compressibleMomentumTransportModel.C -fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModels.C +dynamicMomentumTransportModels/dynamicMomentumTransportModels.C -LIB = $(FOAM_LIBBIN)/libfluidThermoMomentumTransportModels +LIB = $(FOAM_LIBBIN)/libcompressibleMomentumTransportModels diff --git a/src/MomentumTransportModels/compressible/Make/options b/src/MomentumTransportModels/compressible/Make/options index 5d0c1c4597..d2ac924d58 100644 --- a/src/MomentumTransportModels/compressible/Make/options +++ b/src/MomentumTransportModels/compressible/Make/options @@ -1,16 +1,10 @@ EXE_INC = \ -I../momentumTransportModels/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ LIB_LIBS = \ - -lfluidThermophysicalModels \ - -lsolidThermo \ - -lmomentumTransportModels \ - -lspecie \ + -ltransportModels \ -lfiniteVolume \ -lmeshTools diff --git a/src/MomentumTransportModels/compressible/compressibleMomentumTransportModel.H b/src/MomentumTransportModels/compressible/compressibleMomentumTransportModel.H index 17c17b1b29..a45228ed77 100644 --- a/src/MomentumTransportModels/compressible/compressibleMomentumTransportModel.H +++ b/src/MomentumTransportModels/compressible/compressibleMomentumTransportModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,21 +45,6 @@ namespace Foam // Forward declarations class fvMesh; -// Transport properties traits class to provide the thermo model -template -class TransportTraits -{ -public: - - typedef TransportType thermoModel; - - static const thermoModel& thermo(const TransportType& tt) - { - return tt; - } -}; - - /*---------------------------------------------------------------------------*\ Class compressibleMomentumTransportModel Declaration \*---------------------------------------------------------------------------*/ diff --git a/src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModel.C b/src/MomentumTransportModels/compressible/dynamicMomentumTransportModels/dynamicMomentumTransportModel.C similarity index 94% rename from src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModel.C rename to src/MomentumTransportModels/compressible/dynamicMomentumTransportModels/dynamicMomentumTransportModel.C index e074364620..d70ce5c295 100644 --- a/src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModel.C +++ b/src/MomentumTransportModels/compressible/dynamicMomentumTransportModels/dynamicMomentumTransportModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModel.H b/src/MomentumTransportModels/compressible/dynamicMomentumTransportModels/dynamicMomentumTransportModel.H similarity index 87% rename from src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModel.H rename to src/MomentumTransportModels/compressible/dynamicMomentumTransportModels/dynamicMomentumTransportModel.H index af553ad97c..319ef98d4b 100644 --- a/src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModel.H +++ b/src/MomentumTransportModels/compressible/dynamicMomentumTransportModels/dynamicMomentumTransportModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,19 +38,19 @@ Description based on the standard laminar transport package. SourceFiles - fluidThermoMomentumTransportModel.C - fluidThermoMomentumTransportModels.C + dynamicMomentumTransportModel.C + dynamicMomentumTransportModels.C \*---------------------------------------------------------------------------*/ -#ifndef fluidThermoMomentumTransportModel_H -#define fluidThermoMomentumTransportModel_H +#ifndef dynamicMomentumTransportModel_H +#define dynamicMomentumTransportModel_H #include "CompressibleMomentumTransportModel.H" #include "laminarModel.H" #include "RASModel.H" #include "LESModel.H" -#include "fluidThermo.H" +#include "dynamicTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -58,7 +58,7 @@ namespace Foam { namespace compressible { - typedef CompressibleMomentumTransportModel + typedef CompressibleMomentumTransportModel momentumTransportModel; typedef laminarModel laminarModel; typedef RASModel RASModel; @@ -80,7 +80,7 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository - #include "fluidThermoMomentumTransportModel.C" + #include "dynamicMomentumTransportModel.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModels.C b/src/MomentumTransportModels/compressible/dynamicMomentumTransportModels/dynamicMomentumTransportModels.C similarity index 96% rename from src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModels.C rename to src/MomentumTransportModels/compressible/dynamicMomentumTransportModels/dynamicMomentumTransportModels.C index 350e41884c..88c449cb5f 100644 --- a/src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModels.C +++ b/src/MomentumTransportModels/compressible/dynamicMomentumTransportModels/dynamicMomentumTransportModels.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,7 +23,7 @@ License \*---------------------------------------------------------------------------*/ -#include "fluidThermoMomentumTransportModels.H" +#include "dynamicMomentumTransportModels.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -33,7 +33,7 @@ makeBaseMomentumTransportModel volScalarField, compressibleMomentumTransportModel, CompressibleMomentumTransportModel, - fluidThermo + dynamicTransportModel ); diff --git a/src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModels.H b/src/MomentumTransportModels/compressible/dynamicMomentumTransportModels/dynamicMomentumTransportModels.H similarity index 85% rename from src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModels.H rename to src/MomentumTransportModels/compressible/dynamicMomentumTransportModels/dynamicMomentumTransportModels.H index b2ec19f0aa..3f2aa0520b 100644 --- a/src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/fluidThermoMomentumTransportModels.H +++ b/src/MomentumTransportModels/compressible/dynamicMomentumTransportModels/dynamicMomentumTransportModels.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "CompressibleMomentumTransportModel.H" -#include "fluidThermo.H" +#include "dynamicTransportModel.H" #include "addToRunTimeSelectionTable.H" #include "makeMomentumTransportModel.H" @@ -40,20 +40,20 @@ makeMomentumTransportModelTypes volScalarField, compressibleMomentumTransportModel, CompressibleMomentumTransportModel, - fluidThermo + dynamicTransportModel ); #define makeLaminarModel(Type) \ makeTemplatedLaminarModel \ - (fluidThermoCompressibleMomentumTransportModel, laminar, Type) + (dynamicTransportModelCompressibleMomentumTransportModel, laminar, Type) #define makeRASModel(Type) \ makeTemplatedMomentumTransportModel \ - (fluidThermoCompressibleMomentumTransportModel, RAS, Type) + (dynamicTransportModelCompressibleMomentumTransportModel, RAS, Type) #define makeLESModel(Type) \ makeTemplatedMomentumTransportModel \ - (fluidThermoCompressibleMomentumTransportModel, LES, Type) + (dynamicTransportModelCompressibleMomentumTransportModel, LES, Type) // ************************************************************************* // diff --git a/src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/makeMomentumTransportModel.H b/src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/makeMomentumTransportModel.H deleted file mode 100644 index 1a31014a18..0000000000 --- a/src/MomentumTransportModels/compressible/fluidThermoMomentumTransportModels/makeMomentumTransportModel.H +++ /dev/null @@ -1,175 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#define makeMomentumTransportModelTypes( \ - Alpha, Rho, baseModel, BaseModel, Transport) \ - \ - namespace Foam \ - { \ - typedef BaseModel \ - Transport##BaseModel; \ - typedef laminarModel \ - laminar##Transport##BaseModel; \ - typedef RASModel \ - RAS##Transport##BaseModel; \ - typedef LESModel \ - LES##Transport##BaseModel; \ - } - - -#define makeBaseMomentumTransportModel( \ - Alpha, Rho, baseModel, BaseModel, Transport) \ - \ - namespace Foam \ - { \ - typedef MomentumTransportModel \ - < \ - Alpha, \ - Rho, \ - baseModel, \ - Transport \ - > Transport##baseModel; \ - \ - defineTemplateRunTimeSelectionTable \ - ( \ - Transport##baseModel, \ - dictionary \ - ); \ - \ - typedef BaseModel \ - Transport##BaseModel; \ - \ - \ - typedef laminarModel \ - laminar##Transport##BaseModel; \ - \ - defineNamedTemplateTypeNameAndDebug(laminar##Transport##BaseModel, 0); \ - \ - defineTemplateRunTimeSelectionTable \ - (laminar##Transport##BaseModel, dictionary); \ - \ - addToRunTimeSelectionTable \ - ( \ - Transport##baseModel, \ - laminar##Transport##BaseModel, \ - dictionary \ - ); \ - \ - \ - typedef RASModel \ - RAS##Transport##BaseModel; \ - \ - defineNamedTemplateTypeNameAndDebug(RAS##Transport##BaseModel, 0); \ - \ - defineTemplateRunTimeSelectionTable \ - (RAS##Transport##BaseModel, dictionary); \ - \ - addToRunTimeSelectionTable \ - ( \ - Transport##baseModel, \ - RAS##Transport##BaseModel, \ - dictionary \ - ); \ - \ - \ - typedef LESModel \ - LES##Transport##BaseModel; \ - \ - defineNamedTemplateTypeNameAndDebug(LES##Transport##BaseModel, 0); \ - \ - defineTemplateRunTimeSelectionTable \ - (LES##Transport##BaseModel, dictionary); \ - \ - addToRunTimeSelectionTable \ - ( \ - Transport##baseModel, \ - LES##Transport##BaseModel, \ - dictionary \ - ); \ - } - - -#define makeTemplatedLaminarModel(BaseModel, SType, Type) \ - typedef Foam::SType##Models::Type \ - Type##SType##BaseModel; \ - defineNamedTemplateTypeNameAndDebug(Type##SType##BaseModel, 0); \ - \ - namespace Foam \ - { \ - namespace SType##Models \ - { \ - typedef Type Type##SType##BaseModel; \ - \ - addToRunTimeSelectionTable \ - ( \ - SType##BaseModel, \ - Type##SType##BaseModel, \ - dictionary \ - ); \ - } \ - } - - -#define makeTemplatedMomentumTransportModel(BaseModel, SType, Type) \ - typedef Foam::SType##Models::Type \ - Type##SType##BaseModel; \ - defineNamedTemplateTypeNameAndDebug(Type##SType##BaseModel, 0); \ - \ - namespace Foam \ - { \ - namespace SType##Models \ - { \ - typedef Type Type##SType##BaseModel; \ - \ - addToRunTimeSelectionTable \ - ( \ - SType##BaseModel, \ - Type##SType##BaseModel, \ - dictionary \ - ); \ - } \ - } - - -#define makeMomentumTransportModel(BaseModel, SType, Type) \ - namespace Foam \ - { \ - namespace SType##Models \ - { \ - defineTypeNameAndDebug(Type, 0); \ - \ - addToRunTimeSelectionTable \ - ( \ - SType##BaseModel, \ - Type, \ - dictionary \ - ); \ - } \ - } - - -// ************************************************************************* // diff --git a/src/MomentumTransportModels/incompressible/Make/options b/src/MomentumTransportModels/incompressible/Make/options index 113571d983..bd03fbc70b 100644 --- a/src/MomentumTransportModels/incompressible/Make/options +++ b/src/MomentumTransportModels/incompressible/Make/options @@ -5,7 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ LIB_LIBS = \ - -lincompressibleTransportModels \ + -ltransportModels \ -lmomentumTransportModels \ -lfiniteVolume \ -lmeshTools diff --git a/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModel.H b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModel.H index 0d0848af30..d48d7b0cad 100644 --- a/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModel.H +++ b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,7 +47,7 @@ SourceFiles #include "laminarModel.H" #include "RASModel.H" #include "LESModel.H" -#include "transportModel.H" +#include "kinematicTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -55,7 +55,7 @@ namespace Foam { namespace incompressible { - typedef IncompressibleMomentumTransportModel + typedef IncompressibleMomentumTransportModel momentumTransportModel; typedef laminarModel laminarModel; diff --git a/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModels.C b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModels.C index 7b6abb8977..719a6dd724 100644 --- a/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModels.C +++ b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModels.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,7 +33,7 @@ makeBaseMomentumTransportModel geometricOneField, incompressibleMomentumTransportModel, IncompressibleMomentumTransportModel, - transportModel + kinematicTransportModel ); diff --git a/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModels.H b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModels.H index 83a6bb870b..12e9518d09 100644 --- a/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModels.H +++ b/src/MomentumTransportModels/incompressible/kinematicMomentumTransportModels/kinematicMomentumTransportModels.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "IncompressibleMomentumTransportModel.H" -#include "transportModel.H" +#include "kinematicTransportModel.H" #include "addToRunTimeSelectionTable.H" #include "makeMomentumTransportModel.H" @@ -40,20 +40,24 @@ makeMomentumTransportModelTypes geometricOneField, incompressibleMomentumTransportModel, IncompressibleMomentumTransportModel, - transportModel + kinematicTransportModel ); #define makeLaminarModel(Type) \ makeTemplatedMomentumTransportModel \ - (transportModelIncompressibleMomentumTransportModel, laminar, Type) + ( \ + kinematicTransportModelIncompressibleMomentumTransportModel, \ + laminar, \ + Type \ + ) #define makeRASModel(Type) \ makeTemplatedMomentumTransportModel \ - (transportModelIncompressibleMomentumTransportModel, RAS, Type) + (kinematicTransportModelIncompressibleMomentumTransportModel, RAS, Type) #define makeLESModel(Type) \ makeTemplatedMomentumTransportModel \ - (transportModelIncompressibleMomentumTransportModel, LES, Type) + (kinematicTransportModelIncompressibleMomentumTransportModel, LES, Type) // ************************************************************************* // diff --git a/src/MomentumTransportModels/momentumTransportModels/makeMomentumTransportModel.H b/src/MomentumTransportModels/momentumTransportModels/makeMomentumTransportModel.H index 5dccbb20a6..cc91427755 100644 --- a/src/MomentumTransportModels/momentumTransportModels/makeMomentumTransportModel.H +++ b/src/MomentumTransportModels/momentumTransportModels/makeMomentumTransportModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,6 +23,8 @@ License \*---------------------------------------------------------------------------*/ +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + #define makeMomentumTransportModelTypes( \ Alpha, Rho, baseModel, BaseModel, Transport) \ \ @@ -96,6 +98,27 @@ License } +#define makeTemplatedLaminarModel(BaseModel, SType, Type) \ + typedef Foam::SType##Models::Type \ + Type##SType##BaseModel; \ + defineNamedTemplateTypeNameAndDebug(Type##SType##BaseModel, 0); \ + \ + namespace Foam \ + { \ + namespace SType##Models \ + { \ + typedef Type Type##SType##BaseModel; \ + \ + addToRunTimeSelectionTable \ + ( \ + SType##BaseModel, \ + Type##SType##BaseModel, \ + dictionary \ + ); \ + } \ + } + + #define makeTemplatedMomentumTransportModel(BaseModel, SType, Type) \ defineNamedTemplateTypeNameAndDebug \ (Foam::SType##Models::Type, 0); \ diff --git a/src/MomentumTransportModels/phaseCompressible/LES/Niceno/NicenoKEqn.C b/src/MomentumTransportModels/phaseCompressible/LES/Niceno/NicenoKEqn.C index 3cfe4d2d33..f6d7a71704 100644 --- a/src/MomentumTransportModels/phaseCompressible/LES/Niceno/NicenoKEqn.C +++ b/src/MomentumTransportModels/phaseCompressible/LES/Niceno/NicenoKEqn.C @@ -131,9 +131,9 @@ NicenoKEqn::gasTurbulence() const { const volVectorField& U = this->U_; - const transportModel& liquid = this->transport(); + const phaseModel& liquid = refCast(this->transport()); const phaseSystem& fluid = liquid.fluid(); - const transportModel& gas = fluid.otherPhase(liquid); + const phaseModel& gas = fluid.otherPhase(liquid); gasTurbulencePtr_ = &U.db().lookupObject @@ -159,9 +159,13 @@ void NicenoKEqn::correctNut() const PhaseCompressibleMomentumTransportModel& gasTurbulence = this->gasTurbulence(); + const phaseModel& liquid = refCast(this->transport()); + const phaseSystem& fluid = liquid.fluid(); + const phaseModel& gas = fluid.otherPhase(liquid); + this->nut_ = this->Ck_*sqrt(this->k_)*this->delta() - + Cmub_*gasTurbulence.transport().d()*gasTurbulence.alpha() + + Cmub_*gas.d()*gasTurbulence.alpha() *(mag(this->U_ - gasTurbulence.U())); this->nut_.correctBoundaryConditions(); @@ -175,9 +179,9 @@ tmp NicenoKEqn::bubbleG() const const PhaseCompressibleMomentumTransportModel& gasTurbulence = this->gasTurbulence(); - const transportModel& liquid = this->transport(); + const phaseModel& liquid = refCast(this->transport()); const phaseSystem& fluid = liquid.fluid(); - const transportModel& gas = fluid.otherPhase(liquid); + const phaseModel& gas = fluid.otherPhase(liquid); const dragModel& drag = fluid.lookupSubModel(gas, liquid); diff --git a/src/MomentumTransportModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C b/src/MomentumTransportModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C index cd075da83e..4b865bf206 100644 --- a/src/MomentumTransportModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C +++ b/src/MomentumTransportModels/phaseCompressible/LES/SmagorinskyZhang/SmagorinskyZhang.C @@ -107,9 +107,9 @@ SmagorinskyZhang::gasTurbulence() const { const volVectorField& U = this->U_; - const transportModel& liquid = this->transport(); + const phaseModel& liquid = refCast(this->transport()); const phaseSystem& fluid = liquid.fluid(); - const transportModel& gas = fluid.otherPhase(liquid); + const phaseModel& gas = fluid.otherPhase(liquid); gasTurbulencePtr_ = &U.db().lookupObject @@ -135,11 +135,15 @@ void SmagorinskyZhang::correctNut() const PhaseCompressibleMomentumTransportModel& gasTurbulence = this->gasTurbulence(); + const phaseModel& liquid = refCast(this->transport()); + const phaseSystem& fluid = liquid.fluid(); + const phaseModel& gas = fluid.otherPhase(liquid); + volScalarField k(this->k(fvc::grad(this->U_))); this->nut_ = this->Ck_*sqrt(k)*this->delta() - + Cmub_*gasTurbulence.transport().d()*gasTurbulence.alpha() + + Cmub_*gas.d()*gasTurbulence.alpha() *(mag(this->U_ - gasTurbulence.U())); this->nut_.correctBoundaryConditions(); diff --git a/src/MomentumTransportModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C b/src/MomentumTransportModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C index 55db7026d0..283bd3d8ce 100644 --- a/src/MomentumTransportModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C +++ b/src/MomentumTransportModels/phaseCompressible/LES/continuousGasKEqn/continuousGasKEqn.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -103,9 +103,9 @@ continuousGasKEqn::liquidTurbulence() const { const volVectorField& U = this->U_; - const transportModel& gas = this->transport(); + const phaseModel& gas = refCast(this->transport()); const phaseSystem& fluid = gas.fluid(); - const transportModel& liquid = fluid.otherPhase(gas); + const phaseModel& liquid = fluid.otherPhase(gas); liquidTurbulencePtr_ = &U.db().lookupObject diff --git a/src/MomentumTransportModels/phaseCompressible/Make/files b/src/MomentumTransportModels/phaseCompressible/Make/files new file mode 100644 index 0000000000..effffeb233 --- /dev/null +++ b/src/MomentumTransportModels/phaseCompressible/Make/files @@ -0,0 +1,3 @@ +phaseDynamicMomentumTransportModels/phaseDynamicMomentumTransportModels.C + +LIB = $(FOAM_LIBBIN)/libphaseCompressibleMomentumTransportModels diff --git a/src/MomentumTransportModels/phaseCompressible/Make/options b/src/MomentumTransportModels/phaseCompressible/Make/options new file mode 100644 index 0000000000..b373cc1dbc --- /dev/null +++ b/src/MomentumTransportModels/phaseCompressible/Make/options @@ -0,0 +1,11 @@ +EXE_INC = \ + -I../momentumTransportModels/lnInclude \ + -I../compressible/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ + +LIB_LIBS = \ + -ltransportModels \ + -lfiniteVolume \ + -lmeshTools diff --git a/src/MomentumTransportModels/phaseCompressible/PhaseCompressibleMomentumTransportModel/PhaseCompressibleMomentumTransportModel.H b/src/MomentumTransportModels/phaseCompressible/PhaseCompressibleMomentumTransportModel/PhaseCompressibleMomentumTransportModel.H index a14772e855..7ab3dba1a1 100644 --- a/src/MomentumTransportModels/phaseCompressible/PhaseCompressibleMomentumTransportModel/PhaseCompressibleMomentumTransportModel.H +++ b/src/MomentumTransportModels/phaseCompressible/PhaseCompressibleMomentumTransportModel/PhaseCompressibleMomentumTransportModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -65,7 +65,6 @@ public: typedef volScalarField alphaField; typedef volScalarField rhoField; typedef TransportModel transportModel; - typedef typename TransportTraits::thermoModel thermoModel; // Constructors @@ -104,34 +103,30 @@ public: // Member Functions - //- Access function to incompressible transport model - virtual const thermoModel& thermo() const - { - return TransportTraits::thermo(this->transport_); - } - //- Return the laminar dynamic viscosity virtual tmp mu() const { - return thermo().mu(); + return this->transport_.mu(); } //- Return the laminar dynamic viscosity on patch virtual tmp mu(const label patchi) const { - return thermo().mu(patchi); + return this->transport_.mu(patchi); } //- Return the laminar viscosity virtual tmp nu() const { - return thermo().mu()/this->rho_; + return this->transport_.mu()/this->rho_; } //- Return the laminar viscosity on patchi virtual tmp nu(const label patchi) const { - return thermo().mu(patchi)/this->rho_.boundaryField()[patchi]; + return + this->transport_.mu(patchi) + /this->rho_.boundaryField()[patchi]; } //- Return the turbulence dynamic viscosity diff --git a/src/MomentumTransportModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C b/src/MomentumTransportModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C index f3eeb86086..43119722d1 100644 --- a/src/MomentumTransportModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C +++ b/src/MomentumTransportModels/phaseCompressible/RAS/LaheyKEpsilon/LaheyKEpsilon.C @@ -142,9 +142,9 @@ LaheyKEpsilon::gasTurbulence() const { const volVectorField& U = this->U_; - const transportModel& liquid = this->transport(); + const phaseModel& liquid = refCast(this->transport()); const phaseSystem& fluid = liquid.fluid(); - const transportModel& gas = fluid.otherPhase(liquid); + const phaseModel& gas = fluid.otherPhase(liquid); gasTurbulencePtr_ = &U.db().lookupObject @@ -170,9 +170,13 @@ void LaheyKEpsilon::correctNut() const PhaseCompressibleMomentumTransportModel& gasTurbulence = this->gasTurbulence(); + const phaseModel& liquid = refCast(this->transport()); + const phaseSystem& fluid = liquid.fluid(); + const phaseModel& gas = fluid.otherPhase(liquid); + this->nut_ = this->Cmu_*sqr(this->k_)/this->epsilon_ - + Cmub_*gasTurbulence.transport().d()*gasTurbulence.alpha() + + Cmub_*gas.d()*gasTurbulence.alpha() *(mag(this->U_ - gasTurbulence.U())); this->nut_.correctBoundaryConditions(); @@ -186,9 +190,9 @@ tmp LaheyKEpsilon::bubbleG() const const PhaseCompressibleMomentumTransportModel& gasTurbulence = this->gasTurbulence(); - const transportModel& liquid = this->transport(); + const phaseModel& liquid = refCast(this->transport()); const phaseSystem& fluid = liquid.fluid(); - const transportModel& gas = fluid.otherPhase(liquid); + const phaseModel& gas = fluid.otherPhase(liquid); const dragModel& drag = fluid.lookupSubModel(gas, liquid); diff --git a/src/MomentumTransportModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C b/src/MomentumTransportModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C index 52d81a180d..2492270f19 100644 --- a/src/MomentumTransportModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C +++ b/src/MomentumTransportModels/phaseCompressible/RAS/continuousGasKEpsilon/continuousGasKEpsilon.C @@ -118,9 +118,10 @@ void continuousGasKEpsilon::correctNut() kEpsilon::correctNut(); const momentumTransportModel& liquidTurbulence = this->liquidTurbulence(); - const transportModel& gas = this->transport(); + + const phaseModel& gas = refCast(this->transport()); const phaseSystem& fluid = gas.fluid(); - const transportModel& liquid = fluid.otherPhase(gas); + const phaseModel& liquid = fluid.otherPhase(gas); const virtualMassModel& virtualMass = fluid.lookupSubModel(gas, liquid); @@ -154,9 +155,9 @@ continuousGasKEpsilon::liquidTurbulence() const { const volVectorField& U = this->U_; - const transportModel& gas = this->transport(); + const phaseModel& gas = refCast(this->transport()); const phaseSystem& fluid = gas.fluid(); - const transportModel& liquid = fluid.otherPhase(gas); + const phaseModel& liquid = fluid.otherPhase(gas); liquidTurbulencePtr_ = &U.db().lookupObject @@ -194,7 +195,7 @@ continuousGasKEpsilon::nuEff() const ( IOobject::groupName("nuEff", this->alphaRhoPhi_.group()), blend*this->nut_ - + (1.0 - blend)*rhoEff()*nutEff_/this->transport().rho() + + (1.0 - blend)*rhoEff()*nutEff_/this->rho_ + this->nu() ); } @@ -204,9 +205,9 @@ template tmp continuousGasKEpsilon::rhoEff() const { - const transportModel& gas = this->transport(); + const phaseModel& gas = refCast(this->transport()); const phaseSystem& fluid = gas.fluid(); - const transportModel& liquid = fluid.otherPhase(gas); + const phaseModel& liquid = fluid.otherPhase(gas); const virtualMassModel& virtualMass = fluid.lookupSubModel(gas, liquid); diff --git a/src/MomentumTransportModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C b/src/MomentumTransportModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C index 6d0d9bffa5..5759d2beac 100644 --- a/src/MomentumTransportModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C +++ b/src/MomentumTransportModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C @@ -61,7 +61,7 @@ kOmegaSSTSato::kOmegaSSTSato type ), - phase_(transport), + phase_(refCast(transport)), hasDispersedPhaseNames_(this->coeffDict_.found("dispersedPhases")), diff --git a/src/MomentumTransportModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C b/src/MomentumTransportModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C index d3c42562bc..46996c0e0d 100644 --- a/src/MomentumTransportModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C +++ b/src/MomentumTransportModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.C @@ -356,9 +356,9 @@ mixtureKEpsilon::liquidTurbulence() const { const volVectorField& U = this->U_; - const transportModel& gas = this->transport(); + const phaseModel& gas = refCast(this->transport()); const phaseSystem& fluid = gas.fluid(); - const transportModel& liquid = fluid.otherPhase(gas); + const phaseModel& liquid = fluid.otherPhase(gas); liquidTurbulencePtr_ = &const_cast&> @@ -387,9 +387,9 @@ tmp mixtureKEpsilon::Ct2() const const mixtureKEpsilon& liquidTurbulence = this->liquidTurbulence(); - const transportModel& gas = this->transport(); + const phaseModel& gas = refCast(this->transport()); const phaseSystem& fluid = gas.fluid(); - const transportModel& liquid = fluid.otherPhase(gas); + const phaseModel& liquid = fluid.otherPhase(gas); const dragModel& drag = fluid.lookupSubModel(gas, liquid); @@ -414,7 +414,7 @@ template tmp mixtureKEpsilon::rholEff() const { - const transportModel& gas = this->transport(); + const phaseModel& gas = refCast(this->transport()); const phaseSystem& fluid = gas.fluid(); return fluid.otherPhase(gas).rho(); } @@ -424,7 +424,7 @@ template tmp mixtureKEpsilon::rhogEff() const { - const transportModel& gas = this->transport(); + const phaseModel& gas = refCast(this->transport()); const phaseSystem& fluid = gas.fluid(); const virtualMassModel& virtualMass = fluid.lookupSubModel(gas, fluid.otherPhase(gas)); @@ -501,9 +501,9 @@ mixtureKEpsilon::bubbleG() const const mixtureKEpsilon& liquidTurbulence = this->liquidTurbulence(); - const transportModel& gas = this->transport(); + const phaseModel& gas = refCast(this->transport()); const phaseSystem& fluid = gas.fluid(); - const transportModel& liquid = fluid.otherPhase(gas); + const phaseModel& liquid = fluid.otherPhase(gas); const dragModel& drag = fluid.lookupSubModel(gas, liquid); @@ -552,7 +552,7 @@ mixtureKEpsilon::epsilonSource() const template void mixtureKEpsilon::correct() { - const transportModel& gas = this->transport(); + const phaseModel& gas = refCast(this->transport()); const phaseSystem& fluid = gas.fluid(); // Only solve the mixture turbulence for the gas-phase diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModelFwd.H b/src/MomentumTransportModels/phaseCompressible/phaseDynamicMomentumTransportModels/phaseDynamicMomentumTransportModel.C similarity index 59% rename from applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModelFwd.H rename to src/MomentumTransportModels/phaseCompressible/phaseDynamicMomentumTransportModels/phaseDynamicMomentumTransportModel.C index c271a08dbe..ec16b7ffec 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModelFwd.H +++ b/src/MomentumTransportModels/phaseCompressible/phaseDynamicMomentumTransportModels/phaseDynamicMomentumTransportModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -21,33 +21,40 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . -Typedef - Foam::VoFphaseCompressibleMomentumTransportModel - -Description - Forward declaration of typedef for - VoFphaseCompressibleMomentumTransportModel - \*---------------------------------------------------------------------------*/ -#ifndef VoFphaseCompressibleMomentumTransportModelFwd_H -#define VoFphaseCompressibleMomentumTransportModelFwd_H +#include "phaseDynamicMomentumTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - class fluidThermo; - - template - class PhaseCompressibleMomentumTransportModel; - - typedef PhaseCompressibleMomentumTransportModel - VoFphaseCompressibleMomentumTransportModel; + namespace phaseCompressible + { + template + autoPtr New + ( + const volScalarField& alpha, + const volScalarField& rho, + const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, + const surfaceScalarField& phi, + const typename BasicPhaseCompressibleMomentumTransportModel:: + transportModel& transport + ) + { + return BasicPhaseCompressibleMomentumTransportModel::New + ( + alpha, + rho, + U, + alphaRhoPhi, + phi, + transport + ); + } + } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif // ************************************************************************* // diff --git a/src/MomentumTransportModels/phaseCompressible/phaseDynamicMomentumTransportModels/phaseDynamicMomentumTransportModel.H b/src/MomentumTransportModels/phaseCompressible/phaseDynamicMomentumTransportModels/phaseDynamicMomentumTransportModel.H new file mode 100644 index 0000000000..351853d8f8 --- /dev/null +++ b/src/MomentumTransportModels/phaseCompressible/phaseDynamicMomentumTransportModels/phaseDynamicMomentumTransportModel.H @@ -0,0 +1,92 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2015-2021 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 . + +Typedef + Foam::phaseCompressible::momentumTransportModel + +Typedef + Foam::phaseCompressible::laminarModel + +Typedef + Foam::phaseCompressible::RASModel + +Typedef + Foam::phaseCompressible::LESModel + +Description + Typedefs for turbulence, RAS and LES models for phase-compressible flow + based on the phase-fluidThermo transport package. + +SourceFiles + phaseDynamicMomentumTransportModel.C + phaseDynamicMomentumTransportModels.C + +\*---------------------------------------------------------------------------*/ + +#ifndef phaseDynamicMomentumTransportModel_H +#define phaseDynamicMomentumTransportModel_H + +#include "PhaseCompressibleMomentumTransportModel.H" +#include "laminarModel.H" +#include "RASModel.H" +#include "LESModel.H" +#include "dynamicTransportModel.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + namespace phaseCompressible + { + typedef PhaseCompressibleMomentumTransportModel + momentumTransportModel; + typedef laminarModel laminarModel; + typedef RASModel RASModel; + typedef LESModel LESModel; + + template + autoPtr New + ( + const volScalarField& alpha, + const volScalarField& rho, + const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, + const surfaceScalarField& phi, + const typename BasicPhaseCompressibleMomentumTransportModel:: + transportModel& transport + ); + } +} + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#ifdef NoRepository + #include "phaseDynamicMomentumTransportModel.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/MomentumTransportModels/phaseCompressible/phaseDynamicMomentumTransportModels/phaseDynamicMomentumTransportModels.C b/src/MomentumTransportModels/phaseCompressible/phaseDynamicMomentumTransportModels/phaseDynamicMomentumTransportModels.C new file mode 100644 index 0000000000..7b54fa5c23 --- /dev/null +++ b/src/MomentumTransportModels/phaseCompressible/phaseDynamicMomentumTransportModels/phaseDynamicMomentumTransportModels.C @@ -0,0 +1,85 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2014-2021 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 "phaseDynamicMomentumTransportModels.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +makeBaseMomentumTransportModel +( + volScalarField, + volScalarField, + compressibleMomentumTransportModel, + PhaseCompressibleMomentumTransportModel, + dynamicTransportModel +); + + +// -------------------------------------------------------------------------- // +// Laminar models +// -------------------------------------------------------------------------- // + +#include "Stokes.H" +makeLaminarModel(Stokes); + +#include "generalizedNewtonian.H" +makeLaminarModel(generalizedNewtonian); + +#include "lambdaThixotropic.H" +makeLaminarModel(lambdaThixotropic); + +#include "Maxwell.H" +makeLaminarModel(Maxwell); + +#include "Giesekus.H" +makeLaminarModel(Giesekus); + +#include "PTT.H" +makeLaminarModel(PTT); + + +// -------------------------------------------------------------------------- // +// RAS models +// -------------------------------------------------------------------------- // + +#include "kEpsilon.H" +makeRASModel(kEpsilon); + +#include "kOmegaSST.H" +makeRASModel(kOmegaSST); + + +// -------------------------------------------------------------------------- // +// LES models +// -------------------------------------------------------------------------- // + +#include "Smagorinsky.H" +makeLESModel(Smagorinsky); + +#include "kEqn.H" +makeLESModel(kEqn); + + +// ************************************************************************* // diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModels.C b/src/MomentumTransportModels/phaseCompressible/phaseDynamicMomentumTransportModels/phaseDynamicMomentumTransportModels.H similarity index 67% rename from applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModels.C rename to src/MomentumTransportModels/phaseCompressible/phaseDynamicMomentumTransportModels/phaseDynamicMomentumTransportModels.H index e72594ac84..1b03072625 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModels.C +++ b/src/MomentumTransportModels/phaseCompressible/phaseDynamicMomentumTransportModels/phaseDynamicMomentumTransportModels.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "PhaseCompressibleMomentumTransportModel.H" -#include "fluidThermo.H" +#include "dynamicTransportModel.H" #include "addToRunTimeSelectionTable.H" #include "makeMomentumTransportModel.H" @@ -40,58 +40,24 @@ makeMomentumTransportModelTypes volScalarField, compressibleMomentumTransportModel, PhaseCompressibleMomentumTransportModel, - fluidThermo -); - -makeBaseMomentumTransportModel -( - volScalarField, - volScalarField, - compressibleMomentumTransportModel, - PhaseCompressibleMomentumTransportModel, - fluidThermo + dynamicTransportModel ); #define makeLaminarModel(Type) \ makeTemplatedLaminarModel \ - (fluidThermoPhaseCompressibleMomentumTransportModel, laminar, Type) + ( \ + dynamicTransportModelPhaseCompressibleMomentumTransportModel, \ + laminar, \ + Type \ + ) #define makeRASModel(Type) \ makeTemplatedMomentumTransportModel \ - (fluidThermoPhaseCompressibleMomentumTransportModel, RAS, Type) + (dynamicTransportModelPhaseCompressibleMomentumTransportModel, RAS, Type) #define makeLESModel(Type) \ makeTemplatedMomentumTransportModel \ - (fluidThermoPhaseCompressibleMomentumTransportModel, LES, Type) + (dynamicTransportModelPhaseCompressibleMomentumTransportModel, LES, Type) -#include "Stokes.H" -makeLaminarModel(Stokes); - -#include "generalizedNewtonian.H" -makeLaminarModel(generalizedNewtonian); - -#include "lambdaThixotropic.H" -makeLaminarModel(lambdaThixotropic); - -#include "Maxwell.H" -makeLaminarModel(Maxwell); - -#include "Giesekus.H" -makeLaminarModel(Giesekus); - -#include "PTT.H" -makeLaminarModel(PTT); - -#include "kEpsilon.H" -makeRASModel(kEpsilon); - -#include "kOmegaSST.H" -makeRASModel(kOmegaSST); - -#include "Smagorinsky.H" -makeLESModel(Smagorinsky); - -#include "kEqn.H" -makeLESModel(kEqn); // ************************************************************************* // diff --git a/src/MomentumTransportModels/phaseIncompressible/Make/files b/src/MomentumTransportModels/phaseIncompressible/Make/files new file mode 100644 index 0000000000..0d33976bfc --- /dev/null +++ b/src/MomentumTransportModels/phaseIncompressible/Make/files @@ -0,0 +1,3 @@ +phaseKinematicMomentumTransportModels/phaseKinematicMomentumTransportModels.C + +LIB = $(FOAM_LIBBIN)/libphaseIncompressibleMomentumTransportModels diff --git a/src/MomentumTransportModels/phaseIncompressible/Make/options b/src/MomentumTransportModels/phaseIncompressible/Make/options new file mode 100644 index 0000000000..0de35885fc --- /dev/null +++ b/src/MomentumTransportModels/phaseIncompressible/Make/options @@ -0,0 +1,11 @@ +EXE_INC = \ + -I../momentumTransportModels/lnInclude \ + -I../incompressible/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ + +LIB_LIBS = \ + -ltransportModels \ + -lfiniteVolume \ + -lmeshTools diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModel.H b/src/MomentumTransportModels/phaseIncompressible/phaseKinematicMomentumTransportModels/phaseKinematicMomentumTransportModel.C similarity index 60% rename from applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModel.H rename to src/MomentumTransportModels/phaseIncompressible/phaseKinematicMomentumTransportModels/phaseKinematicMomentumTransportModel.C index 3bdd8bae77..85ba02e2a2 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/VoFphaseCompressibleMomentumTransportModel.H +++ b/src/MomentumTransportModels/phaseIncompressible/phaseKinematicMomentumTransportModels/phaseKinematicMomentumTransportModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -21,31 +21,38 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . -Typedef - Foam::VoFphaseCompressibleMomentumTransportModel - -Description - Typedef for VoFphaseCompressibleMomentumTransportModel - \*---------------------------------------------------------------------------*/ -#ifndef VoFphaseCompressibleMomentumTransportModel_H -#define VoFphaseCompressibleMomentumTransportModel_H - -#include "VoFphaseCompressibleMomentumTransportModelFwd.H" -#include "PhaseCompressibleMomentumTransportModel.H" -#include "fluidThermo.H" +#include "phaseKinematicMomentumTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - typedef PhaseCompressibleMomentumTransportModel - VoFphaseCompressibleMomentumTransportModel; + namespace phaseIncompressible + { + template + autoPtr New + ( + const volScalarField& alpha, + const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, + const surfaceScalarField& phi, + const typename BasicPhaseIncompressibleMomentumTransportModel:: + transportModel& transport + ) + { + return BasicPhaseIncompressibleMomentumTransportModel::New + ( + alpha, + U, + alphaRhoPhi, + phi, + transport + ); + } + } } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif // ************************************************************************* // diff --git a/src/MomentumTransportModels/phaseIncompressible/phaseKinematicMomentumTransportModels/phaseKinematicMomentumTransportModel.H b/src/MomentumTransportModels/phaseIncompressible/phaseKinematicMomentumTransportModels/phaseKinematicMomentumTransportModel.H new file mode 100644 index 0000000000..41b4651524 --- /dev/null +++ b/src/MomentumTransportModels/phaseIncompressible/phaseKinematicMomentumTransportModels/phaseKinematicMomentumTransportModel.H @@ -0,0 +1,92 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2015-2021 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 . + +Typedef + Foam::phaseCompressible::momentumTransportModel + +Typedef + Foam::phaseCompressible::laminarModel + +Typedef + Foam::phaseCompressible::RASModel + +Typedef + Foam::phaseCompressible::LESModel + +Description + Typedefs for turbulence, RAS and LES models for phase-compressible flow + based on the phase-fluidThermo transport package. + +SourceFiles + phaseKinematicMomentumTransportModel.C + phaseKinematicMomentumTransportModels.C + +\*---------------------------------------------------------------------------*/ + +#ifndef phaseKinematicMomentumTransportModel_H +#define phaseKinematicMomentumTransportModel_H + +#include "PhaseIncompressibleMomentumTransportModel.H" +#include "laminarModel.H" +#include "RASModel.H" +#include "LESModel.H" +#include "kinematicTransportModel.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + namespace phaseIncompressible + { + typedef PhaseIncompressibleMomentumTransportModel + + momentumTransportModel; + typedef laminarModel laminarModel; + typedef RASModel RASModel; + typedef LESModel LESModel; + + template + autoPtr New + ( + const volScalarField& alpha, + const volVectorField& U, + const surfaceScalarField& alphaRhoPhi, + const surfaceScalarField& phi, + const typename BasicPhaseIncompressibleMomentumTransportModel:: + transportModel& transport + ); + } +} + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#ifdef NoRepository + #include "phaseKinematicMomentumTransportModel.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/MomentumTransportModels/phaseIncompressible/phaseKinematicMomentumTransportModels/phaseKinematicMomentumTransportModels.C b/src/MomentumTransportModels/phaseIncompressible/phaseKinematicMomentumTransportModels/phaseKinematicMomentumTransportModels.C new file mode 100644 index 0000000000..6b615def2b --- /dev/null +++ b/src/MomentumTransportModels/phaseIncompressible/phaseKinematicMomentumTransportModels/phaseKinematicMomentumTransportModels.C @@ -0,0 +1,85 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2014-2021 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 "phaseKinematicMomentumTransportModels.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +makeBaseMomentumTransportModel +( + volScalarField, + geometricOneField, + incompressibleMomentumTransportModel, + PhaseIncompressibleMomentumTransportModel, + kinematicTransportModel +); + + +// -------------------------------------------------------------------------- // +// Laminar models +// -------------------------------------------------------------------------- // + +#include "Stokes.H" +makeLaminarModel(Stokes); + +#include "generalizedNewtonian.H" +makeLaminarModel(generalizedNewtonian); + +#include "lambdaThixotropic.H" +makeLaminarModel(lambdaThixotropic); + +#include "Maxwell.H" +makeLaminarModel(Maxwell); + +#include "Giesekus.H" +makeLaminarModel(Giesekus); + +#include "PTT.H" +makeLaminarModel(PTT); + + +// -------------------------------------------------------------------------- // +// RAS models +// -------------------------------------------------------------------------- // + +#include "kEpsilon.H" +makeRASModel(kEpsilon); + +#include "kOmegaSST.H" +makeRASModel(kOmegaSST); + + +// -------------------------------------------------------------------------- // +// LES models +// -------------------------------------------------------------------------- // + +#include "Smagorinsky.H" +makeLESModel(Smagorinsky); + +#include "kEqn.H" +makeLESModel(kEqn); + + +// ************************************************************************* // diff --git a/applications/solvers/lagrangian/denseParticleFoam/denseParticleMomentumTransportModels/denseParticleMomentumTransportModels.C b/src/MomentumTransportModels/phaseIncompressible/phaseKinematicMomentumTransportModels/phaseKinematicMomentumTransportModels.H similarity index 76% rename from applications/solvers/lagrangian/denseParticleFoam/denseParticleMomentumTransportModels/denseParticleMomentumTransportModels.C rename to src/MomentumTransportModels/phaseIncompressible/phaseKinematicMomentumTransportModels/phaseKinematicMomentumTransportModels.H index 563d4903d4..bfc12cdb51 100644 --- a/applications/solvers/lagrangian/denseParticleFoam/denseParticleMomentumTransportModels/denseParticleMomentumTransportModels.C +++ b/src/MomentumTransportModels/phaseIncompressible/phaseKinematicMomentumTransportModels/phaseKinematicMomentumTransportModels.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "PhaseIncompressibleMomentumTransportModel.H" -#include "singlePhaseTransportModel.H" +#include "kinematicTransportModel.H" #include "addToRunTimeSelectionTable.H" #include "makeMomentumTransportModel.H" @@ -40,22 +40,13 @@ makeMomentumTransportModelTypes geometricOneField, incompressibleMomentumTransportModel, PhaseIncompressibleMomentumTransportModel, - singlePhaseTransportModel -); - -makeBaseMomentumTransportModel -( - volScalarField, - geometricOneField, - incompressibleMomentumTransportModel, - PhaseIncompressibleMomentumTransportModel, - singlePhaseTransportModel + kinematicTransportModel ); #define makeLaminarModel(Type) \ - makeTemplatedMomentumTransportModel \ + makeTemplatedLaminarModel \ ( \ - singlePhaseTransportModelPhaseIncompressibleMomentumTransportModel, \ + kinematicTransportModelPhaseIncompressibleMomentumTransportModel, \ laminar, \ Type \ ) @@ -63,7 +54,7 @@ makeBaseMomentumTransportModel #define makeRASModel(Type) \ makeTemplatedMomentumTransportModel \ ( \ - singlePhaseTransportModelPhaseIncompressibleMomentumTransportModel, \ + kinematicTransportModelPhaseIncompressibleMomentumTransportModel, \ RAS, \ Type \ ) @@ -71,24 +62,10 @@ makeBaseMomentumTransportModel #define makeLESModel(Type) \ makeTemplatedMomentumTransportModel \ ( \ - singlePhaseTransportModelPhaseIncompressibleMomentumTransportModel, \ + kinematicTransportModelPhaseIncompressibleMomentumTransportModel, \ LES, \ Type \ ) -#include "Stokes.H" -makeLaminarModel(Stokes); - -#include "kEpsilon.H" -makeRASModel(kEpsilon); - -#include "kOmegaSST.H" -makeRASModel(kOmegaSST); - -#include "Smagorinsky.H" -makeLESModel(Smagorinsky); - -#include "kEqn.H" -makeLESModel(kEqn); // ************************************************************************* // diff --git a/src/OpenFOAM/include/listOptions.H b/src/OpenFOAM/include/listOptions.H index 7e90d6aaa2..2a0480077b 100644 --- a/src/OpenFOAM/include/listOptions.H +++ b/src/OpenFOAM/include/listOptions.H @@ -33,7 +33,7 @@ argList::addBoolOption ); #endif -#if defined(kinematicMomentumTransportModel_H) || defined(fluidThermoMomentumTransportModel_H) +#if defined(kinematicMomentumTransportModel_H) || defined(dynamicMomentumTransportModel_H) argList::addBoolOption ( "listMomentumTransportModels", diff --git a/src/OpenFOAM/include/listOutput.H b/src/OpenFOAM/include/listOutput.H index 401c0a8f23..aee53266af 100644 --- a/src/OpenFOAM/include/listOutput.H +++ b/src/OpenFOAM/include/listOutput.H @@ -63,7 +63,7 @@ if (args.optionFound("listMomentumTransportModels")) << endl; listOptions = true; } -#elif defined(fluidThermoMomentumTransportModel_H) +#elif defined(dynamicMomentumTransportModel_H) if (args.optionFound("listMomentumTransportModels")) { Info<< "Turbulence models" diff --git a/src/ThermophysicalTransportModels/Allwmake b/src/ThermophysicalTransportModels/Allwmake index 0ab7100c8f..897ba2040d 100755 --- a/src/ThermophysicalTransportModels/Allwmake +++ b/src/ThermophysicalTransportModels/Allwmake @@ -6,5 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory wmake $targetType wmake $targetType fluidReactionThermo +wmake $targetType phaseFluidThermo +wmake $targetType phaseFluidReactionThermo #------------------------------------------------------------------------------ diff --git a/src/ThermophysicalTransportModels/Make/options b/src/ThermophysicalTransportModels/Make/options index 290cadbe32..c4f1606302 100644 --- a/src/ThermophysicalTransportModels/Make/options +++ b/src/ThermophysicalTransportModels/Make/options @@ -1,6 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ diff --git a/src/ThermophysicalTransportModels/fluidReactionThermo/Make/options b/src/ThermophysicalTransportModels/fluidReactionThermo/Make/options index 461c395c23..ec086486bc 100644 --- a/src/ThermophysicalTransportModels/fluidReactionThermo/Make/options +++ b/src/ThermophysicalTransportModels/fluidReactionThermo/Make/options @@ -2,6 +2,7 @@ EXE_INC = \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ diff --git a/src/ThermophysicalTransportModels/fluidReactionThermo/fluidReactionThermophysicalTransportModel.H b/src/ThermophysicalTransportModels/fluidReactionThermo/fluidReactionThermophysicalTransportModel.H index 5b49c21673..9081da9110 100644 --- a/src/ThermophysicalTransportModels/fluidReactionThermo/fluidReactionThermophysicalTransportModel.H +++ b/src/ThermophysicalTransportModels/fluidReactionThermo/fluidReactionThermophysicalTransportModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,7 +46,7 @@ Description #include "laminarThermophysicalTransportModel.H" #include "RASThermophysicalTransportModel.H" #include "LESThermophysicalTransportModel.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/ThermophysicalTransportModels/fluidReactionThermo/fluidReactionThermophysicalTransportModels.C b/src/ThermophysicalTransportModels/fluidReactionThermo/fluidReactionThermophysicalTransportModels.C index c82f62bace..57feaf94b0 100644 --- a/src/ThermophysicalTransportModels/fluidReactionThermo/fluidReactionThermophysicalTransportModels.C +++ b/src/ThermophysicalTransportModels/fluidReactionThermo/fluidReactionThermophysicalTransportModels.C @@ -30,7 +30,7 @@ License makeThermophysicalTransportModels ( ThermophysicalTransportModel, - fluidThermoCompressibleMomentumTransportModel, + dynamicTransportModelCompressibleMomentumTransportModel, fluidReactionThermo ); diff --git a/src/ThermophysicalTransportModels/fluidReactionThermo/fluidReactionThermophysicalTransportModels.H b/src/ThermophysicalTransportModels/fluidReactionThermo/fluidReactionThermophysicalTransportModels.H index 10ee484643..771fe2e5cd 100644 --- a/src/ThermophysicalTransportModels/fluidReactionThermo/fluidReactionThermophysicalTransportModels.H +++ b/src/ThermophysicalTransportModels/fluidReactionThermo/fluidReactionThermophysicalTransportModels.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "fluidReactionThermophysicalTransportModel.H" -#include "fluidThermoMomentumTransportModels.H" +#include "dynamicMomentumTransportModels.H" #include "makeThermophysicalTransportModel.H" #include "addToRunTimeSelectionTable.H" @@ -33,7 +33,7 @@ License makeThermophysicalTransportModelTypes ( ThermophysicalTransportModel, - fluidThermoCompressibleMomentumTransportModel, + dynamicTransportModelCompressibleMomentumTransportModel, fluidReactionThermo ); @@ -42,7 +42,7 @@ makeThermophysicalTransportModelTypes makeThermophysicalTransportModel \ ( \ ThermophysicalTransportModel, \ - fluidThermoCompressibleMomentumTransportModel, \ + dynamicTransportModelCompressibleMomentumTransportModel, \ fluidReactionThermo, \ laminar, \ Type \ @@ -52,7 +52,7 @@ makeThermophysicalTransportModelTypes makeTurbulenceThermophysicalTransportModel \ ( \ ThermophysicalTransportModel, \ - fluidThermoCompressibleMomentumTransportModel, \ + dynamicTransportModelCompressibleMomentumTransportModel, \ fluidReactionThermo, \ SType, \ Type \ @@ -62,7 +62,7 @@ makeThermophysicalTransportModelTypes makeThermophysicalTransportModel \ ( \ ThermophysicalTransportModel, \ - fluidThermoCompressibleMomentumTransportModel, \ + dynamicTransportModelCompressibleMomentumTransportModel, \ fluidReactionThermo, \ RAS, \ Type \ @@ -72,7 +72,7 @@ makeThermophysicalTransportModelTypes makeThermophysicalTransportModel \ ( \ ThermophysicalTransportModel, \ - fluidThermoCompressibleMomentumTransportModel, \ + dynamicTransportModelCompressibleMomentumTransportModel, \ fluidReactionThermo, \ LES, \ Type \ diff --git a/src/ThermophysicalTransportModels/fluidThermo/fluidThermophysicalTransportModel.H b/src/ThermophysicalTransportModels/fluidThermo/fluidThermophysicalTransportModel.H index 005b4303d7..062d84b9d1 100644 --- a/src/ThermophysicalTransportModels/fluidThermo/fluidThermophysicalTransportModel.H +++ b/src/ThermophysicalTransportModels/fluidThermo/fluidThermophysicalTransportModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,10 +42,11 @@ Description #ifndef fluidThermophysicalTransportModel_H #define fluidThermophysicalTransportModel_H +#include "fluidThermo.H" #include "laminarThermophysicalTransportModel.H" #include "RASThermophysicalTransportModel.H" #include "LESThermophysicalTransportModel.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/ThermophysicalTransportModels/fluidThermo/fluidThermophysicalTransportModels.C b/src/ThermophysicalTransportModels/fluidThermo/fluidThermophysicalTransportModels.C index 420791a70b..8833998d5d 100644 --- a/src/ThermophysicalTransportModels/fluidThermo/fluidThermophysicalTransportModels.C +++ b/src/ThermophysicalTransportModels/fluidThermo/fluidThermophysicalTransportModels.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,7 +30,7 @@ License makeThermophysicalTransportModels ( ThermophysicalTransportModel, - fluidThermoCompressibleMomentumTransportModel, + dynamicTransportModelCompressibleMomentumTransportModel, fluidThermo ); diff --git a/src/ThermophysicalTransportModels/fluidThermo/fluidThermophysicalTransportModels.H b/src/ThermophysicalTransportModels/fluidThermo/fluidThermophysicalTransportModels.H index cd5f9fe5dc..6f89afe256 100644 --- a/src/ThermophysicalTransportModels/fluidThermo/fluidThermophysicalTransportModels.H +++ b/src/ThermophysicalTransportModels/fluidThermo/fluidThermophysicalTransportModels.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "fluidThermophysicalTransportModel.H" -#include "fluidThermoMomentumTransportModels.H" +#include "dynamicMomentumTransportModels.H" #include "makeThermophysicalTransportModel.H" #include "addToRunTimeSelectionTable.H" @@ -33,7 +33,7 @@ License makeThermophysicalTransportModelTypes ( ThermophysicalTransportModel, - fluidThermoCompressibleMomentumTransportModel, + dynamicTransportModelCompressibleMomentumTransportModel, fluidThermo ); @@ -42,7 +42,7 @@ makeThermophysicalTransportModelTypes makeThermophysicalTransportModel \ ( \ ThermophysicalTransportModel, \ - fluidThermoCompressibleMomentumTransportModel, \ + dynamicTransportModelCompressibleMomentumTransportModel, \ fluidThermo, \ laminar, \ Type \ @@ -52,7 +52,7 @@ makeThermophysicalTransportModelTypes makeTurbulenceThermophysicalTransportModel \ ( \ ThermophysicalTransportModel, \ - fluidThermoCompressibleMomentumTransportModel, \ + dynamicTransportModelCompressibleMomentumTransportModel, \ fluidThermo, \ SType, \ Type \ @@ -62,7 +62,7 @@ makeThermophysicalTransportModelTypes makeThermophysicalTransportModel \ ( \ ThermophysicalTransportModel, \ - fluidThermoCompressibleMomentumTransportModel, \ + dynamicTransportModelCompressibleMomentumTransportModel, \ fluidThermo, \ RAS, \ Type \ @@ -72,7 +72,7 @@ makeThermophysicalTransportModelTypes makeThermophysicalTransportModel \ ( \ ThermophysicalTransportModel, \ - fluidThermoCompressibleMomentumTransportModel, \ + dynamicTransportModelCompressibleMomentumTransportModel, \ fluidThermo, \ LES, \ Type \ diff --git a/src/ThermophysicalTransportModels/phaseFluidReactionThermo/Make/files b/src/ThermophysicalTransportModels/phaseFluidReactionThermo/Make/files new file mode 100644 index 0000000000..075a08a919 --- /dev/null +++ b/src/ThermophysicalTransportModels/phaseFluidReactionThermo/Make/files @@ -0,0 +1,3 @@ +phaseFluidReactionThermophysicalTransportModels.C + +LIB = $(FOAM_LIBBIN)/libphaseFluidReactionThermophysicalTransportModels diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseThermophysicalTransportModels/Make/options b/src/ThermophysicalTransportModels/phaseFluidReactionThermo/Make/options similarity index 68% rename from applications/solvers/multiphase/multiphaseEulerFoam/multiphaseThermophysicalTransportModels/Make/options rename to src/ThermophysicalTransportModels/phaseFluidReactionThermo/Make/options index 7a3536e39c..9e359e6f71 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseThermophysicalTransportModels/Make/options +++ b/src/ThermophysicalTransportModels/phaseFluidReactionThermo/Make/options @@ -1,17 +1,19 @@ EXE_INC = \ - -I../phaseSystems/lnInclude \ - -I../interfacialModels/lnInclude\ - -I../interfacialCompositionModels/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude + -I$(LIB_SRC)/meshTools/lnInclude \ LIB_LIBS = \ - -lmultiphaseMomentumTransportModels \ - -lthermophysicalTransportModels + -lfluidThermophysicalModels \ + -lreactionThermophysicalModels \ + -lmomentumTransportModels \ + -lspecie \ + -lfiniteVolume \ + -lmeshTools diff --git a/src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModel.H b/src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModel.H new file mode 100644 index 0000000000..ca0133e7ed --- /dev/null +++ b/src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModel.H @@ -0,0 +1,82 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2020-2021 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 . + +Typedef + Foam::phaseCompressible::thermophysicalTransportModel + +Typedef + Foam::phaseCompressible::laminarThermophysicalTransportModel + +Typedef + Foam::phaseCompressible::RASThermophysicalTransportModel + +Typedef + Foam::phaseCompressible::LESThermophysicalTransportModel + +Description + Typedefs for laminar, RAS and LES thermophysical transport models + for fluidReactionThermo flow. + +\*---------------------------------------------------------------------------*/ + +#ifndef phaseFluidReactionThermophysicalTransportModel_H +#define phaseFluidReactionThermophysicalTransportModel_H + +#include "fluidReactionThermo.H" +#include "PhaseThermophysicalTransportModel.H" +#include "laminarThermophysicalTransportModel.H" +#include "RASThermophysicalTransportModel.H" +#include "LESThermophysicalTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + typedef PhaseThermophysicalTransportModel + < + phaseCompressible::momentumTransportModel, + fluidReactionThermo + > phaseFluidReactionThermophysicalTransportModel; + + typedef laminarThermophysicalTransportModel + < + phaseFluidReactionThermophysicalTransportModel + > laminarPhaseFluidReactionThermophysicalTransportModel; + + typedef RASThermophysicalTransportModel + < + phaseFluidReactionThermophysicalTransportModel + > RASPhaseFluidReactionThermophysicalTransportModel; + + typedef LESThermophysicalTransportModel + < + phaseFluidReactionThermophysicalTransportModel + > LESPhaseFluidReactionThermophysicalTransportModel; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModels.C b/src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModels.C new file mode 100644 index 0000000000..ee7b1b080a --- /dev/null +++ b/src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModels.C @@ -0,0 +1,71 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2020-2021 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 "phaseFluidReactionThermophysicalTransportModels.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +makeThermophysicalTransportModels +( + PhaseThermophysicalTransportModel, + dynamicTransportModelPhaseCompressibleMomentumTransportModel, + fluidReactionThermo +); + + +// -------------------------------------------------------------------------- // +// Laminar models +// -------------------------------------------------------------------------- // + +#include "Fourier.H" +makeLaminarThermophysicalTransportModel(Fourier); + +#include "unityLewisFourier.H" +makeLaminarThermophysicalTransportModel(unityLewisFourier); + + +// -------------------------------------------------------------------------- // +// RAS models +// -------------------------------------------------------------------------- // + +#include "eddyDiffusivity.H" +makeRASLESThermophysicalTransportModel(RAS, eddyDiffusivity); + +#include "unityLewisEddyDiffusivity.H" +makeRASLESThermophysicalTransportModel(RAS, unityLewisEddyDiffusivity); + + +// -------------------------------------------------------------------------- // +// LES models +// -------------------------------------------------------------------------- // + +#include "eddyDiffusivity.H" +makeRASLESThermophysicalTransportModel(LES, eddyDiffusivity); + +#include "unityLewisEddyDiffusivity.H" +makeRASLESThermophysicalTransportModel(LES, unityLewisEddyDiffusivity); + + +// ************************************************************************* // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseThermophysicalTransportModels/multiphaseThermophysicalTransportModels.C b/src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModels.H similarity index 61% rename from applications/solvers/multiphase/multiphaseEulerFoam/multiphaseThermophysicalTransportModels/multiphaseThermophysicalTransportModels.C rename to src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModels.H index 120b386607..54504bb21c 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseThermophysicalTransportModels/multiphaseThermophysicalTransportModels.C +++ b/src/ThermophysicalTransportModels/phaseFluidReactionThermo/phaseFluidReactionThermophysicalTransportModels.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,30 +23,18 @@ License \*---------------------------------------------------------------------------*/ -#include "PhaseThermophysicalTransportModel.H" -#include "phaseCompressibleMomentumTransportModel.H" +#include "phaseFluidReactionThermophysicalTransportModel.H" +#include "phaseDynamicMomentumTransportModels.H" #include "makeThermophysicalTransportModel.H" #include "addToRunTimeSelectionTable.H" -#include "laminarThermophysicalTransportModel.H" -#include "RASThermophysicalTransportModel.H" -#include "LESThermophysicalTransportModel.H" - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // makeThermophysicalTransportModelTypes ( PhaseThermophysicalTransportModel, - phaseCompressibleMomentumTransportModel, - rhoThermo -); - - -makeThermophysicalTransportModels -( - PhaseThermophysicalTransportModel, - phaseCompressibleMomentumTransportModel, - rhoThermo + dynamicTransportModelPhaseCompressibleMomentumTransportModel, + fluidReactionThermo ); @@ -54,8 +42,8 @@ makeThermophysicalTransportModels makeThermophysicalTransportModel \ ( \ PhaseThermophysicalTransportModel, \ - phaseCompressibleMomentumTransportModel, \ - rhoThermo, \ + dynamicTransportModelPhaseCompressibleMomentumTransportModel, \ + fluidReactionThermo, \ laminar, \ Type \ ) @@ -64,8 +52,8 @@ makeThermophysicalTransportModels makeTurbulenceThermophysicalTransportModel \ ( \ PhaseThermophysicalTransportModel, \ - phaseCompressibleMomentumTransportModel, \ - rhoThermo, \ + dynamicTransportModelPhaseCompressibleMomentumTransportModel, \ + fluidReactionThermo, \ SType, \ Type \ ) @@ -74,8 +62,8 @@ makeThermophysicalTransportModels makeThermophysicalTransportModel \ ( \ PhaseThermophysicalTransportModel, \ - phaseCompressibleMomentumTransportModel, \ - rhoThermo, \ + dynamicTransportModelPhaseCompressibleMomentumTransportModel, \ + fluidReactionThermo, \ RAS, \ Type \ ) @@ -84,44 +72,11 @@ makeThermophysicalTransportModels makeThermophysicalTransportModel \ ( \ PhaseThermophysicalTransportModel, \ - phaseCompressibleMomentumTransportModel, \ - rhoThermo, \ + dynamicTransportModelPhaseCompressibleMomentumTransportModel, \ + fluidReactionThermo, \ LES, \ Type \ ) -// -------------------------------------------------------------------------- // -// Laminar models -// -------------------------------------------------------------------------- // - -#include "Fourier.H" -makeLaminarThermophysicalTransportModel(Fourier); - -#include "unityLewisFourier.H" -makeLaminarThermophysicalTransportModel(unityLewisFourier); - - -// -------------------------------------------------------------------------- // -// RAS models -// -------------------------------------------------------------------------- // - -#include "eddyDiffusivity.H" -makeRASLESThermophysicalTransportModel(RAS, eddyDiffusivity); - -#include "unityLewisEddyDiffusivity.H" -makeRASLESThermophysicalTransportModel(RAS, unityLewisEddyDiffusivity); - - -// -------------------------------------------------------------------------- // -// LES models -// -------------------------------------------------------------------------- // - -#include "eddyDiffusivity.H" -makeRASLESThermophysicalTransportModel(LES, eddyDiffusivity); - -#include "unityLewisEddyDiffusivity.H" -makeRASLESThermophysicalTransportModel(LES, unityLewisEddyDiffusivity); - - // ************************************************************************* // diff --git a/src/ThermophysicalTransportModels/phaseFluidThermo/Make/files b/src/ThermophysicalTransportModels/phaseFluidThermo/Make/files new file mode 100644 index 0000000000..65e273e44d --- /dev/null +++ b/src/ThermophysicalTransportModels/phaseFluidThermo/Make/files @@ -0,0 +1,3 @@ +phaseFluidThermophysicalTransportModels.C + +LIB = $(FOAM_LIBBIN)/libphaseFluidThermophysicalTransportModels diff --git a/src/ThermophysicalTransportModels/phaseFluidThermo/Make/options b/src/ThermophysicalTransportModels/phaseFluidThermo/Make/options new file mode 100644 index 0000000000..93e4ef3fe0 --- /dev/null +++ b/src/ThermophysicalTransportModels/phaseFluidThermo/Make/options @@ -0,0 +1,17 @@ +EXE_INC = \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ + +LIB_LIBS = \ + -lfluidThermophysicalModels \ + -lmomentumTransportModels \ + -lspecie \ + -lfiniteVolume \ + -lmeshTools diff --git a/src/ThermophysicalTransportModels/phaseFluidThermo/phaseFluidThermophysicalTransportModel.H b/src/ThermophysicalTransportModels/phaseFluidThermo/phaseFluidThermophysicalTransportModel.H new file mode 100644 index 0000000000..33deb7cf3b --- /dev/null +++ b/src/ThermophysicalTransportModels/phaseFluidThermo/phaseFluidThermophysicalTransportModel.H @@ -0,0 +1,82 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2020-2021 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 . + +Typedef + Foam::phaseCompressible::thermophysicalTransportModel + +Typedef + Foam::phaseCompressible::laminarThermophysicalTransportModel + +Typedef + Foam::phaseCompressible::RASThermophysicalTransportModel + +Typedef + Foam::phaseCompressible::LESThermophysicalTransportModel + +Description + Typedefs for laminar, RAS and LES thermophysical transport models + for fluidThermo flow. + +\*---------------------------------------------------------------------------*/ + +#ifndef phaseFluidThermophysicalTransportModel_H +#define phaseFluidThermophysicalTransportModel_H + +#include "fluidThermo.H" +#include "PhaseThermophysicalTransportModel.H" +#include "laminarThermophysicalTransportModel.H" +#include "RASThermophysicalTransportModel.H" +#include "LESThermophysicalTransportModel.H" +#include "phaseDynamicMomentumTransportModel.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + typedef PhaseThermophysicalTransportModel + < + phaseCompressible::momentumTransportModel, + fluidThermo + > phaseFluidThermophysicalTransportModel; + + typedef laminarThermophysicalTransportModel + < + phaseFluidThermophysicalTransportModel + > laminarPhaseFluidThermophysicalTransportModel; + + typedef RASThermophysicalTransportModel + < + phaseFluidThermophysicalTransportModel + > RASPhaseFluidThermophysicalTransportModel; + + typedef LESThermophysicalTransportModel + < + phaseFluidThermophysicalTransportModel + > LESPhaseFluidThermophysicalTransportModel; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/ThermophysicalTransportModels/phaseFluidThermo/phaseFluidThermophysicalTransportModels.C b/src/ThermophysicalTransportModels/phaseFluidThermo/phaseFluidThermophysicalTransportModels.C new file mode 100644 index 0000000000..2ce304f454 --- /dev/null +++ b/src/ThermophysicalTransportModels/phaseFluidThermo/phaseFluidThermophysicalTransportModels.C @@ -0,0 +1,71 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2020-2021 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 "phaseFluidThermophysicalTransportModels.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +makeThermophysicalTransportModels +( + PhaseThermophysicalTransportModel, + dynamicTransportModelPhaseCompressibleMomentumTransportModel, + fluidThermo +); + + +// -------------------------------------------------------------------------- // +// Laminar models +// -------------------------------------------------------------------------- // + +#include "Fourier.H" +makeLaminarThermophysicalTransportModel(Fourier); + +#include "unityLewisFourier.H" +makeLaminarThermophysicalTransportModel(unityLewisFourier); + + +// -------------------------------------------------------------------------- // +// RAS models +// -------------------------------------------------------------------------- // + +#include "eddyDiffusivity.H" +makeRASLESThermophysicalTransportModel(RAS, eddyDiffusivity); + +#include "unityLewisEddyDiffusivity.H" +makeRASLESThermophysicalTransportModel(RAS, unityLewisEddyDiffusivity); + + +// -------------------------------------------------------------------------- // +// LES models +// -------------------------------------------------------------------------- // + +#include "eddyDiffusivity.H" +makeRASLESThermophysicalTransportModel(LES, eddyDiffusivity); + +#include "unityLewisEddyDiffusivity.H" +makeRASLESThermophysicalTransportModel(LES, unityLewisEddyDiffusivity); + + +// ************************************************************************* // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseThermophysicalTransportModels/rhoReactionMultiphaseThermophysicalTransportModels.C b/src/ThermophysicalTransportModels/phaseFluidThermo/phaseFluidThermophysicalTransportModels.H similarity index 58% rename from applications/solvers/multiphase/multiphaseEulerFoam/multiphaseThermophysicalTransportModels/rhoReactionMultiphaseThermophysicalTransportModels.C rename to src/ThermophysicalTransportModels/phaseFluidThermo/phaseFluidThermophysicalTransportModels.H index 0f7c8e8350..6fde1cd8a1 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseThermophysicalTransportModels/rhoReactionMultiphaseThermophysicalTransportModels.C +++ b/src/ThermophysicalTransportModels/phaseFluidThermo/phaseFluidThermophysicalTransportModels.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,31 +23,18 @@ License \*---------------------------------------------------------------------------*/ -#include "PhaseThermophysicalTransportModel.H" -#include "phaseCompressibleMomentumTransportModel.H" -#include "rhoReactionThermo.H" +#include "phaseFluidThermophysicalTransportModel.H" +#include "phaseDynamicMomentumTransportModels.H" #include "makeThermophysicalTransportModel.H" #include "addToRunTimeSelectionTable.H" -#include "laminarThermophysicalTransportModel.H" -#include "RASThermophysicalTransportModel.H" -#include "LESThermophysicalTransportModel.H" - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // makeThermophysicalTransportModelTypes ( PhaseThermophysicalTransportModel, - phaseCompressibleMomentumTransportModel, - rhoReactionThermo -); - - -makeThermophysicalTransportModels -( - PhaseThermophysicalTransportModel, - phaseCompressibleMomentumTransportModel, - rhoReactionThermo + dynamicTransportModelPhaseCompressibleMomentumTransportModel, + fluidThermo ); @@ -55,8 +42,8 @@ makeThermophysicalTransportModels makeThermophysicalTransportModel \ ( \ PhaseThermophysicalTransportModel, \ - phaseCompressibleMomentumTransportModel, \ - rhoReactionThermo, \ + dynamicTransportModelPhaseCompressibleMomentumTransportModel, \ + fluidThermo, \ laminar, \ Type \ ) @@ -65,8 +52,8 @@ makeThermophysicalTransportModels makeTurbulenceThermophysicalTransportModel \ ( \ PhaseThermophysicalTransportModel, \ - phaseCompressibleMomentumTransportModel, \ - rhoReactionThermo, \ + dynamicTransportModelPhaseCompressibleMomentumTransportModel, \ + fluidThermo, \ SType, \ Type \ ) @@ -75,8 +62,8 @@ makeThermophysicalTransportModels makeThermophysicalTransportModel \ ( \ PhaseThermophysicalTransportModel, \ - phaseCompressibleMomentumTransportModel, \ - rhoReactionThermo, \ + dynamicTransportModelPhaseCompressibleMomentumTransportModel, \ + fluidThermo, \ RAS, \ Type \ ) @@ -85,50 +72,11 @@ makeThermophysicalTransportModels makeThermophysicalTransportModel \ ( \ PhaseThermophysicalTransportModel, \ - phaseCompressibleMomentumTransportModel, \ - rhoReactionThermo, \ + dynamicTransportModelPhaseCompressibleMomentumTransportModel, \ + fluidThermo, \ LES, \ Type \ ) -// -------------------------------------------------------------------------- // -// Laminar models -// -------------------------------------------------------------------------- // - -#include "Fourier.H" -makeLaminarThermophysicalTransportModel(Fourier); - -#include "unityLewisFourier.H" -makeLaminarThermophysicalTransportModel(unityLewisFourier); - - -// -------------------------------------------------------------------------- // -// RAS models -// -------------------------------------------------------------------------- // - -#include "eddyDiffusivity.H" -makeRASLESThermophysicalTransportModel(RAS, eddyDiffusivity); - -#include "unityLewisEddyDiffusivity.H" -makeRASLESThermophysicalTransportModel(RAS, unityLewisEddyDiffusivity); - -#include "nonUnityLewisEddyDiffusivity.H" -makeRASLESThermophysicalTransportModel(RAS, nonUnityLewisEddyDiffusivity); - - -// -------------------------------------------------------------------------- // -// LES models -// -------------------------------------------------------------------------- // - -#include "eddyDiffusivity.H" -makeRASLESThermophysicalTransportModel(LES, eddyDiffusivity); - -#include "unityLewisEddyDiffusivity.H" -makeRASLESThermophysicalTransportModel(LES, unityLewisEddyDiffusivity); - -#include "nonUnityLewisEddyDiffusivity.H" -makeRASLESThermophysicalTransportModel(LES, nonUnityLewisEddyDiffusivity); - - // ************************************************************************* // diff --git a/src/atmosphericModels/Make/options b/src/atmosphericModels/Make/options index ab3f4d60f9..d6fe1ee98c 100644 --- a/src/atmosphericModels/Make/options +++ b/src/atmosphericModels/Make/options @@ -10,7 +10,7 @@ EXE_INC = \ LIB_LIBS = \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ - -lincompressibleTransportModels \ + -ltransportModels \ -lfiniteVolume \ -lmeshTools \ -ltriSurface \ diff --git a/src/combustionModels/Make/options b/src/combustionModels/Make/options index c31bbb1e11..011667bebe 100644 --- a/src/combustionModels/Make/options +++ b/src/combustionModels/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ @@ -11,7 +12,7 @@ EXE_INC = \ LIB_LIBS = \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lchemistryModel \ -lradiationModels \ -lfiniteVolume \ diff --git a/src/combustionModels/combustionModel/combustionModel.H b/src/combustionModels/combustionModel/combustionModel.H index 7ccef9c2e0..537eaa49bc 100644 --- a/src/combustionModels/combustionModel/combustionModel.H +++ b/src/combustionModels/combustionModel/combustionModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,7 +36,7 @@ SourceFiles #define combustionModel_H #include "IOdictionary.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "fluidReactionThermo.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/functionObjects/field/Make/options b/src/functionObjects/field/Make/options index cd577accd7..1f6ecbbfa7 100644 --- a/src/functionObjects/field/Make/options +++ b/src/functionObjects/field/Make/options @@ -5,6 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ -I$(LIB_SRC)/transportModels/lnInclude \ @@ -17,10 +18,10 @@ LIB_LIBS = \ -lfiniteVolume \ -lfluidThermophysicalModels \ -lsolidThermo \ - -lincompressibleTransportModels \ + -ltransportModels \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -lmeshTools \ -lsurfMesh \ diff --git a/src/functionObjects/field/shearStress/shearStress.C b/src/functionObjects/field/shearStress/shearStress.C index 840b5715e1..5fc52d788d 100644 --- a/src/functionObjects/field/shearStress/shearStress.C +++ b/src/functionObjects/field/shearStress/shearStress.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,7 +27,7 @@ License #include "volFields.H" #include "surfaceFields.H" #include "kinematicMomentumTransportModel.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.C b/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.C index a029356816..553468e129 100644 --- a/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.C +++ b/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.C @@ -25,7 +25,8 @@ License #include "wallHeatTransferCoeff.H" #include "kinematicMomentumTransportModel.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" +#include "basicThermo.H" #include "wallPolyPatch.H" #include "addToRunTimeSelectionTable.H" @@ -99,13 +100,7 @@ bool Foam::functionObjects::wallHeatTransferCoeff::read(const dictionary& dict) fvMeshFunctionObject::read(dict); writeLocalObjects::read(dict); - const momentumTransportModel& mmtm = - lookupObject - ( - momentumTransportModel::typeName - ); - - if (isA(mmtm)) + if (!foundObject(basicThermo::dictName)) { rho_.read(dict); Cp_.read(dict); @@ -169,25 +164,25 @@ bool Foam::functionObjects::wallHeatTransferCoeff::read(const dictionary& dict) bool Foam::functionObjects::wallHeatTransferCoeff::execute() { - tmp thtc; const momentumTransportModel& mmtm = lookupObject ( momentumTransportModel::typeName ); + tmp thtc; thtc = coeffModel_->htcByRhoCp(mmtm, patchSet_); - if (isA(mmtm)) + if (!foundObject(basicThermo::dictName)) { thtc.ref() *= rho_*Cp_; } - else if (isA(mmtm)) + else { - const compressible::momentumTransportModel& mtm = - refCast(mmtm); + const basicThermo& thermo = + lookupObject(basicThermo::dictName); - thtc.ref() *= mtm.rho()*mtm.thermo().Cp(); + thtc.ref() *= thermo.rho()*thermo.Cp(); } store("wallHeatTransferCoeff", thtc); diff --git a/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C b/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C index 5aac11cfd1..d5d8c85980 100644 --- a/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C +++ b/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "ReynoldsAnalogy.H" #include "kinematicMomentumTransportModel.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeffModels/wallHeatTransferCoeffModel/wallHeatTransferCoeffModel.C b/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeffModels/wallHeatTransferCoeffModel/wallHeatTransferCoeffModel.C index 8eb6076a50..7e4040e6e2 100644 --- a/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeffModels/wallHeatTransferCoeffModel/wallHeatTransferCoeffModel.C +++ b/src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeffModels/wallHeatTransferCoeffModel/wallHeatTransferCoeffModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "wallHeatTransferCoeffModel.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/functionObjects/field/wallShearStress/wallShearStress.C b/src/functionObjects/field/wallShearStress/wallShearStress.C index e6672f50c2..90155aa563 100644 --- a/src/functionObjects/field/wallShearStress/wallShearStress.C +++ b/src/functionObjects/field/wallShearStress/wallShearStress.C @@ -27,7 +27,7 @@ License #include "volFields.H" #include "surfaceFields.H" #include "kinematicMomentumTransportModel.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "wallPolyPatch.H" #include "addToRunTimeSelectionTable.H" diff --git a/src/functionObjects/forces/Make/options b/src/functionObjects/forces/Make/options index 0492c25fa5..1df84f267f 100644 --- a/src/functionObjects/forces/Make/options +++ b/src/functionObjects/forces/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/fileFormats/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ @@ -10,10 +10,10 @@ EXE_INC = \ LIB_LIBS = \ -lfluidThermophysicalModels \ - -lincompressibleTransportModels \ + -ltransportModels \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lspecie \ -lfileFormats \ -lfiniteVolume \ diff --git a/src/functionObjects/forces/forces/forces.C b/src/functionObjects/forces/forces/forces.C index 773f26cd37..d913b6aaaf 100644 --- a/src/functionObjects/forces/forces/forces.C +++ b/src/functionObjects/forces/forces/forces.C @@ -27,7 +27,8 @@ License #include "fvcGrad.H" #include "porosityModel.H" #include "kinematicMomentumTransportModel.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" +#include "fluidThermo.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -280,11 +281,11 @@ Foam::tmp Foam::functionObjects::forces::mu() const } else if ( - obr_.foundObject("transportProperties") + obr_.foundObject("transportProperties") ) { - const transportModel& laminarT = - obr_.lookupObject("transportProperties"); + const kinematicTransportModel& laminarT = + obr_.lookupObject("transportProperties"); return rho()*laminarT.nu(); } diff --git a/src/functionObjects/lagrangian/Make/options b/src/functionObjects/lagrangian/Make/options index 23da67464c..bb3170dc4b 100644 --- a/src/functionObjects/lagrangian/Make/options +++ b/src/functionObjects/lagrangian/Make/options @@ -10,7 +10,7 @@ EXE_INC = \ LIB_LIBS = \ -lfiniteVolume \ - -lincompressibleTransportModels \ + -ltransportModels \ -lmeshTools \ -llagrangian \ -llagrangianParcel \ diff --git a/src/functionObjects/solvers/Make/options b/src/functionObjects/solvers/Make/options index 1bf531fa98..a4b3df73ce 100644 --- a/src/functionObjects/solvers/Make/options +++ b/src/functionObjects/solvers/Make/options @@ -1,18 +1,18 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ -lfluidThermophysicalModels \ - -lincompressibleTransportModels \ + -ltransportModels \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lspecie \ -lfiniteVolume \ -lmeshTools \ diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.C b/src/functionObjects/solvers/scalarTransport/scalarTransport.C index 99429b1894..9353665d3b 100644 --- a/src/functionObjects/solvers/scalarTransport/scalarTransport.C +++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.C @@ -32,7 +32,7 @@ License #include "fvModels.H" #include "fvConstraints.H" #include "kinematicMomentumTransportModel.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/fvConstraints/Make/options b/src/fvConstraints/Make/options index da48aabc3a..434ca74cb3 100644 --- a/src/fvConstraints/Make/options +++ b/src/fvConstraints/Make/options @@ -2,6 +2,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ @@ -14,5 +15,5 @@ LIB_LIBS = \ -lsampling \ -lmeshTools \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels diff --git a/src/fvModels/Make/options b/src/fvModels/Make/options index da48aabc3a..434ca74cb3 100644 --- a/src/fvModels/Make/options +++ b/src/fvModels/Make/options @@ -2,6 +2,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ @@ -14,5 +15,5 @@ LIB_LIBS = \ -lsampling \ -lmeshTools \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels diff --git a/src/lagrangian/parcel/Make/options b/src/lagrangian/parcel/Make/options index fbdde800b2..98407c8e8c 100644 --- a/src/lagrangian/parcel/Make/options +++ b/src/lagrangian/parcel/Make/options @@ -1,6 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ @@ -21,7 +22,7 @@ LIB_LIBS = \ -lthermophysicalProperties \ -lreactionThermophysicalModels \ -lradiationModels \ - -lincompressibleTransportModels \ + -ltransportModels \ -lregionModels \ -lsurfaceFilmModels \ -ldynamicFvMesh \ diff --git a/src/lagrangian/parcelTurbulence/Make/options b/src/lagrangian/parcelTurbulence/Make/options index 19b07c97ba..bc898c4741 100644 --- a/src/lagrangian/parcelTurbulence/Make/options +++ b/src/lagrangian/parcelTurbulence/Make/options @@ -2,6 +2,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/parcel/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ @@ -27,8 +28,8 @@ LIB_LIBS = \ -lradiationModels \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ - -lincompressibleTransportModels \ + -lcompressibleMomentumTransportModels \ + -ltransportModels \ -lregionModels \ -lsurfaceFilmModels \ -ldynamicFvMesh \ diff --git a/src/radiationModels/Make/options b/src/radiationModels/Make/options index 6b7e5455f9..b25332f377 100644 --- a/src/radiationModels/Make/options +++ b/src/radiationModels/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ diff --git a/src/regionModels/surfaceFilmModels/Make/options b/src/regionModels/surfaceFilmModels/Make/options index e00db4240c..04378c30fd 100644 --- a/src/regionModels/surfaceFilmModels/Make/options +++ b/src/regionModels/surfaceFilmModels/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options index 5a31a34d08..013b98dd87 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ @@ -17,7 +18,7 @@ LIB_LIBS = \ -lthermophysicalProperties \ -lreactionThermophysicalModels \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -lregionModels \ -lsurfaceFilmModels \ diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C index 8bdd9eedf8..0756ac4d3e 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,7 +26,7 @@ License #include "nutkFilmWallFunctionFvPatchScalarField.H" #include "fvPatchFieldMapper.H" #include "volFields.H" -#include "fluidThermoMomentumTransportModel.H" +#include "dynamicMomentumTransportModel.H" #include "addToRunTimeSelectionTable.H" #include "surfaceFilmRegionModel.H" #include "mappedWallPolyPatch.H" diff --git a/src/regionModels/thermalBaffleModels/Make/options b/src/regionModels/thermalBaffleModels/Make/options index 256265baa6..d45068079a 100644 --- a/src/regionModels/thermalBaffleModels/Make/options +++ b/src/regionModels/thermalBaffleModels/Make/options @@ -1,5 +1,6 @@ EXE_INC = \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ @@ -15,7 +16,7 @@ LIB_LIBS = \ -lregionModels \ -lsolidThermo \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -lradiationModels \ -ldynamicMesh \ diff --git a/src/specieTransfer/Make/options b/src/specieTransfer/Make/options index 4290c4ce9b..953e216b60 100644 --- a/src/specieTransfer/Make/options +++ b/src/specieTransfer/Make/options @@ -1,6 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ @@ -15,5 +16,5 @@ LIB_LIBS = \ -lspecie \ -lreactionThermophysicalModels \ -lmomentumTransportModels \ - -lfluidThermoMomentumTransportModels \ + -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels diff --git a/src/thermophysicalModels/basic/Make/options b/src/thermophysicalModels/basic/Make/options index 85b6bbfed2..904fd064e1 100644 --- a/src/thermophysicalModels/basic/Make/options +++ b/src/thermophysicalModels/basic/Make/options @@ -1,10 +1,12 @@ EXE_INC = \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ + -ltransportModels \ -lspecie \ -lthermophysicalProperties \ -lfiniteVolume \ diff --git a/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H b/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H index cb3d17de4d..81cb63fefb 100644 --- a/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H +++ b/src/thermophysicalModels/basic/fluidThermo/fluidThermo.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2012-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,6 +39,8 @@ SourceFiles #define fluidThermo_H #include "basicThermo.H" +#include "kinematicTransportModel.H" +#include "dynamicTransportModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,7 +53,9 @@ namespace Foam class fluidThermo : - virtual public basicThermo + virtual public basicThermo, + public kinematicTransportModel, + public dynamicTransportModel { public: diff --git a/src/thermophysicalModels/chemistryModel/Make/options b/src/thermophysicalModels/chemistryModel/Make/options index 9635df5c56..958c3cce56 100644 --- a/src/thermophysicalModels/chemistryModel/Make/options +++ b/src/thermophysicalModels/chemistryModel/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ diff --git a/src/thermophysicalModels/laminarFlameSpeed/Make/options b/src/thermophysicalModels/laminarFlameSpeed/Make/options index 13c811a691..0ccb2809b4 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/Make/options +++ b/src/thermophysicalModels/laminarFlameSpeed/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ diff --git a/src/thermophysicalModels/reactionThermo/Make/options b/src/thermophysicalModels/reactionThermo/Make/options index a23983667d..d35ee8161e 100644 --- a/src/thermophysicalModels/reactionThermo/Make/options +++ b/src/thermophysicalModels/reactionThermo/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude diff --git a/src/thermophysicalModels/solidThermo/Make/options b/src/thermophysicalModels/solidThermo/Make/options index 94b1dc005d..9c3d851998 100644 --- a/src/thermophysicalModels/solidThermo/Make/options +++ b/src/thermophysicalModels/solidThermo/Make/options @@ -1,6 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \ diff --git a/src/transportModels/Make/files b/src/transportModels/Make/files index 3f2f59d894..79177e9661 100644 --- a/src/transportModels/Make/files +++ b/src/transportModels/Make/files @@ -1,3 +1,6 @@ +kinematicTransportModel/kinematicTransportModel.C +dynamicTransportModel/dynamicTransportModel.C + viscosityModels/viscosityModel/viscosityModel.C viscosityModels/viscosityModel/viscosityModelNew.C viscosityModels/Newtonian/Newtonian.C @@ -8,7 +11,6 @@ viscosityModels/HerschelBulkley/HerschelBulkley.C viscosityModels/Casson/Casson.C viscosityModels/strainRateFunction/strainRateFunction.C -transportModel/transportModel.C singlePhaseTransportModel/singlePhaseTransportModel.C -LIB = $(FOAM_LIBBIN)/libincompressibleTransportModels +LIB = $(FOAM_LIBBIN)/libtransportModels diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleMomentumTransportModelFwd.H b/src/transportModels/dynamicTransportModel/dynamicTransportModel.C similarity index 64% rename from applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleMomentumTransportModelFwd.H rename to src/transportModels/dynamicTransportModel/dynamicTransportModel.C index c3c607f42e..7b773760b7 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleMomentumTransportModelFwd.H +++ b/src/transportModels/dynamicTransportModel/dynamicTransportModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -21,32 +21,28 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . -Typedef - Foam::phaseCompressibleMomentumTransportModel - -Description - Forward declaration of typedef for phaseCompressibleMomentumTransportModel - \*---------------------------------------------------------------------------*/ -#ifndef phaseCompressibleMomentumTransportModelFwd_H -#define phaseCompressibleMomentumTransportModelFwd_H +#include "dynamicTransportModel.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - class phaseModel; - - template - class PhaseCompressibleMomentumTransportModel; - - typedef PhaseCompressibleMomentumTransportModel - phaseCompressibleMomentumTransportModel; + defineTypeNameAndDebug(dynamicTransportModel, 0); } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#endif +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::dynamicTransportModel::dynamicTransportModel() +{} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::dynamicTransportModel::~dynamicTransportModel() +{} + // ************************************************************************* // diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleMomentumTransportModel.H b/src/transportModels/dynamicTransportModel/dynamicTransportModel.H similarity index 52% rename from applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleMomentumTransportModel.H rename to src/transportModels/dynamicTransportModel/dynamicTransportModel.H index 245e1a5e92..4ebd345c5e 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/phaseCompressibleMomentumTransportModel.H +++ b/src/transportModels/dynamicTransportModel/dynamicTransportModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -21,45 +21,72 @@ License You should have received a copy of the GNU General Public License along with OpenFOAM. If not, see . -Typedef - Foam::phaseCompressibleMomentumTransportModel +Class + Foam::dynamicTransportModel Description - Typedef for phaseCompressibleMomentumTransportModel + Base-class for all transport models used by compressible turbulence models. + +SourceFiles + dynamicTransportModel.C \*---------------------------------------------------------------------------*/ -#ifndef phaseCompressibleMomentumTransportModel_H -#define phaseCompressibleMomentumTransportModel_H +#ifndef dynamicTransportModel_H +#define dynamicTransportModel_H -#include "phaseCompressibleMomentumTransportModelFwd.H" -#include "PhaseCompressibleMomentumTransportModel.H" -#include "phaseModel.H" +#include "scalarField.H" +#include "volFieldsFwd.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +/*---------------------------------------------------------------------------*\ + Class dynamicTransportModel Declaration +\*---------------------------------------------------------------------------*/ -typedef PhaseCompressibleMomentumTransportModel - phaseCompressibleMomentumTransportModel; - -// template specialisation for TransportTraits -template<> -class TransportTraits +class dynamicTransportModel { public: - typedef fluidThermo thermoModel; + //- Runtime type information + TypeName("dynamicTransportModel"); - static const thermoModel& thermo(const phaseModel& pm) - { - return pm.thermo(); - } + + // Constructors + + //- Construct from components + dynamicTransportModel(); + + //- Disallow default bitwise copy construction + dynamicTransportModel + ( + const dynamicTransportModel& + ) = delete; + + + //- Destructor + virtual ~dynamicTransportModel(); + + + // Member Functions + + //- Return the laminar viscosity + virtual tmp mu() const = 0; + + //- Return the laminar viscosity for patch + virtual tmp mu(const label patchi) const = 0; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const dynamicTransportModel&) = delete; }; + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace Foam diff --git a/src/transportModels/transportModel/transportModel.C b/src/transportModels/kinematicTransportModel/kinematicTransportModel.C similarity index 80% rename from src/transportModels/transportModel/transportModel.C rename to src/transportModels/kinematicTransportModel/kinematicTransportModel.C index 4d3cd42113..ae2d56b9e3 100644 --- a/src/transportModels/transportModel/transportModel.C +++ b/src/transportModels/kinematicTransportModel/kinematicTransportModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,34 +23,26 @@ License \*---------------------------------------------------------------------------*/ -#include "transportModel.H" +#include "kinematicTransportModel.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - defineTypeNameAndDebug(transportModel, 0); + defineTypeNameAndDebug(kinematicTransportModel, 0); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::transportModel::transportModel() +Foam::kinematicTransportModel::kinematicTransportModel() {} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::transportModel::~transportModel() +Foam::kinematicTransportModel::~kinematicTransportModel() {} -// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // - -bool Foam::transportModel::read() -{ - return true; -} - - // ************************************************************************* // diff --git a/src/transportModels/transportModel/transportModel.H b/src/transportModels/kinematicTransportModel/kinematicTransportModel.H similarity index 79% rename from src/transportModels/transportModel/transportModel.H rename to src/transportModels/kinematicTransportModel/kinematicTransportModel.H index b8fc3521e2..9c8c9c2b22 100644 --- a/src/transportModels/transportModel/transportModel.H +++ b/src/transportModels/kinematicTransportModel/kinematicTransportModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,19 +22,19 @@ License along with OpenFOAM. If not, see . Class - Foam::transportModel + Foam::kinematicTransportModel Description Base-class for all transport models used by the incompressible turbulence models. SourceFiles - transportModel.C + kinematicTransportModel.C \*---------------------------------------------------------------------------*/ -#ifndef transportModel_H -#define transportModel_H +#ifndef kinematicTransportModel_H +#define kinematicTransportModel_H #include "primitiveFieldsFwd.H" #include "volFieldsFwd.H" @@ -46,29 +46,28 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class transportModel Declaration + Class kinematicTransportModel Declaration \*---------------------------------------------------------------------------*/ -class transportModel +class kinematicTransportModel { public: //- Runtime type information - TypeName("transportModel"); + TypeName("kinematicTransportModel"); // Constructors //- Construct from components - transportModel - (); + kinematicTransportModel(); //- Disallow default bitwise copy construction - transportModel(const transportModel&); + kinematicTransportModel(const kinematicTransportModel&); //- Destructor - virtual ~transportModel(); + virtual ~kinematicTransportModel(); // Member Functions @@ -79,17 +78,11 @@ public: //- Return the laminar viscosity for patch virtual tmp nu(const label patchi) const = 0; - //- Correct the laminar viscosity - virtual void correct() = 0; - - //- Read transportProperties dictionary - virtual bool read() = 0; - // Member Operators //- Disallow default bitwise assignment - void operator=(const transportModel&) = delete; + void operator=(const kinematicTransportModel&) = delete; }; diff --git a/src/transportModels/singlePhaseTransportModel/singlePhaseTransportModel.C b/src/transportModels/singlePhaseTransportModel/singlePhaseTransportModel.C index ff3660b139..248aad9d48 100644 --- a/src/transportModels/singlePhaseTransportModel/singlePhaseTransportModel.C +++ b/src/transportModels/singlePhaseTransportModel/singlePhaseTransportModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/transportModels/singlePhaseTransportModel/singlePhaseTransportModel.H b/src/transportModels/singlePhaseTransportModel/singlePhaseTransportModel.H index 5a1eed0c53..543fea5201 100644 --- a/src/transportModels/singlePhaseTransportModel/singlePhaseTransportModel.H +++ b/src/transportModels/singlePhaseTransportModel/singlePhaseTransportModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,7 +38,7 @@ SourceFiles #ifndef singlePhaseTransportModel_H #define singlePhaseTransportModel_H -#include "transportModel.H" +#include "kinematicTransportModel.H" #include "IOdictionary.H" #include "autoPtr.H" @@ -56,7 +56,7 @@ class viscosityModel; class singlePhaseTransportModel : public IOdictionary, - public transportModel + public kinematicTransportModel { // Private Data diff --git a/src/transportModels/viscosityModels/BirdCarreau/BirdCarreau.H b/src/transportModels/viscosityModels/BirdCarreau/BirdCarreau.H index 82cc617cb3..b119c9e474 100644 --- a/src/transportModels/viscosityModels/BirdCarreau/BirdCarreau.H +++ b/src/transportModels/viscosityModels/BirdCarreau/BirdCarreau.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/transportModels/viscosityModels/Casson/Casson.C b/src/transportModels/viscosityModels/Casson/Casson.C index 8a9fc28d37..a78be69f6c 100644 --- a/src/transportModels/viscosityModels/Casson/Casson.C +++ b/src/transportModels/viscosityModels/Casson/Casson.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/transportModels/viscosityModels/Casson/Casson.H b/src/transportModels/viscosityModels/Casson/Casson.H index fc4fc25e81..36d248e0b7 100644 --- a/src/transportModels/viscosityModels/Casson/Casson.H +++ b/src/transportModels/viscosityModels/Casson/Casson.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/transportModels/viscosityModels/CrossPowerLaw/CrossPowerLaw.C b/src/transportModels/viscosityModels/CrossPowerLaw/CrossPowerLaw.C index 94b6038c34..f06f2748df 100644 --- a/src/transportModels/viscosityModels/CrossPowerLaw/CrossPowerLaw.C +++ b/src/transportModels/viscosityModels/CrossPowerLaw/CrossPowerLaw.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/transportModels/viscosityModels/CrossPowerLaw/CrossPowerLaw.H b/src/transportModels/viscosityModels/CrossPowerLaw/CrossPowerLaw.H index 0ef1b14ff6..61eb09ea69 100644 --- a/src/transportModels/viscosityModels/CrossPowerLaw/CrossPowerLaw.H +++ b/src/transportModels/viscosityModels/CrossPowerLaw/CrossPowerLaw.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/transportModels/viscosityModels/HerschelBulkley/HerschelBulkley.C b/src/transportModels/viscosityModels/HerschelBulkley/HerschelBulkley.C index f65096aeef..0d77c6973d 100644 --- a/src/transportModels/viscosityModels/HerschelBulkley/HerschelBulkley.C +++ b/src/transportModels/viscosityModels/HerschelBulkley/HerschelBulkley.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/transportModels/viscosityModels/HerschelBulkley/HerschelBulkley.H b/src/transportModels/viscosityModels/HerschelBulkley/HerschelBulkley.H index f93bfaf805..e24b818152 100644 --- a/src/transportModels/viscosityModels/HerschelBulkley/HerschelBulkley.H +++ b/src/transportModels/viscosityModels/HerschelBulkley/HerschelBulkley.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/transportModels/viscosityModels/Newtonian/Newtonian.C b/src/transportModels/viscosityModels/Newtonian/Newtonian.C index 143cd2de6c..7754205038 100644 --- a/src/transportModels/viscosityModels/Newtonian/Newtonian.C +++ b/src/transportModels/viscosityModels/Newtonian/Newtonian.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/transportModels/viscosityModels/Newtonian/Newtonian.H b/src/transportModels/viscosityModels/Newtonian/Newtonian.H index b3cfb42079..3d9052aff2 100644 --- a/src/transportModels/viscosityModels/Newtonian/Newtonian.H +++ b/src/transportModels/viscosityModels/Newtonian/Newtonian.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/transportModels/viscosityModels/powerLaw/powerLaw.C b/src/transportModels/viscosityModels/powerLaw/powerLaw.C index 021296ba15..01969cba7b 100644 --- a/src/transportModels/viscosityModels/powerLaw/powerLaw.C +++ b/src/transportModels/viscosityModels/powerLaw/powerLaw.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/transportModels/viscosityModels/powerLaw/powerLaw.H b/src/transportModels/viscosityModels/powerLaw/powerLaw.H index eb6812a25e..97559b17e7 100644 --- a/src/transportModels/viscosityModels/powerLaw/powerLaw.H +++ b/src/transportModels/viscosityModels/powerLaw/powerLaw.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/transportModels/viscosityModels/strainRateFunction/strainRateFunction.C b/src/transportModels/viscosityModels/strainRateFunction/strainRateFunction.C index fdec0c8e39..6c6c5bc73d 100644 --- a/src/transportModels/viscosityModels/strainRateFunction/strainRateFunction.C +++ b/src/transportModels/viscosityModels/strainRateFunction/strainRateFunction.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/transportModels/viscosityModels/strainRateFunction/strainRateFunction.H b/src/transportModels/viscosityModels/strainRateFunction/strainRateFunction.H index fbacc343c4..6ece701b5a 100644 --- a/src/transportModels/viscosityModels/strainRateFunction/strainRateFunction.H +++ b/src/transportModels/viscosityModels/strainRateFunction/strainRateFunction.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/transportModels/viscosityModels/viscosityModel/viscosityModel.C b/src/transportModels/viscosityModels/viscosityModel/viscosityModel.C index 9acd259274..ffc6b6f542 100644 --- a/src/transportModels/viscosityModels/viscosityModel/viscosityModel.C +++ b/src/transportModels/viscosityModels/viscosityModel/viscosityModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/transportModels/viscosityModels/viscosityModel/viscosityModel.H b/src/transportModels/viscosityModels/viscosityModel/viscosityModel.H index d16d439cdc..9c7756c33c 100644 --- a/src/transportModels/viscosityModels/viscosityModel/viscosityModel.H +++ b/src/transportModels/viscosityModels/viscosityModel/viscosityModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/transportModels/viscosityModels/viscosityModel/viscosityModelNew.C b/src/transportModels/viscosityModels/viscosityModel/viscosityModelNew.C index a069690282..5769f8c56d 100644 --- a/src/transportModels/viscosityModels/viscosityModel/viscosityModelNew.C +++ b/src/transportModels/viscosityModels/viscosityModel/viscosityModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/twoPhaseModels/immiscibleIncompressibleTwoPhaseMixture/Make/options b/src/twoPhaseModels/immiscibleIncompressibleTwoPhaseMixture/Make/options index f92d896c1f..04ae97137f 100644 --- a/src/twoPhaseModels/immiscibleIncompressibleTwoPhaseMixture/Make/options +++ b/src/twoPhaseModels/immiscibleIncompressibleTwoPhaseMixture/Make/options @@ -8,7 +8,7 @@ EXE_INC = \ LIB_LIBS = \ -lincompressibleTwoPhaseMixture \ -ltwoPhaseMixture \ - -lincompressibleTransportModels \ + -ltransportModels \ -linterfaceProperties \ -ltwoPhaseProperties \ -lfiniteVolume diff --git a/src/twoPhaseModels/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.H b/src/twoPhaseModels/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.H index d70e3374da..aefb3f3eb4 100644 --- a/src/twoPhaseModels/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.H +++ b/src/twoPhaseModels/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef incompressibleTwoPhaseMixture_H #define incompressibleTwoPhaseMixture_H -#include "transportModel.H" +#include "kinematicTransportModel.H" #include "viscosityModel.H" #include "twoPhaseMixture.H" #include "IOdictionary.H" @@ -53,7 +53,7 @@ namespace Foam class incompressibleTwoPhaseMixture : public IOdictionary, - public transportModel, + public kinematicTransportModel, public twoPhaseMixture { protected: diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/system/continuity b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/system/continuity index 77edd3514d..05ffaa8601 100644 --- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/system/continuity +++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterAndIsopropanolEvaporation/system/continuity @@ -17,6 +17,7 @@ name continuity; codeOptions #{ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude diff --git a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/system/continuity b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/system/continuity index 77edd3514d..05ffaa8601 100644 --- a/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/system/continuity +++ b/test/multiphase/multiphaseEulerFoam/interfaceComposition/waterEvaporation/system/continuity @@ -17,6 +17,7 @@ name continuity; codeOptions #{ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude diff --git a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/system/continuity b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/system/continuity index fe1a0705cf..ad723422d9 100644 --- a/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/system/continuity +++ b/test/multiphase/multiphaseEulerFoam/thermal/waterEvaporation/system/continuity @@ -17,6 +17,7 @@ name continuity; codeOptions #{ + -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/Make/options b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/Make/options index ddad6544f5..6bcdf0a6e2 100644 --- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/Make/options +++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/Make/options @@ -8,6 +8,6 @@ EXE_INC = \ EXE_LIBS = \ -lmomentumTransportModels \ -lincompressibleMomentumTransportModels \ - -lincompressibleTransportModels \ + -ltransportModels \ -lfiniteVolume \ -lmeshTools