From 9a80d0d5ef5c7362a5f199aa4a50ddc3fccca30a Mon Sep 17 00:00:00 2001 From: sergio Date: Tue, 14 Jun 2022 13:42:00 +0100 Subject: [PATCH 1/8] ENH: thermoTools: new library for thermophysics tools thermoTools is a relocation of various existing tools: - src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/ - src/semiPermeableBaffle/derivedFvPatchFields/ - src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/ ENH: Allwmake: reordering various compilation steps Co-authored-by: Kutalmis Bercin --- .../solvers/combustion/PDRFoam/Make/options | 1 + .../solvers/combustion/XiFoam/Make/options | 1 + .../combustion/XiFoam/XiDyMFoam/Make/options | 1 + .../XiFoam/XiEngineFoam/Make/options | 1 + .../combustion/coldEngineFoam/Make/options | 1 + .../solvers/combustion/fireFoam/Make/options | 1 + .../combustion/reactingFoam/Make/options | 1 + .../rhoReactingBuoyantFoam/Make/options | 1 + .../reactingFoam/rhoReactingFoam/Make/options | 1 + .../compressible/rhoCentralFoam/Make/options | 1 + .../rhoPimpleAdiabaticFoam/Make/options | 5 ++-- .../compressible/rhoPimpleFoam/Make/options | 1 + .../overRhoPimpleDyMFoam/Make/options | 1 + .../compressible/rhoSimpleFoam/Make/options | 1 + .../overRhoSimpleFoam/Make/options | 1 + .../rhoPorousSimpleFoam/Make/options | 3 +- .../compressible/sonicFoam/Make/options | 3 +- .../sonicFoam/sonicDyMFoam/Make/options | 1 + .../buoyantPimpleFoam/Make/options | 1 + .../overBuoyantPimpleDyMFoam/Make/options | 1 + .../buoyantSimpleFoam/Make/options | 1 + .../chtMultiRegionFoam/Make/options | 1 + .../chtMultiRegionSimpleFoam/Make/options | 1 + .../heatTransfer/solidFoam/Make/options | 3 +- .../heatTransfer/thermoFoam/Make/options | 3 +- .../lagrangian/coalChemistryFoam/Make/options | 1 + .../reactingParcelFoam/Make/options | 1 + .../Make/options | 1 + .../simpleReactingParcelFoam/Make/options | 1 + .../simpleCoalParcelFoam/Make/options | 1 + .../solvers/lagrangian/sprayFoam/Make/options | 1 + .../sprayFoam/engineFoam/Make/options | 1 + .../sprayFoam/simpleSprayFoam/Make/options | 1 + .../sprayFoam/sprayDyMFoam/Make/options | 1 + .../uncoupledKinematicParcelFoam/Make/options | 1 + .../Make/options | 1 + .../Make/options | 3 +- .../compressibleInterFoam/Make/options | 1 + .../Make/options | 1 + .../compressibleInterDyMFoam/Make/options | 1 + .../compressibleInterFilmFoam/Make/options | 1 + .../compressibleInterIsoFoam/Make/options | 1 + .../overCompressibleInterDyMFoam/Make/options | 1 + .../Make/options | 3 +- .../multiphase/driftFluxFoam/Make/options | 3 +- .../Make/options | 1 + .../reactingTwoPhaseEulerFoam/Make/options | 3 +- .../multiphase/twoPhaseEulerFoam/Make/options | 1 + .../mesh/advanced/PDRMesh/Make/options | 1 + .../miscellaneous/foamHelp/Make/options | 1 + .../foamHelp/helpTypes/Make/options | 1 + .../postProcessing/postProcess/Make/options | 1 + .../applyBoundaryLayer/Make/options | 1 + .../setTurbulenceFields/Make/options | 1 + src/Allwmake | 29 ++++++++++-------- src/TurbulenceModels/compressible/Make/files | 19 ------------ src/faOptions/Make/options | 4 ++- src/functionObjects/Allwmake | 1 - src/phaseSystemModels/Allwmake | 2 +- src/regionModels/regionCoupling/Make/options | 4 ++- .../thermalBaffleModels/Make/options | 2 ++ src/semiPermeableBaffle/Make/files | 4 --- src/semiPermeableBaffle/Make/options | 17 ----------- src/thermoTools/Make/files | 24 +++++++++++++++ src/thermoTools/Make/options | 30 +++++++++++++++++++ ...convectiveHeatTransferFvPatchScalarField.C | 0 ...convectiveHeatTransferFvPatchScalarField.H | 0 ...allHeatFluxTemperatureFvPatchScalarField.C | 0 ...allHeatFluxTemperatureFvPatchScalarField.H | 0 ...fixedIncidentRadiationFvPatchScalarField.C | 0 ...fixedIncidentRadiationFvPatchScalarField.H | 0 ...emperatureCoupledMixedFvPatchScalarField.C | 0 ...emperatureCoupledMixedFvPatchScalarField.H | 0 ...pedMassWallTemperatureFvPatchScalarField.C | 0 ...pedMassWallTemperatureFvPatchScalarField.H | 0 ...tletMachNumberPressureFvPatchScalarField.C | 0 ...tletMachNumberPressureFvPatchScalarField.H | 0 ...ppedUniformInletHeatAdditionFvPatchField.C | 0 ...ppedUniformInletHeatAdditionFvPatchField.H | 0 ...ableBaffleMassFractionFvPatchScalarField.C | 0 ...ableBaffleMassFractionFvPatchScalarField.H | 0 ...ermeableBaffleVelocityFvPatchVectorField.C | 0 ...ermeableBaffleVelocityFvPatchVectorField.H | 0 .../temperatureCoupledBase.C | 10 +++++-- .../temperatureCoupledBase.H | 0 .../thermalBaffle1DFvPatchScalarField.C | 0 .../thermalBaffle1DFvPatchScalarField.H | 0 .../thermalBaffle1DFvPatchScalarFields.C | 0 .../thermalBaffle1DFvPatchScalarFields.H | 0 ...RateAdvectiveDiffusiveFvPatchScalarField.C | 0 ...RateAdvectiveDiffusiveFvPatchScalarField.H | 0 .../turbulenceBoundaryConditionsDoc.H | 0 ...tureCoupledBaffleMixedFvPatchScalarField.C | 0 ...tureCoupledBaffleMixedFvPatchScalarField.H | 0 ...eratureRadCoupledMixedFvPatchScalarField.C | 0 ...eratureRadCoupledMixedFvPatchScalarField.H | 0 ...ayatillekeWallFunctionFvPatchScalarField.C | 0 ...ayatillekeWallFunctionFvPatchScalarField.H | 0 .../alphatWallFunctionFvPatchScalarField.C | 0 .../alphatWallFunctionFvPatchScalarField.H | 0 .../wallHeatTransferFvPatchScalarField.C | 0 .../wallHeatTransferFvPatchScalarField.H | 0 .../liquidProperties/Make/files | 4 --- .../liquidProperties/Make/options | 11 ------- .../windshieldCondensation/system/controlDict | 2 -- 105 files changed, 150 insertions(+), 87 deletions(-) delete mode 100644 src/semiPermeableBaffle/Make/files delete mode 100644 src/semiPermeableBaffle/Make/options create mode 100644 src/thermoTools/Make/files create mode 100644 src/thermoTools/Make/options rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.H (100%) rename src/{thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties => thermoTools/derivedFvPatchFields}/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C (100%) rename src/{thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties => thermoTools/derivedFvPatchFields}/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.H (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.H (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H (100%) rename src/{semiPermeableBaffle/derivedFvPatchFields => thermoTools/derivedFvPatchFields/semiPermeableBaffle}/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C (100%) rename src/{semiPermeableBaffle/derivedFvPatchFields => thermoTools/derivedFvPatchFields/semiPermeableBaffle}/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.H (100%) rename src/{semiPermeableBaffle/derivedFvPatchFields => thermoTools/derivedFvPatchFields/semiPermeableBaffle}/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C (100%) rename src/{semiPermeableBaffle/derivedFvPatchFields => thermoTools/derivedFvPatchFields/semiPermeableBaffle}/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.H (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C (97%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C (100%) rename src/{TurbulenceModels/compressible/turbulentFluidThermoModels => thermoTools}/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H (100%) delete mode 100644 src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/Make/files delete mode 100644 src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/Make/options diff --git a/applications/solvers/combustion/PDRFoam/Make/options b/applications/solvers/combustion/PDRFoam/Make/options index def8d609c2..ad544559cb 100644 --- a/applications/solvers/combustion/PDRFoam/Make/options +++ b/applications/solvers/combustion/PDRFoam/Make/options @@ -25,6 +25,7 @@ EXE_LIBS = \ -lengine \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ diff --git a/applications/solvers/combustion/XiFoam/Make/options b/applications/solvers/combustion/XiFoam/Make/options index 056ed94388..9fa188d81e 100644 --- a/applications/solvers/combustion/XiFoam/Make/options +++ b/applications/solvers/combustion/XiFoam/Make/options @@ -19,6 +19,7 @@ EXE_LIBS = \ -lengine \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ diff --git a/applications/solvers/combustion/XiFoam/XiDyMFoam/Make/options b/applications/solvers/combustion/XiFoam/XiDyMFoam/Make/options index 1e090ba60d..bbd7cf1066 100644 --- a/applications/solvers/combustion/XiFoam/XiDyMFoam/Make/options +++ b/applications/solvers/combustion/XiFoam/XiDyMFoam/Make/options @@ -26,6 +26,7 @@ EXE_LIBS = \ -lengine \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ diff --git a/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options b/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options index c44d3f5dd1..1ca21e6473 100644 --- a/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options +++ b/applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options @@ -20,6 +20,7 @@ EXE_LIBS = \ -lengine \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ diff --git a/applications/solvers/combustion/coldEngineFoam/Make/options b/applications/solvers/combustion/coldEngineFoam/Make/options index 9493f78508..c79b6e493d 100644 --- a/applications/solvers/combustion/coldEngineFoam/Make/options +++ b/applications/solvers/combustion/coldEngineFoam/Make/options @@ -20,6 +20,7 @@ EXE_LIBS = \ -lengine \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lcompressibleTransportModels \ -lfluidThermophysicalModels \ -lspecie diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options index bdf679ccde..4854f5d34a 100644 --- a/applications/solvers/combustion/fireFoam/Make/options +++ b/applications/solvers/combustion/fireFoam/Make/options @@ -34,6 +34,7 @@ EXE_LIBS = \ -lsampling \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lspecie \ -lcompressibleTransportModels \ -lfluidThermophysicalModels \ diff --git a/applications/solvers/combustion/reactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/Make/options index 6363f6d80d..754c398410 100644 --- a/applications/solvers/combustion/reactingFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/Make/options @@ -19,6 +19,7 @@ EXE_LIBS = \ -lsampling \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lreactionThermophysicalModels \ -lspecie \ -lcompressibleTransportModels \ diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options index ad06afa0c0..0c0c8e3ea6 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options @@ -20,6 +20,7 @@ EXE_LIBS = \ -lsampling \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lreactionThermophysicalModels \ -lspecie \ -lcompressibleTransportModels \ diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options index ad06afa0c0..0c0c8e3ea6 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options @@ -20,6 +20,7 @@ EXE_LIBS = \ -lsampling \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lreactionThermophysicalModels \ -lspecie \ -lcompressibleTransportModels \ diff --git a/applications/solvers/compressible/rhoCentralFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/Make/options index 2b1b8035dc..cb4f2336c6 100644 --- a/applications/solvers/compressible/rhoCentralFoam/Make/options +++ b/applications/solvers/compressible/rhoCentralFoam/Make/options @@ -19,5 +19,6 @@ EXE_LIBS = \ -lrhoCentralFoam \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -ldynamicFvMesh \ -ltopoChangerFvMesh diff --git a/applications/solvers/compressible/rhoPimpleAdiabaticFoam/Make/options b/applications/solvers/compressible/rhoPimpleAdiabaticFoam/Make/options index 775d63a111..3c186a1e4e 100644 --- a/applications/solvers/compressible/rhoPimpleAdiabaticFoam/Make/options +++ b/applications/solvers/compressible/rhoPimpleAdiabaticFoam/Make/options @@ -6,7 +6,7 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude EXE_LIBS = \ -lfiniteVolume \ @@ -17,4 +17,5 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -lturbulenceModels \ - -lcompressibleTurbulenceModels + -lcompressibleTurbulenceModels \ + -lthermoTools diff --git a/applications/solvers/compressible/rhoPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/Make/options index 717240ffec..6a29940926 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoPimpleFoam/Make/options @@ -20,6 +20,7 @@ EXE_LIBS = \ -lspecie \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -ldynamicMesh \ -ldynamicFvMesh \ -ltopoChangerFvMesh \ diff --git a/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/Make/options index 74c9dc9538..3d58b8c426 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/Make/options +++ b/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/Make/options @@ -21,6 +21,7 @@ EXE_LIBS = \ -lspecie \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -ldynamicFvMesh \ -ltopoChangerFvMesh \ -loverset diff --git a/applications/solvers/compressible/rhoSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/Make/options index dd872bce90..fa15d29744 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoSimpleFoam/Make/options @@ -19,5 +19,6 @@ EXE_LIBS = \ -lspecie \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -latmosphericModels \ -lregionFaModels diff --git a/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/Make/options index 9bb800efbd..d69a410431 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/Make/options @@ -21,6 +21,7 @@ EXE_LIBS = \ -lspecie \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -ldynamicFvMesh \ -ltopoChangerFvMesh \ -lsampling \ diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options index 9e9ee05ce4..53c75aa907 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options @@ -18,4 +18,5 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -lturbulenceModels \ - -lcompressibleTurbulenceModels + -lcompressibleTurbulenceModels \ + -lthermoTools diff --git a/applications/solvers/compressible/sonicFoam/Make/options b/applications/solvers/compressible/sonicFoam/Make/options index eed2e95cbe..b5c8157122 100644 --- a/applications/solvers/compressible/sonicFoam/Make/options +++ b/applications/solvers/compressible/sonicFoam/Make/options @@ -16,4 +16,5 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -lturbulenceModels \ - -lcompressibleTurbulenceModels + -lcompressibleTurbulenceModels \ + -lthermoTools diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options index b157cc8553..424561b5f9 100644 --- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options +++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options @@ -21,6 +21,7 @@ EXE_LIBS = \ -lspecie \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -ldynamicMesh \ -ldynamicFvMesh \ -ltopoChangerFvMesh \ diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options index a9b16d2f25..badebdc5ab 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options @@ -23,6 +23,7 @@ EXE_LIBS = \ -lspecie \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -latmosphericModels \ -ldynamicMesh \ -ldynamicFvMesh \ diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/Make/options b/applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/Make/options index 1c97aae083..75d0ded852 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/Make/options +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/Make/options @@ -24,6 +24,7 @@ EXE_LIBS = \ -lspecie \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -latmosphericModels \ -loverset \ -ldynamicFvMesh \ diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options index 322b0c4488..da109f9260 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options @@ -20,5 +20,6 @@ EXE_LIBS = \ -lradiationModels \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -latmosphericModels \ -lregionFaModels diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options index 941407a03c..9f8b601014 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options @@ -37,6 +37,7 @@ EXE_LIBS = \ -lcombustionModels \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lradiationModels \ -lregionModels \ -lregionFaModels diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options index 02b07edfa5..e427bbfcfe 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options @@ -30,6 +30,7 @@ EXE_LIBS = \ -lspecie \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lradiationModels \ -lfvOptions \ -lfaOptions \ diff --git a/applications/solvers/heatTransfer/solidFoam/Make/options b/applications/solvers/heatTransfer/solidFoam/Make/options index ab6d205602..5b05f2e141 100644 --- a/applications/solvers/heatTransfer/solidFoam/Make/options +++ b/applications/solvers/heatTransfer/solidFoam/Make/options @@ -23,4 +23,5 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lsolidThermo \ -lradiationModels \ - -lspecie + -lspecie \ + -lthermoTools diff --git a/applications/solvers/heatTransfer/thermoFoam/Make/options b/applications/solvers/heatTransfer/thermoFoam/Make/options index 948d358981..3aef1695c5 100644 --- a/applications/solvers/heatTransfer/thermoFoam/Make/options +++ b/applications/solvers/heatTransfer/thermoFoam/Make/options @@ -18,4 +18,5 @@ EXE_LIBS = \ -lradiationModels \ -lspecie \ -lturbulenceModels \ - -lcompressibleTurbulenceModels + -lcompressibleTurbulenceModels \ + -lthermoTools diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options index 3fa33f6364..67ee052667 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options +++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options @@ -31,6 +31,7 @@ EXE_LIBS = \ -lmeshTools \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options index 70ec7ed080..81dbe56372 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options @@ -36,6 +36,7 @@ EXE_LIBS = \ -lsampling \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lspecie \ -lcompressibleTransportModels \ -lfluidThermophysicalModels \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options index d307b5260c..d2b25e0a67 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options @@ -36,6 +36,7 @@ EXE_LIBS = \ -ldynamicFvMesh \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lspecie \ -lcompressibleTransportModels \ -lfluidThermophysicalModels \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options index 6b2a725729..3e1485606f 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options @@ -31,6 +31,7 @@ EXE_LIBS = \ -lmeshTools \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options b/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options index 8612aedf9c..2b0ed56ead 100644 --- a/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options +++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options @@ -31,6 +31,7 @@ EXE_LIBS = \ -lmeshTools \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ diff --git a/applications/solvers/lagrangian/sprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/Make/options index 1d71196306..7ec29ea7dc 100644 --- a/applications/solvers/lagrangian/sprayFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/Make/options @@ -31,6 +31,7 @@ EXE_LIBS = \ -lmeshTools \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ diff --git a/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options index 7a8c521c90..4f13ec3364 100644 --- a/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options @@ -35,6 +35,7 @@ EXE_LIBS = \ -lsampling \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ diff --git a/applications/solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options index 151225cb07..44c94feb02 100644 --- a/applications/solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options @@ -31,6 +31,7 @@ EXE_LIBS = \ -lmeshTools \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -llagrangian \ -llagrangianIntermediate \ -llagrangianSpray \ diff --git a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options index c7501564d2..879780b5e0 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options @@ -36,6 +36,7 @@ EXE_LIBS = \ -lmeshTools \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options index 18c419a495..f94824bb63 100644 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options +++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options @@ -29,6 +29,7 @@ EXE_LIBS = \ -lradiationModels \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lregionModels \ -lsurfaceFilmModels \ -lregionFaModels \ diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/Make/options b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/Make/options index 067d0c0311..6c1aed4e31 100644 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/Make/options +++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/Make/options @@ -32,6 +32,7 @@ EXE_LIBS = \ -lradiationModels \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lregionModels \ -lsurfaceFilmModels \ -ldynamicMesh \ diff --git a/applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/options b/applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/options index 7c6e585672..c53fafcf5a 100644 --- a/applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/options +++ b/applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/options @@ -23,4 +23,5 @@ LIB_LIBS = \ -linterfaceProperties \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ - -lcompressibleTurbulenceModels + -lcompressibleTurbulenceModels \ + -lthermoTools diff --git a/applications/solvers/multiphase/compressibleInterFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/Make/options index 5fce651136..8204d76d9a 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/Make/options @@ -26,4 +26,5 @@ EXE_LIBS = \ -linterfaceProperties \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lVoFphaseCompressibleTurbulenceModels diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options index 746ca9a443..7e536a2c83 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options @@ -22,4 +22,5 @@ LIB_LIBS = \ -linterfaceProperties \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lincompressibleTransportModels diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options index cc49e190f4..3853db3847 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options @@ -29,6 +29,7 @@ EXE_LIBS = \ -linterfaceProperties \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lVoFphaseCompressibleTurbulenceModels \ -ldynamicMesh \ -ldynamicFvMesh diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options index 54392f419d..e04e4e98c6 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options @@ -36,6 +36,7 @@ EXE_LIBS = \ -linterfaceProperties \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lVoFphaseCompressibleTurbulenceModels \ -lSLGThermo \ -lsurfaceFilmModels \ diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options index 20f4d1aa68..185e98d9dd 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options @@ -36,5 +36,6 @@ EXE_LIBS = \ -linterfaceProperties \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lVoFphaseCompressibleTurbulenceModels \ -lgeometricVoF diff --git a/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/Make/options index 58a1577a9c..2b120f36ed 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/Make/options @@ -32,6 +32,7 @@ EXE_LIBS = \ -linterfaceProperties \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lVoFphaseCompressibleTurbulenceModels \ -ldynamicMesh \ -ldynamicFvMesh \ diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options index b58b0af6b0..f130c88d98 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options @@ -21,4 +21,5 @@ EXE_LIBS = \ -lspecie \ -linterfaceProperties \ -lturbulenceModels \ - -lcompressibleTurbulenceModels + -lcompressibleTurbulenceModels \ + -lthermoTools diff --git a/applications/solvers/multiphase/driftFluxFoam/Make/options b/applications/solvers/multiphase/driftFluxFoam/Make/options index d54870c688..66084c852c 100644 --- a/applications/solvers/multiphase/driftFluxFoam/Make/options +++ b/applications/solvers/multiphase/driftFluxFoam/Make/options @@ -22,4 +22,5 @@ EXE_LIBS = \ -ldriftFluxTransportModels \ -ldriftFluxRelativeVelocityModels \ -lturbulenceModels \ - -lcompressibleTurbulenceModels + -lcompressibleTurbulenceModels \ + -lthermoTools diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options index 4136469216..b20cb96a37 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options @@ -25,6 +25,7 @@ EXE_LIBS = \ -ldynamicFvMesh \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lcompressibleTransportModels \ -lradiationModels \ -lfluidThermophysicalModels \ diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/options index c8a632087e..aba9ee616d 100644 --- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/options +++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/options @@ -20,4 +20,5 @@ EXE_LIBS = \ -lsampling \ -lreactingMultiphaseSystem \ -lreactingTwoPhaseSystem \ - -ltwoPhaseReactingTurbulenceModels + -ltwoPhaseReactingTurbulenceModels \ + -lthermoTools diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options index fcd7558097..ee6c9ca96c 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options @@ -23,6 +23,7 @@ EXE_LIBS = \ -lspecie \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lincompressibleTransportModels \ -lcompressibleTwoPhaseSystem \ -lphaseCompressibleTurbulenceModels diff --git a/applications/utilities/mesh/advanced/PDRMesh/Make/options b/applications/utilities/mesh/advanced/PDRMesh/Make/options index 619a76c7a9..de525db668 100644 --- a/applications/utilities/mesh/advanced/PDRMesh/Make/options +++ b/applications/utilities/mesh/advanced/PDRMesh/Make/options @@ -10,5 +10,6 @@ EXE_LIBS = \ -ldynamicMesh \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lcompressibleTransportModels \ -lfluidThermophysicalModels diff --git a/applications/utilities/miscellaneous/foamHelp/Make/options b/applications/utilities/miscellaneous/foamHelp/Make/options index 280fed9692..4e185104f2 100644 --- a/applications/utilities/miscellaneous/foamHelp/Make/options +++ b/applications/utilities/miscellaneous/foamHelp/Make/options @@ -10,5 +10,6 @@ EXE_LIBS = \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lradiationModels \ -lfluidThermophysicalModels diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/options b/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/options index b3d092f102..14a502de5a 100644 --- a/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/options +++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/Make/options @@ -6,5 +6,6 @@ LIB_LIBS = \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lradiationModels \ -lfluidThermophysicalModels diff --git a/applications/utilities/postProcessing/postProcess/Make/options b/applications/utilities/postProcessing/postProcess/Make/options index c2019e8d8c..5fcf420ba6 100644 --- a/applications/utilities/postProcessing/postProcess/Make/options +++ b/applications/utilities/postProcessing/postProcess/Make/options @@ -19,6 +19,7 @@ EXE_LIBS = \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lincompressibleTransportModels \ -lcompressibleTransportModels \ -lfluidThermophysicalModels \ diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/Make/options b/applications/utilities/preProcessing/applyBoundaryLayer/Make/options index a887778b7b..8842d1feca 100644 --- a/applications/utilities/preProcessing/applyBoundaryLayer/Make/options +++ b/applications/utilities/preProcessing/applyBoundaryLayer/Make/options @@ -16,6 +16,7 @@ EXE_LIBS = \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lfluidThermophysicalModels \ -lincompressibleTransportModels \ -lcompressibleTransportModels \ diff --git a/applications/utilities/preProcessing/setTurbulenceFields/Make/options b/applications/utilities/preProcessing/setTurbulenceFields/Make/options index a887778b7b..8842d1feca 100644 --- a/applications/utilities/preProcessing/setTurbulenceFields/Make/options +++ b/applications/utilities/preProcessing/setTurbulenceFields/Make/options @@ -16,6 +16,7 @@ EXE_LIBS = \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lfluidThermophysicalModels \ -lincompressibleTransportModels \ -lcompressibleTransportModels \ diff --git a/src/Allwmake b/src/Allwmake index ff447a1075..96071901af 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -90,16 +90,13 @@ wmake $targetType combustionModels wmakeLnInclude -u regionFaModels wmakeLnInclude -u faOptions -regionModels/Allwmake $targetType $* + +wmakeLnInclude -u overset +wmake $targetType overset wmake $targetType fvOptions -wmake $targetType faOptions + wmake $targetType fvMotionSolver -wmake $targetType regionFaModels - -lagrangian/Allwmake $targetType $* - -wmake $targetType overset # snappyHexMesh uses overset voxelMesh mesh/Allwmake $targetType $* @@ -111,15 +108,25 @@ wmake $targetType engine conversion/Allwmake $targetType $* -functionObjects/Allwmake $targetType $* phaseSystemModels/Allwmake $targetType $* +functionObjects/Allwmake $targetType $* + +wmake $targetType thermoTools + +regionModels/Allwmake $targetType $* + +wmake $targetType faOptions +wmake $targetType regionFaModels + +lagrangian/Allwmake $targetType $* +wmake $targetType functionObjects/lagrangian + wmake $targetType lumpedPointMotion wmake $targetType sixDoFRigidBodyMotion wmake $targetType sixDoFRigidBodyState wmake $targetType rigidBodyDynamics wmake $targetType rigidBodyMeshMotion -wmake $targetType semiPermeableBaffle wmake $targetType atmosphericModels wmake $targetType optimisation/adjointOptimisation/adjoint @@ -128,10 +135,6 @@ wmake $targetType optimisation/adjointOptimisation/adjoint dynamicFaMesh/Allwmake $targetType $* -# Needs access to Turbulence - -wmake $targetType thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties - #------------------------------------------------------------------------------ echo ======================================== diff --git a/src/TurbulenceModels/compressible/Make/files b/src/TurbulenceModels/compressible/Make/files index 50a25f81c5..3197fb304a 100644 --- a/src/TurbulenceModels/compressible/Make/files +++ b/src/TurbulenceModels/compressible/Make/files @@ -1,23 +1,4 @@ compressibleTurbulenceModel.C turbulentFluidThermoModels/turbulentFluidThermoModels.C -BCs = turbulentFluidThermoModels/derivedFvPatchFields - -$(BCs)/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C -$(BCs)/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C -$(BCs)/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C -$(BCs)/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C -$(BCs)/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C -$(BCs)/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C -$(BCs)/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C -$(BCs)/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C - -$(BCs)/temperatureCoupledBase/temperatureCoupledBase.C -$(BCs)/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C -$(BCs)/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C -$(BCs)/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C - -$(BCs)/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C -$(BCs)/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C - LIB = $(FOAM_LIBBIN)/libcompressibleTurbulenceModels diff --git a/src/faOptions/Make/options b/src/faOptions/Make/options index 46c960d614..f37f3d412a 100644 --- a/src/faOptions/Make/options +++ b/src/faOptions/Make/options @@ -10,6 +10,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/thermoTools/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude LIB_LIBS = \ @@ -19,4 +20,5 @@ LIB_LIBS = \ -lmeshTools \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ - -lcompressibleTurbulenceModels + -lcompressibleTurbulenceModels \ + -lthermoTools diff --git a/src/functionObjects/Allwmake b/src/functionObjects/Allwmake index 4a6d461b7f..9c4009e728 100755 --- a/src/functionObjects/Allwmake +++ b/src/functionObjects/Allwmake @@ -7,7 +7,6 @@ cd "${0%/*}" || exit # Run from this directory wmake $targetType field wmake $targetType forces wmake $targetType initialisation -wmake $targetType lagrangian wmake $targetType utilities wmake $targetType solvers diff --git a/src/phaseSystemModels/Allwmake b/src/phaseSystemModels/Allwmake index 64e3943b1d..02f197f250 100755 --- a/src/phaseSystemModels/Allwmake +++ b/src/phaseSystemModels/Allwmake @@ -3,9 +3,9 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments #------------------------------------------------------------------------------ +reactingEuler/Allwmake $targetType $* multiphaseInter/Allwmake $targetType $* multiphaseEuler/Allwmake $targetType $* -reactingEuler/Allwmake $targetType $* twoPhaseEuler/Allwmake $targetType $* twoPhaseInter/Allwmake $targetType $* diff --git a/src/regionModels/regionCoupling/Make/options b/src/regionModels/regionCoupling/Make/options index 296ed5e228..467ab19e8a 100644 --- a/src/regionModels/regionCoupling/Make/options +++ b/src/regionModels/regionCoupling/Make/options @@ -14,6 +14,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/thermoTools/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/pyrolysisModels/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude @@ -28,4 +29,5 @@ LIB_LIBS = \ -lreactionThermophysicalModels \ -lSLGThermo \ -lturbulenceModels \ - -lcompressibleTurbulenceModels + -lcompressibleTurbulenceModels \ + -lthermoTools diff --git a/src/regionModels/thermalBaffleModels/Make/options b/src/regionModels/thermalBaffleModels/Make/options index 1f66d1e014..2fd73a00af 100644 --- a/src/regionModels/thermalBaffleModels/Make/options +++ b/src/regionModels/thermalBaffleModels/Make/options @@ -8,6 +8,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/thermoTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/mesh/extrudeModel/lnInclude @@ -19,5 +20,6 @@ LIB_LIBS = \ -lsolidThermo \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ + -lthermoTools \ -lradiationModels \ -ldynamicMesh diff --git a/src/semiPermeableBaffle/Make/files b/src/semiPermeableBaffle/Make/files deleted file mode 100644 index 2556e5fb53..0000000000 --- a/src/semiPermeableBaffle/Make/files +++ /dev/null @@ -1,4 +0,0 @@ -derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C -derivedFvPatchFields/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C - -LIB = $(FOAM_LIBBIN)/libsemiPermeableBaffle diff --git a/src/semiPermeableBaffle/Make/options b/src/semiPermeableBaffle/Make/options deleted file mode 100644 index 10f6ee79d8..0000000000 --- a/src/semiPermeableBaffle/Make/options +++ /dev/null @@ -1,17 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude - -LIB_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ - -lcompressibleTransportModels \ - -lfluidThermophysicalModels \ - -lspecie \ - -lreactionThermophysicalModels \ - -lturbulenceModels diff --git a/src/thermoTools/Make/files b/src/thermoTools/Make/files new file mode 100644 index 0000000000..b66d55ed13 --- /dev/null +++ b/src/thermoTools/Make/files @@ -0,0 +1,24 @@ +BCs = derivedFvPatchFields + +$(BCs)/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C +$(BCs)/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C + +$(BCs)/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C +$(BCs)/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C +$(BCs)/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C +$(BCs)/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C +$(BCs)/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C +$(BCs)/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C +$(BCs)/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C +$(BCs)/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C +$(BCs)/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C + +$(BCs)/temperatureCoupledBase/temperatureCoupledBase.C +$(BCs)/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C +$(BCs)/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C +$(BCs)/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C + +$(BCs)/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C +$(BCs)/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C + +LIB = $(FOAM_LIBBIN)/libthermoTools diff --git a/src/thermoTools/Make/options b/src/thermoTools/Make/options new file mode 100644 index 0000000000..d149ad3683 --- /dev/null +++ b/src/thermoTools/Make/options @@ -0,0 +1,30 @@ +EXE_INC = \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/regionCoupled/lnInclude \ + -I$(LIB_SRC)/phaseSystemModels/multiphaseInter/phasesSystem/lnInclude \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ + -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude + +LIB_LIBS = \ + -lcompressibleTransportModels \ + -lfiniteVolume \ + -lmeshTools \ + -lradiationModels \ + -lfluidThermophysicalModels \ + -lsolidThermo \ + -lsolidSpecie \ + -lturbulenceModels \ + -lspecie \ + -lcompressibleTurbulenceModels \ + -lturbulenceModels \ + -lreactionThermophysicalModels \ + -lincompressibleMultiphaseSystems diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C rename to src/thermoTools/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H rename to src/thermoTools/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C rename to src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H rename to src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C rename to src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.H similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.H rename to src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.H diff --git a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C similarity index 100% rename from src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C rename to src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C diff --git a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H similarity index 100% rename from src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H rename to src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C rename to src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.H similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.H rename to src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.H diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C rename to src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.H similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.H rename to src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.H diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C b/src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C rename to src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H b/src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H rename to src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H diff --git a/src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C similarity index 100% rename from src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C rename to src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C diff --git a/src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.H similarity index 100% rename from src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.H rename to src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.H diff --git a/src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C similarity index 100% rename from src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C rename to src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C diff --git a/src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.H b/src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.H similarity index 100% rename from src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.H rename to src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.H diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C b/src/thermoTools/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C similarity index 97% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C rename to src/thermoTools/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C index c3651276f3..b14d96c692 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C +++ b/src/thermoTools/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2017-2021 OpenCFD Ltd. + Copyright (C) 2017-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -31,6 +31,7 @@ License #include "fluidThermo.H" #include "solidThermo.H" #include "turbulentFluidThermoModel.H" +#include "multiphaseInterSystem.H" // * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * * // @@ -255,11 +256,14 @@ Foam::tmp Foam::temperatureCoupledBase::kappa { const auto* ptr = - mesh.cfindObject("phaseProperties"); + mesh.cfindObject + ( + multiphaseInterSystem::phasePropertiesName + ); if (ptr) { - return ptr->kappa(patchi); + return ptr->kappaEff(patchi); } } diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H b/src/thermoTools/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H rename to src/thermoTools/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C rename to src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H rename to src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C b/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C rename to src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H b/src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H rename to src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C rename to src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H rename to src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H b/src/thermoTools/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H rename to src/thermoTools/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C rename to src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H rename to src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C rename to src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H rename to src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C rename to src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H rename to src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C rename to src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H rename to src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C b/src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C rename to src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H b/src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H similarity index 100% rename from src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H rename to src/thermoTools/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.H diff --git a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/Make/files b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/Make/files deleted file mode 100644 index b245eb6bd5..0000000000 --- a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/Make/files +++ /dev/null @@ -1,4 +0,0 @@ -humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C - - -LIB = $(FOAM_LIBBIN)/libliquidPropertiesFvPatchFields diff --git a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/Make/options b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/Make/options deleted file mode 100644 index 6c01649f5d..0000000000 --- a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/Make/options +++ /dev/null @@ -1,11 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude - -LIB_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ - -lthermophysicalProperties \ - -lcompressibleTurbulenceModels diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict index e473cc97cd..482b9761be 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/windshieldCondensation/system/controlDict @@ -16,8 +16,6 @@ FoamFile #include "solverControls" -libs (liquidPropertiesFvPatchFields); - application chtMultiRegionFoam; startFrom startTime; From 45c3ba0e8e60d51a27646d1c848b9c0ec1c22d6d Mon Sep 17 00:00:00 2001 From: sergio Date: Tue, 14 Jun 2022 13:49:20 +0100 Subject: [PATCH 2/8] ENH: phaseSystemModels: new namespaces for various submodels Co-authored-by: Kutalmis Bercin --- .../icoReactingMultiphaseInterFoam/YEqns.H | 2 +- .../createFields.H | 14 +- .../field/wallHeatFlux/wallHeatFlux.C | 16 +- .../multiphaseSystem/Make/files | 3 +- .../alphaContactAngleFvPatchScalarField.C | 4 + .../alphaContactAngleFvPatchScalarField.H | 8 +- .../constantDiameter/constantDiameter.C | 9 +- .../constantDiameter/constantDiameter.H | 11 +- .../diameterModel/diameterModel.C | 10 +- .../diameterModel/diameterModel.H | 11 +- .../isothermalDiameter/isothermalDiameter.C | 9 +- .../isothermalDiameter/isothermalDiameter.H | 11 +- .../dragModels/Ergun/Ergun.C | 10 +- .../dragModels/Ergun/Ergun.H | 10 +- .../dragModels/Gibilaro/Gibilaro.C | 10 +- .../dragModels/Gibilaro/Gibilaro.H | 10 +- .../GidaspowErgunWenYu/GidaspowErgunWenYu.C | 11 +- .../GidaspowErgunWenYu/GidaspowErgunWenYu.H | 10 +- .../GidaspowSchillerNaumann.C | 13 +- .../GidaspowSchillerNaumann.H | 10 +- .../SchillerNaumann/SchillerNaumann.C | 11 +- .../SchillerNaumann/SchillerNaumann.H | 10 +- .../dragModels/SyamlalOBrien/SyamlalOBrien.C | 11 +- .../dragModels/SyamlalOBrien/SyamlalOBrien.H | 10 +- .../dragModels/WenYu/WenYu.C | 10 +- .../dragModels/WenYu/WenYu.H | 10 +- .../dragModels/blended/blended.C | 9 +- .../dragModels/blended/blended.H | 11 +- .../dragModels/dragModel/dragModel.C | 10 +- .../dragModels/dragModel/dragModel.H | 10 +- .../dragModels/interface/interface.C | 9 +- .../dragModels/interface/interface.H | 10 +- .../RanzMarshall/RanzMarshall.C | 11 +- .../RanzMarshall/RanzMarshall.H | 10 +- .../heatTransferModel/heatTransferModel.C | 10 +- .../heatTransferModel/heatTransferModel.H | 11 +- .../multiphaseSystem/multiphaseSystem.C | 24 +- .../multiphaseSystem/multiphaseSystem.H | 13 +- .../multiphaseSystem/phaseModel/phaseModel.C | 3 +- .../multiphaseSystem/phaseModel/phaseModel.H | 10 +- .../compressibleMultiPhaseTurbulenceModels.C | 4 +- .../InterfaceCompositionModel.C | 4 +- .../InterfaceCompositionModel.H | 6 +- .../multiphaseInter/phasesSystem/Make/files | 2 +- .../MassTransferPhaseSystem.C | 4 +- .../MassTransferPhaseSystem.H | 12 +- .../interfaceCompositionModel.C | 40 +++- .../interfaceCompositionModel.H | 10 +- .../multiphaseInterSystem.C} | 219 ++++++++++++------ .../multiphaseInterSystem.H} | 82 +++++-- .../multiphaseInterSystemTemplates.H} | 23 +- .../multiphaseSystem/multiphaseSystem.C | 64 ++--- .../multiphaseSystem/multiphaseSystem.H | 10 +- .../multiphaseSystem/multiphaseSystemNew.C | 7 +- .../multiphaseSystem/multiphaseSystems.C | 7 +- .../MovingPhaseModel/MovingPhaseModel.C | 14 +- .../MovingPhaseModel/MovingPhaseModel.H | 4 +- .../MultiComponentPhaseModel.C | 16 +- .../MultiComponentPhaseModel.H | 4 +- .../PurePhaseModel/PurePhaseModel.C | 6 +- .../PurePhaseModel/PurePhaseModel.H | 6 +- .../StaticPhaseModel/StaticPhaseModel.C | 54 ++--- .../StaticPhaseModel/StaticPhaseModel.H | 4 +- .../phaseModel/phaseModel/makePhaseTypes.H | 22 +- .../phaseModel/phaseModel/phaseModel.C | 93 ++++---- .../phaseModel/phaseModel/phaseModel.H | 27 ++- .../phaseModel/phaseModel/phaseModels.C | 10 +- .../phasesSystem/phasePair/orderedPhasePair.C | 10 +- .../phasesSystem/phasePair/orderedPhasePair.H | 10 +- .../phasesSystem/phasePair/phasePair.C | 10 +- .../phasesSystem/phasePair/phasePair.H | 18 +- .../phasesSystem/phasePair/phasePairI.H | 6 +- .../alphaContactAngleFvPatchScalarField.C | 4 + .../alphaContactAngleFvPatchScalarField.H | 7 +- .../constantSurfaceTensionCoefficient.C | 16 +- .../constantSurfaceTensionCoefficient.H | 4 + .../surfaceTensionModel/surfaceTensionModel.C | 16 +- .../surfaceTensionModel/surfaceTensionModel.H | 6 +- .../multiphaseSystem/multiphaseSystem.C | 22 +- .../multiphaseSystem/phasePair/phasePair.C | 5 +- .../phaseSystem/phaseSystem.C | 10 +- .../phaseSystem/phaseSystem.H | 8 +- .../populationBalanceModel.C | 4 +- 83 files changed, 860 insertions(+), 455 deletions(-) rename src/phaseSystemModels/multiphaseEuler/multiphaseSystem/{ => derivedFvPatchFields}/alphaContactAngle/alphaContactAngleFvPatchScalarField.C (97%) rename src/phaseSystemModels/multiphaseEuler/multiphaseSystem/{ => derivedFvPatchFields}/alphaContactAngle/alphaContactAngleFvPatchScalarField.H (96%) rename src/phaseSystemModels/multiphaseInter/phasesSystem/{phaseSystem/phaseSystem.C => multiphaseInterSystem/multiphaseInterSystem.C} (77%) rename src/phaseSystemModels/multiphaseInter/phasesSystem/{phaseSystem/phaseSystem.H => multiphaseInterSystem/multiphaseInterSystem.H} (88%) rename src/phaseSystemModels/multiphaseInter/phasesSystem/{phaseSystem/phaseSystemTemplates.H => multiphaseInterSystem/multiphaseInterSystemTemplates.H} (88%) diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/YEqns.H b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/YEqns.H index 31d10788bc..912b91114d 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/YEqns.H +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/YEqns.H @@ -1,5 +1,5 @@ { - for (phaseModel& phase : fluid.phases()) + for (multiphaseInter::phaseModel& phase : fluid.phases()) { PtrList& Y = phase.Y(); diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/createFields.H b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/createFields.H index cd9a508390..0e51602d3c 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/createFields.H +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/createFields.H @@ -63,9 +63,10 @@ Info<< "Creating multiphaseSystem\n" << endl; - autoPtr fluidPtr = multiphaseSystem::New(mesh); + autoPtr fluidPtr = + multiphaseInter::multiphaseSystem::New(mesh); - multiphaseSystem& fluid = fluidPtr(); + multiphaseInter::multiphaseSystem& fluid = fluidPtr(); if (!fluid.incompressible()) { @@ -118,9 +119,12 @@ surfaceScalarField& rhoPhi = fluid.rhoPhi(); // Construct incompressible turbulence model - autoPtr> turbulence + autoPtr + < + CompressibleTurbulenceModel + > turbulence ( - CompressibleTurbulenceModel::New + CompressibleTurbulenceModel::New ( rho, U, @@ -129,6 +133,8 @@ ) ); + fluid.setTurbulence(turbulence()); + // Creating radiation model autoPtr radiation ( diff --git a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C index c7dcf4a887..c8e5ed9b86 100644 --- a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C +++ b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2016-2017 OpenFOAM Foundation - Copyright (C) 2016-2020 OpenCFD Ltd. + Copyright (C) 2016-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -34,6 +34,7 @@ License #include "wallPolyPatch.H" #include "turbulentFluidThermoModel.H" #include "addToRunTimeSelectionTable.H" +#include "multiphaseInterSystem.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -236,6 +237,19 @@ bool Foam::functionObjects::wallHeatFlux::execute() calcHeatFlux(thermo.alpha(), thermo.he(), wallHeatFlux); } + else if + ( + foundObject + (multiphaseInterSystem::phasePropertiesName) + ) + { + const auto& thermo = lookupObject + ( + multiphaseInterSystem::phasePropertiesName + ); + + calcHeatFlux(thermo.kappaEff()(), thermo.T(), wallHeatFlux); + } else { FatalErrorInFunction diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/Make/files b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/Make/files index 159e04c950..2ddef9fb4c 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/Make/files +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/Make/files @@ -7,7 +7,6 @@ $(diameter)/diameterModel/diameterModel.C $(diameter)/constantDiameter/constantDiameter.C $(diameter)/isothermalDiameter/isothermalDiameter.C - drag = interfacialModels/dragModels $(drag)/dragModel/dragModel.C $(drag)/Ergun/Ergun.C @@ -24,7 +23,7 @@ heatTransfer = interfacialModels/heatTransferModels $(heatTransfer)/heatTransferModel/heatTransferModel.C $(heatTransfer)/RanzMarshall/RanzMarshall.C +derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C -alphaContactAngle/alphaContactAngleFvPatchScalarField.C LIB = $(FOAM_LIBBIN)/libmultiphaseSystem diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C similarity index 97% rename from src/phaseSystemModels/multiphaseEuler/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C index 77b08137bc..b1b8750625 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -33,6 +34,8 @@ License namespace Foam { +namespace multiphaseEuler +{ alphaContactAngleFvPatchScalarField::interfaceThetaProps::interfaceThetaProps ( @@ -142,6 +145,7 @@ makePatchTypeField // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +} // End namespace multiphaseEuler } // End namespace Foam // ************************************************************************* // diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.H similarity index 96% rename from src/phaseSystemModels/multiphaseEuler/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.H index 929c8ab78a..fd2727be90 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2012 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -35,8 +36,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef alphaContactAngleFvPatchScalarField_H -#define alphaContactAngleFvPatchScalarField_H +#ifndef Foam_multiphaseEuler_alphaContactAngleFvPatchScalarField_H +#define Foam_multiphaseEuler_alphaContactAngleFvPatchScalarField_H #include "zeroGradientFvPatchFields.H" #include "multiphaseSystem.H" @@ -45,6 +46,8 @@ SourceFiles namespace Foam { +namespace multiphaseEuler +{ /*---------------------------------------------------------------------------*\ Class alphaContactAngleFvPatch Declaration @@ -208,6 +211,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +} // End namespace multiphaseEuler } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C index f1136346d6..d3667c5204 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2015 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -32,6 +33,8 @@ License namespace Foam { +namespace multiphaseEuler +{ namespace diameterModels { defineTypeNameAndDebug(constant, 0); @@ -44,11 +47,12 @@ namespace diameterModels ); } } +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::diameterModels::constant::constant +Foam::multiphaseEuler::diameterModels::constant::constant ( const dictionary& dict, const phaseModel& phase @@ -61,7 +65,8 @@ Foam::diameterModels::constant::constant // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::tmp Foam::diameterModels::constant::d() const +Foam::tmp +Foam::multiphaseEuler::diameterModels::constant::d() const { return tmp ( diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H index 27cb0482ee..bd7fefc05b 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2013 OpenFOAM Foundation - Copyright (C) 2020 OpenCFD Ltd. + Copyright (C) 2020-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -25,7 +25,7 @@ License along with OpenFOAM. If not, see . Class - Foam::diameterModels::constant + Foam::multiphaseEuler::diameterModels::constant Description Constant dispersed-phase particle diameter model. @@ -35,8 +35,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef diameterModels_constant_H -#define diameterModels_constant_H +#ifndef Foam_multiphaseEuler_diameterModels_constant_H +#define Foam_multiphaseEuler_diameterModels_constant_H #include "diameterModel.H" @@ -44,6 +44,8 @@ SourceFiles namespace Foam { +namespace multiphaseEuler +{ namespace diameterModels { @@ -90,6 +92,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace diameterModels +} // End namespace multiphaseEuler } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C index da3d0e8f8d..976ec0569b 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2013 OpenFOAM Foundation - Copyright (C) 2019-2021 OpenCFD Ltd. + Copyright (C) 2019-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -31,15 +31,18 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam +{ +namespace multiphaseEuler { defineTypeNameAndDebug(diameterModel, 0); defineRunTimeSelectionTable(diameterModel, dictionary); } +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::diameterModel::diameterModel +Foam::multiphaseEuler::diameterModel::diameterModel ( const dictionary& dict, const phaseModel& phase @@ -52,7 +55,8 @@ Foam::diameterModel::diameterModel // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr Foam::diameterModel::New +Foam::autoPtr +Foam::multiphaseEuler::diameterModel::New ( const dictionary& dict, const phaseModel& phase diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H index cc3c945965..485cf71021 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2013 OpenFOAM Foundation - Copyright (C) 2020 OpenCFD Ltd. + Copyright (C) 2020-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -25,7 +25,7 @@ License along with OpenFOAM. If not, see . Class - Foam::diameterModel + Foam::multiphaseEuler::diameterModel Description Abstract base-class for dispersed-phase particle diameter models. @@ -35,8 +35,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef diameterModel_H -#define diameterModel_H +#ifndef Foam_multiphaseEuler_diameterModel_H +#define Foam_multiphaseEuler_diameterModel_H // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -46,6 +46,8 @@ SourceFiles namespace Foam { +namespace multiphaseEuler +{ /*---------------------------------------------------------------------------*\ Class diameterModel Declaration @@ -115,6 +117,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace Foam +} // End namespace multiphaseEuler // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C index cf2c79d16b..fb455ea84b 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2015 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -32,6 +33,8 @@ License namespace Foam { +namespace multiphaseEuler +{ namespace diameterModels { defineTypeNameAndDebug(isothermal, 0); @@ -44,11 +47,12 @@ namespace diameterModels ); } } +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::diameterModels::isothermal::isothermal +Foam::multiphaseEuler::diameterModels::isothermal::isothermal ( const dictionary& dict, const phaseModel& phase @@ -62,7 +66,8 @@ Foam::diameterModels::isothermal::isothermal // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::tmp Foam::diameterModels::isothermal::d() const +Foam::tmp +Foam::multiphaseEuler::diameterModels::isothermal::d() const { const volScalarField& p = phase_.U().db().lookupObject ( diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H index b42ef69a89..0a1b8e1827 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2013 OpenFOAM Foundation - Copyright (C) 2020 OpenCFD Ltd. + Copyright (C) 2020-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -25,7 +25,7 @@ License along with OpenFOAM. If not, see . Class - Foam::diameterModels::isothermal + Foam::multiphaseEuler::diameterModels::isothermal Description Isothermal dispersed-phase particle diameter model. @@ -35,8 +35,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef diameterModels_isothermal_H -#define diameterModels_isothermal_H +#ifndef Foam_multiphaseEuler_diameterModels_isothermal_H +#define Foam_multiphaseEuler_diameterModels_isothermal_H #include "diameterModel.H" @@ -44,6 +44,8 @@ SourceFiles namespace Foam { +namespace multiphaseEuler +{ namespace diameterModels { @@ -93,6 +95,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace diameterModels +} // End namespace multiphaseEuler } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C index b8efba99c6..2253ff6af6 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2012 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -32,6 +33,8 @@ License namespace Foam { +namespace multiphaseEuler +{ namespace dragModels { defineTypeNameAndDebug(Ergun, 0); @@ -44,11 +47,12 @@ namespace dragModels ); } } +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::dragModels::Ergun::Ergun +Foam::multiphaseEuler::dragModels::Ergun::Ergun ( const dictionary& interfaceDict, const phaseModel& phase1, @@ -61,13 +65,13 @@ Foam::dragModels::Ergun::Ergun // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::dragModels::Ergun::~Ergun() +Foam::multiphaseEuler::dragModels::Ergun::~Ergun() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::tmp Foam::dragModels::Ergun::K +Foam::tmp Foam::multiphaseEuler::dragModels::Ergun::K ( const volScalarField& Ur ) const diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.H index 49db4bb014..a23dfe175b 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.H +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -24,7 +25,7 @@ License along with OpenFOAM. If not, see . Class - Foam::dragModels::Ergun + Foam::multiphaseEuler::dragModels::Ergun Description H, Enwald, E. Peirano, A-E Almstedt @@ -37,8 +38,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef Ergun_H -#define Ergun_H +#ifndef Foam_multiphaseEuler_dragModels_Ergun_H +#define Foam_multiphaseEuler_dragModels_Ergun_H #include "dragModel.H" @@ -46,6 +47,8 @@ SourceFiles namespace Foam { +namespace multiphaseEuler +{ namespace dragModels { @@ -88,6 +91,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace dragModels +} // End namespace multiphaseEuler } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C index beaac85a24..4adb0956ac 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2012 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -32,6 +33,8 @@ License namespace Foam { +namespace multiphaseEuler +{ namespace dragModels { defineTypeNameAndDebug(Gibilaro, 0); @@ -44,11 +47,12 @@ namespace dragModels ); } } +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::dragModels::Gibilaro::Gibilaro +Foam::multiphaseEuler::dragModels::Gibilaro::Gibilaro ( const dictionary& interfaceDict, const phaseModel& phase1, @@ -61,13 +65,13 @@ Foam::dragModels::Gibilaro::Gibilaro // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::dragModels::Gibilaro::~Gibilaro() +Foam::multiphaseEuler::dragModels::Gibilaro::~Gibilaro() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::tmp Foam::dragModels::Gibilaro::K +Foam::tmp Foam::multiphaseEuler::dragModels::Gibilaro::K ( const volScalarField& Ur ) const diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.H index acd0cc6880..135af0f960 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.H +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -24,7 +25,7 @@ License along with OpenFOAM. If not, see . Class - Foam::dragModels::Gibilaro + Foam::multiphaseEuler::dragModels::Gibilaro Description H, Enwald, E. Peirano, A-E Almstedt @@ -37,8 +38,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef Gibilaro_H -#define Gibilaro_H +#ifndef Foam_multiphaseEuler_dragModels_Gibilaro_H +#define Foam_multiphaseEuler_dragModels_Gibilaro_H #include "dragModel.H" @@ -46,6 +47,8 @@ SourceFiles namespace Foam { +namespace multiphaseEuler +{ namespace dragModels { @@ -88,6 +91,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace dragModels +} // End namespace multiphaseEuler } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C index fed9000c4d..c1193fdd28 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -32,6 +33,8 @@ License namespace Foam { +namespace multiphaseEuler +{ namespace dragModels { defineTypeNameAndDebug(GidaspowErgunWenYu, 0); @@ -44,11 +47,12 @@ namespace dragModels ); } } +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::dragModels::GidaspowErgunWenYu::GidaspowErgunWenYu +Foam::multiphaseEuler::dragModels::GidaspowErgunWenYu::GidaspowErgunWenYu ( const dictionary& interfaceDict, const phaseModel& phase1, @@ -61,13 +65,14 @@ Foam::dragModels::GidaspowErgunWenYu::GidaspowErgunWenYu // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::dragModels::GidaspowErgunWenYu::~GidaspowErgunWenYu() +Foam::multiphaseEuler::dragModels::GidaspowErgunWenYu::~GidaspowErgunWenYu() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::tmp Foam::dragModels::GidaspowErgunWenYu::K +Foam::tmp +Foam::multiphaseEuler::dragModels::GidaspowErgunWenYu::K ( const volScalarField& Ur ) const diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H index 48d2c41203..3f5285a1e4 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -24,7 +25,7 @@ License along with OpenFOAM. If not, see . Class - Foam::dragModels::GidaspowErgunWenYu + Foam::multiphaseEuler::dragModels::GidaspowErgunWenYu Description D. Gidaspow, Multiphase flow and fluidization, @@ -35,8 +36,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef GidaspowErgunWenYu_H -#define GidaspowErgunWenYu_H +#ifndef Foam_multiphaseEuler_dragModels_GidaspowErgunWenYu_H +#define Foam_multiphaseEuler_dragModels_GidaspowErgunWenYu_H #include "dragModel.H" @@ -44,6 +45,8 @@ SourceFiles namespace Foam { +namespace multiphaseEuler +{ namespace dragModels { @@ -86,6 +89,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace dragModels +} // End namespace multiphaseEuler } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C index a9c20ab921..db2659ade9 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -32,6 +33,8 @@ License namespace Foam { +namespace multiphaseEuler +{ namespace dragModels { defineTypeNameAndDebug(GidaspowSchillerNaumann, 0); @@ -44,11 +47,13 @@ namespace dragModels ); } } +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::dragModels::GidaspowSchillerNaumann::GidaspowSchillerNaumann +Foam::multiphaseEuler::dragModels::GidaspowSchillerNaumann:: +GidaspowSchillerNaumann ( const dictionary& interfaceDict, const phaseModel& phase1, @@ -61,13 +66,15 @@ Foam::dragModels::GidaspowSchillerNaumann::GidaspowSchillerNaumann // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::dragModels::GidaspowSchillerNaumann::~GidaspowSchillerNaumann() +Foam::multiphaseEuler::dragModels::GidaspowSchillerNaumann:: +~GidaspowSchillerNaumann() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::tmp Foam::dragModels::GidaspowSchillerNaumann::K +Foam::tmp +Foam::multiphaseEuler::dragModels::GidaspowSchillerNaumann::K ( const volScalarField& Ur ) const diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H index 5f3d55ddbc..24af98b750 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -24,7 +25,7 @@ License along with OpenFOAM. If not, see . Class - Foam::dragModels::GidaspowSchillerNaumann + Foam::multiphaseEuler::dragModels::GidaspowSchillerNaumann Description H, Enwald, E. Peirano, A-E Almstedt @@ -44,8 +45,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef GidaspowSchillerNaumann_H -#define GidaspowSchillerNaumann_H +#ifndef Foam_multiphaseEuler_dragModels_GidaspowSchillerNaumann_H +#define Foam_multiphaseEuler_dragModels_GidaspowSchillerNaumann_H #include "dragModel.H" @@ -53,6 +54,8 @@ SourceFiles namespace Foam { +namespace multiphaseEuler +{ namespace dragModels { @@ -95,6 +98,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace dragModels +} // End namespace multiphaseEuler } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C index 09a3545cee..0190f746f8 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -32,6 +33,8 @@ License namespace Foam { +namespace multiphaseEuler +{ namespace dragModels { defineTypeNameAndDebug(SchillerNaumann, 0); @@ -44,11 +47,12 @@ namespace dragModels ); } } +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::dragModels::SchillerNaumann::SchillerNaumann +Foam::multiphaseEuler::dragModels::SchillerNaumann::SchillerNaumann ( const dictionary& interfaceDict, const phaseModel& phase1, @@ -61,13 +65,14 @@ Foam::dragModels::SchillerNaumann::SchillerNaumann // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::dragModels::SchillerNaumann::~SchillerNaumann() +Foam::multiphaseEuler::dragModels::SchillerNaumann::~SchillerNaumann() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::tmp Foam::dragModels::SchillerNaumann::K +Foam::tmp +Foam::multiphaseEuler::dragModels::SchillerNaumann::K ( const volScalarField& Ur ) const diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H index 61859f4070..f11ac06095 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -24,7 +25,7 @@ License along with OpenFOAM. If not, see . Class - Foam::dragModels::SchillerNaumann + Foam::multiphaseEuler::dragModels::SchillerNaumann Description @@ -33,8 +34,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef SchillerNaumann_H -#define SchillerNaumann_H +#ifndef Foam_multiphaseEuler_dragModels_SchillerNaumann_H +#define Foam_multiphaseEuler_dragModels_SchillerNaumann_H #include "dragModel.H" @@ -42,6 +43,8 @@ SourceFiles namespace Foam { +namespace multiphaseEuler +{ namespace dragModels { @@ -84,6 +87,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace dragModels +} // End namespace multiphaseEuler } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C index b0646777c1..8c29ad32b1 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -32,6 +33,8 @@ License namespace Foam { +namespace multiphaseEuler +{ namespace dragModels { defineTypeNameAndDebug(SyamlalOBrien, 0); @@ -44,11 +47,12 @@ namespace dragModels ); } } +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::dragModels::SyamlalOBrien::SyamlalOBrien +Foam::multiphaseEuler::dragModels::SyamlalOBrien::SyamlalOBrien ( const dictionary& interfaceDict, const phaseModel& phase1, @@ -61,13 +65,14 @@ Foam::dragModels::SyamlalOBrien::SyamlalOBrien // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::dragModels::SyamlalOBrien::~SyamlalOBrien() +Foam::multiphaseEuler::dragModels::SyamlalOBrien::~SyamlalOBrien() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::tmp Foam::dragModels::SyamlalOBrien::K +Foam::tmp +Foam::multiphaseEuler::dragModels::SyamlalOBrien::K ( const volScalarField& Ur ) const diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H index bd4b714c33..34067eb45e 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -24,7 +25,7 @@ License along with OpenFOAM. If not, see . Class - Foam::dragModels::SyamlalOBrien + Foam::multiphaseEuler::dragModels::SyamlalOBrien Description Syamlal, M., Rogers, W. and O'Brien, T. J. (1993) MFIX documentation, @@ -36,8 +37,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef SyamlalOBrien_H -#define SyamlalOBrien_H +#ifndef Foam_multiphaseEuler_dragModels_SyamlalOBrien_H +#define Foam_multiphaseEuler_dragModels_SyamlalOBrien_H #include "dragModel.H" @@ -45,6 +46,8 @@ SourceFiles namespace Foam { +namespace multiphaseEuler +{ namespace dragModels { @@ -87,6 +90,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace dragModels +} // End namespace multiphaseEuler } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C index 1ba93914a7..4b6722a8e6 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -32,6 +33,8 @@ License namespace Foam { +namespace multiphaseEuler +{ namespace dragModels { defineTypeNameAndDebug(WenYu, 0); @@ -44,11 +47,12 @@ namespace dragModels ); } } +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::dragModels::WenYu::WenYu +Foam::multiphaseEuler::dragModels::WenYu::WenYu ( const dictionary& interfaceDict, const phaseModel& phase1, @@ -61,13 +65,13 @@ Foam::dragModels::WenYu::WenYu // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::dragModels::WenYu::~WenYu() +Foam::multiphaseEuler::dragModels::WenYu::~WenYu() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::tmp Foam::dragModels::WenYu::K +Foam::tmp Foam::multiphaseEuler::dragModels::WenYu::K ( const volScalarField& Ur ) const diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.H index 2b60eeaf5f..a5aa3c3802 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.H +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -24,7 +25,7 @@ License along with OpenFOAM. If not, see . Class - Foam::dragModels::WenYu + Foam::multiphaseEuler::dragModels::WenYu Description H, Enwald, E. Peirano, A-E Almstedt @@ -47,8 +48,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef WenYu_H -#define WenYu_H +#ifndef Foam_multiphaseEuler_dragModels_WenYu_H +#define Foam_multiphaseEuler_dragModels_WenYu_H #include "dragModel.H" @@ -56,6 +57,8 @@ SourceFiles namespace Foam { +namespace multiphaseEuler +{ namespace dragModels { @@ -98,6 +101,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace dragModels +} // End namespace multiphaseEuler } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.C index 2a96058f9e..c54bf672b8 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.C +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011 OpenFOAM Foundation - Copyright (C) 2020 OpenCFD Ltd. + Copyright (C) 2020-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -33,6 +33,8 @@ License namespace Foam { +namespace multiphaseEuler +{ namespace dragModels { defineTypeNameAndDebug(blended, 0); @@ -45,11 +47,12 @@ namespace dragModels ); } } +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::dragModels::blended::blended +Foam::multiphaseEuler::dragModels::blended::blended ( const dictionary& interfaceDict, const phaseModel& phase1, @@ -64,7 +67,7 @@ Foam::dragModels::blended::blended // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::tmp Foam::dragModels::blended::K +Foam::tmp Foam::multiphaseEuler::dragModels::blended::K ( const volScalarField& Ur ) const diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.H index 2557bab0e6..aa39a18663 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.H +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011 OpenFOAM Foundation - Copyright (C) 2020 OpenCFD Ltd. + Copyright (C) 2020-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -25,7 +25,7 @@ License along with OpenFOAM. If not, see . Class - Foam::dragModels::blended + Foam::multiphaseEuler::dragModels::blended Description Blends two drag models based on the phase fractions to handle @@ -36,8 +36,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef blended_H -#define blended_H +#ifndef Foam_multiphaseEuler_dragModels_blended_H +#define Foam_multiphaseEuler_dragModels_blended_H #include "dragModel.H" @@ -45,6 +45,8 @@ SourceFiles namespace Foam { +namespace multiphaseEuler +{ namespace dragModels { @@ -93,6 +95,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace dragModels +} // End namespace multiphaseEuler } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C index 026152379b..29ad59478c 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011 OpenFOAM Foundation - Copyright (C) 2019-2021 OpenCFD Ltd. + Copyright (C) 2019-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -31,15 +31,18 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam +{ +namespace multiphaseEuler { defineTypeNameAndDebug(dragModel, 0); defineRunTimeSelectionTable(dragModel, dictionary); } +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::dragModel::dragModel +Foam::multiphaseEuler::dragModel::dragModel ( const dictionary& dict, const phaseModel& phase1, @@ -56,7 +59,8 @@ Foam::dragModel::dragModel // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr Foam::dragModel::New +Foam::autoPtr +Foam::multiphaseEuler::dragModel::New ( const dictionary& dict, const phaseModel& phase1, diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H index a3b2365e5f..54c21a876d 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2015 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -24,7 +25,7 @@ License along with OpenFOAM. If not, see . Class - Foam::dragModel + Foam::multiphaseEuler::dragModel Description @@ -33,8 +34,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef dragModel_H -#define dragModel_H +#ifndef Foam_multiphaseEuler_dragModel_H +#define Foam_multiphaseEuler_dragModel_H // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -44,6 +45,8 @@ SourceFiles namespace Foam { +namespace multiphaseEuler +{ /*---------------------------------------------------------------------------*\ Class dragModel Declaration @@ -144,6 +147,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +} // End namespace multiphaseEuler } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.C index f26752e827..24f6c4afb2 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.C +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011 OpenFOAM Foundation - Copyright (C) 2020 OpenCFD Ltd. + Copyright (C) 2020-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -33,6 +33,8 @@ License namespace Foam { +namespace multiphaseEuler +{ namespace dragModels { defineTypeNameAndDebug(interface, 0); @@ -45,11 +47,12 @@ namespace dragModels ); } } +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::dragModels::interface::interface +Foam::multiphaseEuler::dragModels::interface::interface ( const dictionary& interfaceDict, const phaseModel& phase1, @@ -62,7 +65,7 @@ Foam::dragModels::interface::interface // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::tmp Foam::dragModels::interface::K +Foam::tmp Foam::multiphaseEuler::dragModels::interface::K ( const volScalarField& Ur ) const diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.H index 097a81b792..0687db8b57 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.H +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -24,7 +25,7 @@ License along with OpenFOAM. If not, see . Class - Foam::dragModels::interface + Foam::multiphaseEuler::dragModels::interface Description Drag between phase separated by a VoF resolved interface. @@ -34,8 +35,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef interface_H -#define interface_H +#ifndef Foam_multiphaseEuler_dragModels_interface_H +#define Foam_multiphaseEuler_dragModels_interface_H #include "dragModel.H" @@ -43,6 +44,8 @@ SourceFiles namespace Foam { +namespace multiphaseEuler +{ namespace dragModels { @@ -85,6 +88,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace dragModels +} // End namespace multiphaseEuler } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C index 82a5be7b0a..c8b1c26167 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2012 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -32,6 +33,8 @@ License namespace Foam { +namespace multiphaseEuler +{ namespace heatTransferModels { defineTypeNameAndDebug(RanzMarshall, 0); @@ -44,11 +47,12 @@ namespace heatTransferModels ); } } +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::heatTransferModels::RanzMarshall::RanzMarshall +Foam::multiphaseEuler::heatTransferModels::RanzMarshall::RanzMarshall ( const dictionary& interfaceDict, const volScalarField& alpha1, @@ -62,13 +66,14 @@ Foam::heatTransferModels::RanzMarshall::RanzMarshall // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::heatTransferModels::RanzMarshall::~RanzMarshall() +Foam::multiphaseEuler::heatTransferModels::RanzMarshall::~RanzMarshall() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::tmp Foam::heatTransferModels::RanzMarshall::K +Foam::tmp +Foam::multiphaseEuler::heatTransferModels::RanzMarshall::K ( const volScalarField& Ur ) const diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H index 8c88fbc33c..85dbef3580 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2012 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -24,7 +25,7 @@ License along with OpenFOAM. If not, see . Class - Foam::heatTransferModels::RanzMarshall + Foam::multiphaseEuler::heatTransferModels::RanzMarshall Description @@ -33,8 +34,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef RanzMarshall_H -#define RanzMarshall_H +#ifndef Foam_multiphaseEuler_heatTransferModels_RanzMarshall_H +#define Foam_multiphaseEuler_heatTransferModels_RanzMarshall_H #include "heatTransferModel.H" @@ -42,6 +43,8 @@ SourceFiles namespace Foam { +namespace multiphaseEuler +{ namespace heatTransferModels { @@ -85,6 +88,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace heatTransferModels +} // End namespace multiphaseEuler } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C index 44b8e6928d..4a310001b7 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2012 OpenFOAM Foundation - Copyright (C) 2019-2021 OpenCFD Ltd. + Copyright (C) 2019-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -31,15 +31,18 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam +{ +namespace multiphaseEuler { defineTypeNameAndDebug(heatTransferModel, 0); defineRunTimeSelectionTable(heatTransferModel, dictionary); } +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::heatTransferModel::heatTransferModel +Foam::multiphaseEuler::heatTransferModel::heatTransferModel ( const dictionary& dict, const volScalarField& alpha1, @@ -56,7 +59,8 @@ Foam::heatTransferModel::heatTransferModel // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr Foam::heatTransferModel::New +Foam::autoPtr +Foam::multiphaseEuler::heatTransferModel::New ( const dictionary& dict, const volScalarField& alpha1, diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H index fc94fb69d0..f1e8cb7c27 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2015 OpenFOAM Foundation - Copyright (C) 2020 OpenCFD Ltd. + Copyright (C) 2020-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -25,7 +25,7 @@ License along with OpenFOAM. If not, see . Class - Foam::heatTransferModel + Foam::multiphaseEuler::heatTransferModel Description @@ -35,8 +35,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef heatTransferModel_H -#define heatTransferModel_H +#ifndef Foam_multiphaseEuler_heatTransferModel_H +#define Foam_multiphaseEuler_heatTransferModel_H // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -46,6 +46,8 @@ SourceFiles namespace Foam { +namespace multiphaseEuler +{ /*---------------------------------------------------------------------------*\ Class heatTransferModel Declaration @@ -129,6 +131,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +} // End namespace multiphaseEuler } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C index 4af3fb9467..7d17da77eb 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2018 OpenFOAM Foundation - Copyright (C) 2020 OpenCFD Ltd. + Copyright (C) 2020-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -251,10 +251,22 @@ void Foam::multiphaseSystem::correctContactAngle forAll(boundary, patchi) { - if (isA(gbf[patchi])) + if + ( + isA + ( + gbf[patchi] + ) + ) { - const alphaContactAngleFvPatchScalarField& acap = - refCast(gbf[patchi]); + const auto& acap = + refCast + < + const multiphaseEuler::alphaContactAngleFvPatchScalarField + > + ( + gbf[patchi] + ); vectorField& nHatPatch = nHatb[patchi]; @@ -414,7 +426,7 @@ Foam::multiphaseSystem::multiphaseSystem dragModels_.set ( iter.key(), - dragModel::New + multiphaseEuler::dragModel::New ( iter(), *phases_.lookup(iter.key().first()), @@ -645,7 +657,7 @@ Foam::multiphaseSystem::dragCoeffs() const forAllConstIters(dragModels_, iter) { - const dragModel& dm = *iter(); + const multiphaseEuler::dragModel& dm = *iter(); volScalarField* Kptr = ( diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.H index 632b2bdeb0..aa57169149 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.H +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019-2021 OpenCFD Ltd. + Copyright (C) 2019-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -42,8 +42,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef multiphaseSystem_H -#define multiphaseSystem_H +#ifndef Foam_multiphaseEuler_multiphaseSystem_H +#define Foam_multiphaseEuler_multiphaseSystem_H #include "incompressible/transportModel/transportModel.H" #include "IOdictionary.H" @@ -121,8 +121,11 @@ public: }; - typedef HashPtrTable - dragModelTable; + typedef + HashPtrTable + < + multiphaseEuler::dragModel, interfacePair, interfacePair::symmHash + > dragModelTable; typedef HashPtrTable dragCoeffFields; diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/phaseModel/phaseModel.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/phaseModel/phaseModel.C index 4b5af03e9f..efe44cab08 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/phaseModel/phaseModel.C +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/phaseModel/phaseModel.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -188,7 +189,7 @@ Foam::phaseModel::phaseModel ); } - dPtr_ = diameterModel::New + dPtr_ = multiphaseEuler::diameterModel::New ( phaseDict_, *this diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/phaseModel/phaseModel.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/phaseModel/phaseModel.H index 4da109e736..66379ce290 100644 --- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/phaseModel/phaseModel.H +++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/phaseModel/phaseModel.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation + Copyright (C) 2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -31,8 +32,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef phaseModel_H -#define phaseModel_H +#ifndef Foam_multiphaseEuler_phaseModel_H +#define Foam_multiphaseEuler_phaseModel_H #include "dictionary.H" #include "dictionaryEntry.H" @@ -45,8 +46,11 @@ SourceFiles namespace Foam { +namespace multiphaseEuler +{ // Forward declarations class diameterModel; +} /*---------------------------------------------------------------------------*\ Class phaseModel Declaration @@ -88,7 +92,7 @@ class phaseModel autoPtr phiPtr_; //- Diameter model - autoPtr dPtr_; + autoPtr dPtr_; public: diff --git a/src/phaseSystemModels/multiphaseInter/compressibleMultiPhaseTurbulenceModels/compressibleMultiPhaseTurbulenceModels.C b/src/phaseSystemModels/multiphaseInter/compressibleMultiPhaseTurbulenceModels/compressibleMultiPhaseTurbulenceModels.C index a53f543289..b5abbaa5f2 100644 --- a/src/phaseSystemModels/multiphaseInter/compressibleMultiPhaseTurbulenceModels/compressibleMultiPhaseTurbulenceModels.C +++ b/src/phaseSystemModels/multiphaseInter/compressibleMultiPhaseTurbulenceModels/compressibleMultiPhaseTurbulenceModels.C @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2017 OpenCFD Ltd + Copyright (C) 2017-2022 OpenCFD Ltd ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -37,6 +37,8 @@ License #include "RASModel.H" #include "LESModel.H" +using namespace Foam::multiphaseInter; + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // defineTurbulenceModelTypes diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.C index 6fef82db2b..6215e5700d 100644 --- a/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.C +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.C @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2017 OpenCFD Ltd. + Copyright (C) 2017-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -33,6 +33,8 @@ License #include "rhoThermo.H" #include "zeroGradientFvPatchFields.H" +using namespace Foam::multiphaseInter; + // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // template diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.H index 8f70f06ed5..0c13f932e9 100644 --- a/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.H +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.H @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2017 OpenCFD Ltd. + Copyright (C) 2017-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -45,6 +45,8 @@ SourceFiles namespace Foam { +using namespace multiphaseInter; + // Forward Declarations class phaseModel; class phasePair; @@ -132,7 +134,7 @@ public: InterfaceCompositionModel(const dictionary& dict, const phasePair& pair); //- Destructor - ~InterfaceCompositionModel() = default; + virtual ~InterfaceCompositionModel() = default; // Member Functions diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/files b/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/files index e7b4689ac9..304b0439c4 100644 --- a/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/files +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/files @@ -5,7 +5,7 @@ phasePair/phasePair.C phasePair/phasePairKey.C phasePair/orderedPhasePair.C -phaseSystem/phaseSystem.C +multiphaseInterSystem/multiphaseInterSystem.C multiphaseSystem/multiphaseSystem.C multiphaseSystem/multiphaseSystemNew.C diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C index 2f027a0de4..5de5b50e70 100644 --- a/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2017-2020 OpenCFD Ltd. + Copyright (C) 2017-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -33,6 +33,8 @@ License #include "volFields.H" #include "fundamentalConstants.H" +using namespace Foam::multiphaseInter; + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.H index 71498129f8..8a10abbad8 100644 --- a/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.H +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.H @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2017-2020 OpenCFD Ltd. + Copyright (C) 2017-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -34,10 +34,10 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef MassTransferPhaseSystem_H -#define MassTransferPhaseSystem_H +#ifndef Foam_multiphaseInter_MassTransferPhaseSystem_H +#define Foam_multiphaseInter_MassTransferPhaseSystem_H -#include "phaseSystem.H" +#include "multiphaseInterSystem.H" #include "HashPtrTable.H" #include "interfaceCompositionModel.H" @@ -46,6 +46,8 @@ SourceFiles namespace Foam { +using namespace multiphaseInter; + /*---------------------------------------------------------------------------*\ Class MassTransferPhaseSystem Declaration \*---------------------------------------------------------------------------*/ @@ -144,7 +146,7 @@ public: //- Calculate mass transfer for species virtual void massSpeciesTransfer ( - const phaseModel& phase, + const Foam::phaseModel& phase, volScalarField::Internal& Su, volScalarField::Internal& Sp, const word speciesName diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.C index c347594f0b..d457dff344 100644 --- a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.C +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.C @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2017-2021 OpenCFD Ltd. + Copyright (C) 2017-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -32,14 +32,19 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam +{ +namespace multiphaseInter { defineTypeNameAndDebug(interfaceCompositionModel, 0); defineRunTimeSelectionTable(interfaceCompositionModel, dictionary); } +} - -const Foam::Enum -Foam::interfaceCompositionModel::modelVariableNames_ +const Foam::Enum +< + Foam::multiphaseInter::interfaceCompositionModel::modelVariable +> +Foam::multiphaseInter::interfaceCompositionModel::modelVariableNames_ { { modelVariable::T, "temperature" }, { modelVariable::P, "pressure" }, @@ -50,7 +55,7 @@ Foam::interfaceCompositionModel::modelVariableNames_ // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::interfaceCompositionModel::interfaceCompositionModel +Foam::multiphaseInter::interfaceCompositionModel::interfaceCompositionModel ( const dictionary& dict, const phasePair& pair @@ -74,8 +79,8 @@ Foam::interfaceCompositionModel::interfaceCompositionModel // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr -Foam::interfaceCompositionModel::New +Foam::autoPtr +Foam::multiphaseInter::interfaceCompositionModel::New ( const dictionary& dict, const phasePair& pair @@ -113,31 +118,42 @@ Foam::interfaceCompositionModel::New // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -const Foam::word Foam::interfaceCompositionModel::transferSpecie() const +const Foam::word Foam::multiphaseInter::interfaceCompositionModel +::transferSpecie() const { return speciesName_; } -const Foam::phasePair& Foam::interfaceCompositionModel::pair() const +const Foam::phasePair& Foam::multiphaseInter::interfaceCompositionModel +::pair() const { return pair_; } -const Foam::word& Foam::interfaceCompositionModel::variable() const +const Foam::multiphaseInterSystem& Foam::multiphaseInter +::interfaceCompositionModel::fluid() const +{ + return pair().to().fluid(); +} + + +const Foam::word& Foam::multiphaseInter::interfaceCompositionModel +::variable() const { return modelVariableNames_[modelVariable_]; } -bool Foam::interfaceCompositionModel::includeDivU() const noexcept +bool Foam::multiphaseInter::interfaceCompositionModel::includeDivU() +const noexcept { return true; } -bool Foam::interfaceCompositionModel::includeVolChange() +bool Foam::multiphaseInter::interfaceCompositionModel::includeVolChange() { return includeVolChange_; } diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.H index ae99c70404..6ec0b582e9 100644 --- a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.H +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.H @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2017-2021 OpenCFD Ltd. + Copyright (C) 2017-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -50,9 +50,14 @@ namespace Foam { // Forward Declarations -class phaseModel; class phasePair; +namespace multiphaseInter +{ + +// Forward Declarations +class phaseModel; + /*---------------------------------------------------------------------------*\ Class interfaceCompositionModel Declaration \*---------------------------------------------------------------------------*/ @@ -212,6 +217,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace Foam +} // End multiphaseInter // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.C similarity index 77% rename from src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.C index a4d0230bdc..dbe7501a11 100644 --- a/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.C +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.C @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2017-2021 OpenCFD Ltd. + Copyright (C) 2017-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -25,7 +25,7 @@ License \*---------------------------------------------------------------------------*/ -#include "phaseSystem.H" +#include "multiphaseInterSystem.H" #include "surfaceTensionModel.H" #include "porousModel.H" @@ -46,23 +46,27 @@ License namespace Foam { - defineTypeNameAndDebug(phaseSystem, 0); + defineTypeNameAndDebug(multiphaseInterSystem, 0); } /* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */ -const Foam::word Foam::phaseSystem::phasePropertiesName("phaseProperties"); +const Foam::word +Foam::multiphaseInterSystem::phasePropertiesName("phaseProperties"); // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -void Foam::phaseSystem::calcMu() +void Foam::multiphaseInterSystem::calcMu() { mu_ = mu()(); } -Foam::phaseSystem::phaseModelTable -Foam::phaseSystem::generatePhaseModels(const wordList& phaseNames) const +Foam::multiphaseInterSystem::phaseModelTable +Foam::multiphaseInterSystem::generatePhaseModels +( + const wordList& phaseNames +) const { phaseModelTable phaseModels; @@ -71,7 +75,7 @@ Foam::phaseSystem::generatePhaseModels(const wordList& phaseNames) const phaseModels.insert ( phaseName, - phaseModel::New + multiphaseInter::phaseModel::New ( *this, phaseName @@ -83,7 +87,7 @@ Foam::phaseSystem::generatePhaseModels(const wordList& phaseNames) const } -Foam::tmp Foam::phaseSystem::generatePhi +Foam::tmp Foam::multiphaseInterSystem::generatePhi ( const phaseModelTable& phaseModels ) const @@ -105,7 +109,7 @@ Foam::tmp Foam::phaseSystem::generatePhi } -void Foam::phaseSystem::generatePairs(const dictTable& modelDicts) +void Foam::multiphaseInterSystem::generatePairs(const dictTable& modelDicts) { forAllConstIters(modelDicts, iter) { @@ -152,7 +156,7 @@ void Foam::phaseSystem::generatePairs(const dictTable& modelDicts) } -void Foam::phaseSystem::generatePairsTable() +void Foam::multiphaseInterSystem::generatePairsTable() { forAllConstIters(phaseModels_, phaseIter1) { @@ -201,7 +205,7 @@ void Foam::phaseSystem::generatePairsTable() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::phaseSystem::phaseSystem +Foam::multiphaseInterSystem::multiphaseInterSystem ( const fvMesh& mesh ) @@ -288,13 +292,13 @@ Foam::phaseSystem::phaseSystem // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::phaseSystem::~phaseSystem() +Foam::multiphaseInterSystem::~multiphaseInterSystem() {} // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -Foam::tmp Foam::phaseSystem::he +Foam::tmp Foam::multiphaseInterSystem::he ( const volScalarField& p, const volScalarField& T @@ -305,7 +309,7 @@ Foam::tmp Foam::phaseSystem::he } -Foam::tmp Foam::phaseSystem::he +Foam::tmp Foam::multiphaseInterSystem::he ( const scalarField& p, const scalarField& T, @@ -317,7 +321,7 @@ Foam::tmp Foam::phaseSystem::he } -Foam::tmp Foam::phaseSystem::he +Foam::tmp Foam::multiphaseInterSystem::he ( const scalarField& p, const scalarField& T, @@ -329,7 +333,7 @@ Foam::tmp Foam::phaseSystem::he } -Foam::tmp Foam::phaseSystem::hc() const +Foam::tmp Foam::multiphaseInterSystem::hc() const { auto iter = phaseModels_.cbegin(); @@ -347,7 +351,7 @@ Foam::tmp Foam::phaseSystem::hc() const } -Foam::tmp Foam::phaseSystem::THE +Foam::tmp Foam::multiphaseInterSystem::THE ( const scalarField& e, const scalarField& p, @@ -360,7 +364,7 @@ Foam::tmp Foam::phaseSystem::THE } -Foam::tmp Foam::phaseSystem::THE +Foam::tmp Foam::multiphaseInterSystem::THE ( const scalarField& e, const scalarField& p, @@ -373,7 +377,7 @@ Foam::tmp Foam::phaseSystem::THE } -Foam::tmp Foam::phaseSystem::rho() const +Foam::tmp Foam::multiphaseInterSystem::rho() const { auto iter = phaseModels_.cbegin(); @@ -391,7 +395,10 @@ Foam::tmp Foam::phaseSystem::rho() const } -Foam::tmp Foam::phaseSystem::rho(const label patchI) const +Foam::tmp Foam::multiphaseInterSystem::rho +( + const label patchI +) const { auto iter = phaseModels_.cbegin(); @@ -414,7 +421,7 @@ Foam::tmp Foam::phaseSystem::rho(const label patchI) const } -Foam::tmp Foam::phaseSystem::Cp() const +Foam::tmp Foam::multiphaseInterSystem::Cp() const { auto iter = phaseModels_.cbegin(); @@ -432,7 +439,7 @@ Foam::tmp Foam::phaseSystem::Cp() const } -Foam::tmp Foam::phaseSystem::Cp +Foam::tmp Foam::multiphaseInterSystem::Cp ( const scalarField& p, const scalarField& T, @@ -455,7 +462,7 @@ Foam::tmp Foam::phaseSystem::Cp } -Foam::tmp Foam::phaseSystem::Cv() const +Foam::tmp Foam::multiphaseInterSystem::Cv() const { auto iter = phaseModels_.cbegin(); @@ -473,7 +480,7 @@ Foam::tmp Foam::phaseSystem::Cv() const } -Foam::tmp Foam::phaseSystem::Cv +Foam::tmp Foam::multiphaseInterSystem::Cv ( const scalarField& p, const scalarField& T, @@ -496,7 +503,7 @@ Foam::tmp Foam::phaseSystem::Cv } -Foam::tmp Foam::phaseSystem::rhoEoS +Foam::tmp Foam::multiphaseInterSystem::rhoEoS ( const scalarField& p, const scalarField& T, @@ -508,7 +515,7 @@ Foam::tmp Foam::phaseSystem::rhoEoS } -Foam::tmp Foam::phaseSystem::gamma() const +Foam::tmp Foam::multiphaseInterSystem::gamma() const { auto iter = phaseModels_.cbegin(); @@ -532,7 +539,7 @@ Foam::tmp Foam::phaseSystem::gamma() const } -Foam::tmp Foam::phaseSystem::gamma +Foam::tmp Foam::multiphaseInterSystem::gamma ( const scalarField& p, const scalarField& T, @@ -546,7 +553,7 @@ Foam::tmp Foam::phaseSystem::gamma } -Foam::tmp Foam::phaseSystem::Cpv() const +Foam::tmp Foam::multiphaseInterSystem::Cpv() const { auto iter = phaseModels_.cbegin(); @@ -564,7 +571,7 @@ Foam::tmp Foam::phaseSystem::Cpv() const } -Foam::tmp Foam::phaseSystem::Cpv +Foam::tmp Foam::multiphaseInterSystem::Cpv ( const scalarField& p, const scalarField& T, @@ -587,7 +594,7 @@ Foam::tmp Foam::phaseSystem::Cpv } -Foam::tmp Foam::phaseSystem::CpByCpv() const +Foam::tmp Foam::multiphaseInterSystem::CpByCpv() const { auto iter = phaseModels_.cbegin(); @@ -605,7 +612,7 @@ Foam::tmp Foam::phaseSystem::CpByCpv() const } -Foam::tmp Foam::phaseSystem::CpByCpv +Foam::tmp Foam::multiphaseInterSystem::CpByCpv ( const scalarField& p, const scalarField& T, @@ -633,14 +640,14 @@ Foam::tmp Foam::phaseSystem::CpByCpv } -Foam::tmp Foam::phaseSystem::W() const +Foam::tmp Foam::multiphaseInterSystem::W() const { NotImplemented; return nullptr; } -Foam::tmp Foam::phaseSystem::kappa() const +Foam::tmp Foam::multiphaseInterSystem::kappa() const { auto iter = phaseModels_.cbegin(); @@ -658,7 +665,10 @@ Foam::tmp Foam::phaseSystem::kappa() const } -Foam::tmp Foam::phaseSystem::kappa(const label patchI) const +Foam::tmp Foam::multiphaseInterSystem::kappa +( + const label patchI +) const { auto iter = phaseModels_.cbegin(); @@ -681,7 +691,7 @@ Foam::tmp Foam::phaseSystem::kappa(const label patchI) const } -Foam::tmp Foam::phaseSystem::alphahe() const +Foam::tmp Foam::multiphaseInterSystem::alphahe() const { phaseModelTable::const_iterator phaseModelIter = phaseModels_.begin(); @@ -699,7 +709,7 @@ Foam::tmp Foam::phaseSystem::alphahe() const } -Foam::tmp Foam::phaseSystem::alphahe +Foam::tmp Foam::multiphaseInterSystem::alphahe ( const label patchi ) const @@ -723,7 +733,7 @@ Foam::tmp Foam::phaseSystem::alphahe } -Foam::tmpFoam::phaseSystem::kappaEff +Foam::tmpFoam::multiphaseInterSystem::kappaEff ( const volScalarField& kappat ) const @@ -734,7 +744,7 @@ Foam::tmpFoam::phaseSystem::kappaEff } -Foam::tmp Foam::phaseSystem::kappaEff +Foam::tmp Foam::multiphaseInterSystem::kappaEff ( const scalarField& kappat, const label patchI @@ -744,7 +754,7 @@ Foam::tmp Foam::phaseSystem::kappaEff } -Foam::tmp Foam::phaseSystem::alphaEff +Foam::tmp Foam::multiphaseInterSystem::alphaEff ( const volScalarField& alphat ) const @@ -767,7 +777,7 @@ Foam::tmp Foam::phaseSystem::alphaEff } -Foam::tmp Foam::phaseSystem::alphaEff +Foam::tmp Foam::multiphaseInterSystem::alphaEff ( const scalarField& alphat, const label patchI @@ -796,13 +806,13 @@ Foam::tmp Foam::phaseSystem::alphaEff } -const Foam::dimensionedScalar& Foam::phaseSystem::Prt() const +const Foam::dimensionedScalar& Foam::multiphaseInterSystem::Prt() const { return Prt_; } -Foam::tmp Foam::phaseSystem::mu() const +Foam::tmp Foam::multiphaseInterSystem::mu() const { auto iter = phaseModels_.cbegin(); @@ -820,7 +830,10 @@ Foam::tmp Foam::phaseSystem::mu() const } -Foam::tmp Foam::phaseSystem::mu(const label patchI) const +Foam::tmp Foam::multiphaseInterSystem::mu +( + const label patchI +) const { auto iter = phaseModels_.cbegin(); @@ -843,7 +856,7 @@ Foam::tmp Foam::phaseSystem::mu(const label patchI) const } -Foam::tmp Foam::phaseSystem::nu() const +Foam::tmp Foam::multiphaseInterSystem::nu() const { auto iter = phaseModels_.cbegin(); @@ -861,7 +874,10 @@ Foam::tmp Foam::phaseSystem::nu() const } -Foam::tmp Foam::phaseSystem::nu(const label patchI) const +Foam::tmp Foam::multiphaseInterSystem::nu +( + const label patchI +) const { auto iter = phaseModels_.cbegin(); @@ -884,31 +900,82 @@ Foam::tmp Foam::phaseSystem::nu(const label patchI) const } -const Foam::surfaceScalarField& Foam::phaseSystem::phi() const +Foam::tmp Foam::multiphaseInterSystem::mut() const +{ + return turb_->mut(); +} + + +Foam::tmp Foam::multiphaseInterSystem::muEff() const +{ + return turb_->muEff(); +} + + +Foam::tmp Foam::multiphaseInterSystem::nut() const +{ + return turb_->nut(); +} + + +Foam::tmp Foam::multiphaseInterSystem::nuEff() const +{ + return turb_->nuEff(); +} + + +Foam::tmp Foam::multiphaseInterSystem::kappaEff() const +{ + return(this->kappa() + this->Cp()*turb_->mut()/Prt_); +} + + +Foam::tmp +Foam::multiphaseInterSystem::kappaEff(const label patchi) const +{ + tmp tCp(this->Cp()().boundaryField()[patchi]); + return this->kappa(patchi) + tCp()*turb_->mut(patchi)/Prt_.value(); +} + + +Foam::tmp Foam::multiphaseInterSystem::alphaEff() const +{ + return this->alpha() + turb_->mut()/Prt_; +} + + +Foam::tmp +Foam::multiphaseInterSystem::alphaEff(const label patchi) const +{ + return (this->alpha(patchi) + turb_->mut(patchi))/Prt_.value(); +} + + +const Foam::surfaceScalarField& Foam::multiphaseInterSystem::phi() const { return phi_; } -Foam::surfaceScalarField& Foam::phaseSystem::phi() +Foam::surfaceScalarField& Foam::multiphaseInterSystem::phi() { return phi_; } -const Foam::surfaceScalarField& Foam::phaseSystem::rhoPhi() const +const Foam::surfaceScalarField& Foam::multiphaseInterSystem::rhoPhi() const { return rhoPhi_; } -Foam::surfaceScalarField& Foam::phaseSystem::rhoPhi() +Foam::surfaceScalarField& Foam::multiphaseInterSystem::rhoPhi() { return rhoPhi_; } -void Foam::phaseSystem::correct() +void Foam::multiphaseInterSystem::correct() { forAllIters(phaseModels_, iter) { @@ -919,7 +986,7 @@ void Foam::phaseSystem::correct() } -void Foam::phaseSystem::correctTurbulence() +void Foam::multiphaseInterSystem::correctTurbulence() { forAllIters(phaseModels_, iter) { @@ -928,32 +995,35 @@ void Foam::phaseSystem::correctTurbulence() } -const Foam::phaseSystem::phaseModelTable& Foam::phaseSystem::phases() const +const Foam::multiphaseInterSystem::phaseModelTable& +Foam::multiphaseInterSystem::phases() const { return phaseModels_; } -Foam::phaseSystem::phaseModelTable& Foam::phaseSystem::phases() +Foam::multiphaseInterSystem::phaseModelTable& +Foam::multiphaseInterSystem::phases() { return phaseModels_; } -const Foam::phaseSystem::phasePairTable& -Foam::phaseSystem::totalPhasePairs() const +const Foam::multiphaseInterSystem::phasePairTable& +Foam::multiphaseInterSystem::totalPhasePairs() const { return totalPhasePairs_; } -Foam::phaseSystem::phasePairTable& Foam::phaseSystem::totalPhasePairs() +Foam::multiphaseInterSystem::phasePairTable& +Foam::multiphaseInterSystem::totalPhasePairs() { return totalPhasePairs_; } -bool Foam::phaseSystem::incompressible() const +bool Foam::multiphaseInterSystem::incompressible() const { forAllConstIters(phaseModels_, iter) { @@ -967,13 +1037,13 @@ bool Foam::phaseSystem::incompressible() const } -bool Foam::phaseSystem::incompressible(const word phaseName) const +bool Foam::multiphaseInterSystem::incompressible(const word phaseName) const { return phaseModels_[phaseName]->thermo().incompressible(); } -bool Foam::phaseSystem::isochoric() const +bool Foam::multiphaseInterSystem::isochoric() const { forAllConstIters(phaseModels_, iter) { @@ -987,14 +1057,14 @@ bool Foam::phaseSystem::isochoric() const } -const Foam::fvMesh& Foam::phaseSystem::mesh() const +const Foam::fvMesh& Foam::multiphaseInterSystem::mesh() const { return mesh_; } Foam::tmp -Foam::phaseSystem::surfaceTensionForce() const +Foam::multiphaseInterSystem::surfaceTensionForce() const { auto tstf = tmp::New ( @@ -1044,7 +1114,7 @@ Foam::phaseSystem::surfaceTensionForce() const } -Foam::tmp Foam::phaseSystem::U() const +Foam::tmp Foam::multiphaseInterSystem::U() const { auto tstf = tmp::New ( @@ -1070,13 +1140,13 @@ Foam::tmp Foam::phaseSystem::U() const Foam::tmp -Foam::phaseSystem::surfaceTensionCoeff(const phasePairKey& key) const +Foam::multiphaseInterSystem::surfaceTensionCoeff(const phasePairKey& key) const { return surfaceTensionModels_[key]->sigma(); } -Foam::tmp Foam::phaseSystem::coeffs +Foam::tmp Foam::multiphaseInterSystem::coeffs ( const word& key ) const @@ -1085,14 +1155,14 @@ Foam::tmp Foam::phaseSystem::coeffs } -void Foam::phaseSystem::addInterfacePorosity(fvVectorMatrix& UEqn) +void Foam::multiphaseInterSystem::addInterfacePorosity(fvVectorMatrix& UEqn) { const scalarField& Vc = mesh_.V(); scalarField& Udiag = UEqn.diag(); forAllConstIters(phaseModels_, iteri) { - const phaseModel& phasei = iteri()(); + const multiphaseInter::phaseModel& phasei = iteri()(); auto iterk = iteri; @@ -1100,7 +1170,7 @@ void Foam::phaseSystem::addInterfacePorosity(fvVectorMatrix& UEqn) { if (iteri()().name() != iterk()().name()) { - const phaseModel& phasek = iterk()(); + const multiphaseInter::phaseModel& phasek = iterk()(); // Phase i and k const phasePairKey keyik @@ -1123,7 +1193,7 @@ void Foam::phaseSystem::addInterfacePorosity(fvVectorMatrix& UEqn) } -Foam::tmp Foam::phaseSystem::K +Foam::tmp Foam::multiphaseInterSystem::K ( const volScalarField& alpha1, const volScalarField& alpha2 @@ -1136,7 +1206,7 @@ Foam::tmp Foam::phaseSystem::K } -Foam::tmp Foam::phaseSystem::nearInterface +Foam::tmp Foam::multiphaseInterSystem::nearInterface ( const volScalarField& alpha1, const volScalarField& alpha2 @@ -1150,7 +1220,8 @@ Foam::tmp Foam::phaseSystem::nearInterface } -Foam::tmp Foam::phaseSystem::nearInterface() const +Foam::tmp +Foam::multiphaseInterSystem::nearInterface() const { auto tnearInt = tmp::New ( @@ -1188,7 +1259,7 @@ Foam::tmp Foam::phaseSystem::nearInterface() const } -Foam::tmp Foam::phaseSystem::nHatfv +Foam::tmp Foam::multiphaseInterSystem::nHatfv ( const volScalarField& alpha1, const volScalarField& alpha2 @@ -1212,7 +1283,7 @@ Foam::tmp Foam::phaseSystem::nHatfv } -Foam::tmp Foam::phaseSystem::nHatf +Foam::tmp Foam::multiphaseInterSystem::nHatf ( const volScalarField& alpha1, const volScalarField& alpha2 @@ -1223,7 +1294,7 @@ Foam::tmp Foam::phaseSystem::nHatf } -bool Foam::phaseSystem::read() +bool Foam::multiphaseInterSystem::read() { if (regIOobject::read()) { diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.H similarity index 88% rename from src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.H index c6a30787cb..899058d569 100644 --- a/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.H +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.H @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2017-2021 OpenCFD Ltd. + Copyright (C) 2017-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -24,17 +24,17 @@ License along with OpenFOAM. If not, see . Class - Foam::phaseSystem + Foam::multiphaseInterSystem Description SourceFiles - phaseSystem.C + multiphaseInterSystem.C \*---------------------------------------------------------------------------*/ -#ifndef phaseSystem_H -#define phaseSystem_H +#ifndef multiphaseInterSystem_H +#define multiphaseInterSystem_H #include "basicThermo.H" @@ -48,6 +48,8 @@ SourceFiles #include "compressibleTransportModel.H" #include "localMin.H" +#include "compressibleTurbulenceModel.H" + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam @@ -61,10 +63,10 @@ class surfaceTensionModel; class porousModel; /*---------------------------------------------------------------------------*\ - Class phaseSystem Declaration + Class multiphaseInterSystem Declaration \*---------------------------------------------------------------------------*/ -class phaseSystem +class multiphaseInterSystem : public basicThermo, public compressibleTransportModel @@ -81,7 +83,7 @@ public: phasePairTable; - typedef HashTable> phaseModelTable; + typedef HashTable> phaseModelTable; typedef HashTable SuSpTable; @@ -145,6 +147,9 @@ protected: //- Turbulent Prandt number dimensionedScalar Prt_; + //- Turbulence model + compressibleTurbulenceModel* turb_; + // Sub Models @@ -162,7 +167,7 @@ protected: void calcMu(); //- Generate the phases - HashTable> generatePhaseModels + HashTable> generatePhaseModels ( const wordList& names ) const; @@ -170,7 +175,7 @@ protected: //- Generate the mixture flux tmp generatePhi ( - const HashTable>& phaseModels + const HashTable>& phaseModels ) const; //- Generate pairs @@ -252,7 +257,7 @@ protected: public: //- Runtime type information - TypeName("phaseSystem"); + TypeName("multiphaseInterSystem"); //- Default name of the phase properties dictionary static const word phasePropertiesName; @@ -261,13 +266,15 @@ public: // Constructors //- Construct from fvMesh - phaseSystem(const fvMesh& mesh); + multiphaseInterSystem(const fvMesh& mesh); //- Destructor - virtual ~phaseSystem(); + virtual ~multiphaseInterSystem(); + // Member Functions + // Energy related thermo functionaliy functions //- Return access to the internal energy field [J/Kg] @@ -484,6 +491,47 @@ public: virtual tmp nu(const label patchi) const; + // Turbulence + + //- Set turbulence model + void setTurbulence(compressibleTurbulenceModel& turb) + { + turb_ = &turb; + } + + //- Return pointer to turbulence model + compressibleTurbulenceModel* turbulence() const + { + return turb_; + } + + //- Return the turbulent dynamic viscosity + tmp mut() const; + + //- Return the effective dynamic viscosity + tmp muEff() const; + + //- Return the turbulent kinematic viscosity + tmp nut() const; + + //- Return the effective kinematic viscosity + tmp nuEff() const; + + //- Effective thermal turbulent diffusivity for temperature + // of mixture [J/m/s/K] + tmp kappaEff() const; + + //- Effective thermal turbulent diffusivity for temperature + // of mixture for patch [J/m/s/K] + tmp kappaEff(const label patchi) const; + + //- Effective thermal turbulent diffusivity of mixture [kg/m/s] + tmp alphaEff() const; + + //- Effective thermal turbulent diffusivity of mixture [kg/m/s] + tmp alphaEff(const label patchi) const; + + // Phase fluxes //- Constant access to the total flux @@ -547,7 +595,7 @@ public: //- Calculate mass transfer for species virtual void massSpeciesTransfer ( - const phaseModel& phase, + const multiphaseInter::phaseModel& phase, volScalarField::Internal& Su, volScalarField::Internal& Sp, const word speciesName @@ -605,8 +653,8 @@ public: template const modelType& lookupSubModel ( - const phaseModel& from, - const phaseModel& to + const multiphaseInter::phaseModel& from, + const multiphaseInter::phaseModel& to ) const; @@ -672,7 +720,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "phaseSystemTemplates.H" +# include "multiphaseInterSystemTemplates.H" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystemTemplates.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystemTemplates.H similarity index 88% rename from src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystemTemplates.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystemTemplates.H index 9b129e66df..0c84a95730 100644 --- a/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystemTemplates.H +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystemTemplates.H @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2017 OpenCFD Ltd. + Copyright (C) 2017-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -28,7 +28,7 @@ License // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // template -void Foam::phaseSystem::createSubModels +void Foam::multiphaseInterSystem::createSubModels ( const dictTable& modelDicts, HashTable @@ -57,7 +57,7 @@ void Foam::phaseSystem::createSubModels template -void Foam::phaseSystem::createSubModels +void Foam::multiphaseInterSystem::createSubModels ( const dictTable& modelDicts, const fvMesh& mesh, @@ -87,7 +87,7 @@ void Foam::phaseSystem::createSubModels template -void Foam::phaseSystem::generatePairsAndSubModels +void Foam::multiphaseInterSystem::generatePairsAndSubModels ( const word& modelName, HashTable @@ -107,7 +107,7 @@ void Foam::phaseSystem::generatePairsAndSubModels template -void Foam::phaseSystem::generatePairsAndSubModels +void Foam::multiphaseInterSystem::generatePairsAndSubModels ( const word& modelName, const fvMesh& mesh, @@ -128,7 +128,7 @@ void Foam::phaseSystem::generatePairsAndSubModels template -void Foam::phaseSystem::generatePairsAndSubModels +void Foam::multiphaseInterSystem::generatePairsAndSubModels ( const word& modelName, HashTable @@ -176,7 +176,10 @@ void Foam::phaseSystem::generatePairsAndSubModels template -const modelType& Foam::phaseSystem::lookupSubModel(const phasePair& key) const +const modelType& Foam::multiphaseInterSystem::lookupSubModel +( + const phasePair& key +) const { return mesh().lookupObject @@ -187,10 +190,10 @@ const modelType& Foam::phaseSystem::lookupSubModel(const phasePair& key) const template -const modelType& Foam::phaseSystem::lookupSubModel +const modelType& Foam::multiphaseInterSystem::lookupSubModel ( - const phaseModel& from, - const phaseModel& to + const multiphaseInter::phaseModel& from, + const multiphaseInter::phaseModel& to ) const { return lookupSubModel(orderedPhasePair(from, to)); diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.C index 346e4aa664..ffda1f535a 100644 --- a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.C +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.C @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2017-2020 OpenCFD Ltd. + Copyright (C) 2017-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -47,20 +47,22 @@ License // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam +{ +namespace multiphaseInter { defineTypeNameAndDebug(multiphaseSystem, 0); defineRunTimeSelectionTable(multiphaseSystem, dictionary); } - +} // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::multiphaseSystem::multiphaseSystem +Foam::multiphaseInter::multiphaseSystem::multiphaseSystem ( const fvMesh& mesh ) : - phaseSystem(mesh), + multiphaseInterSystem(mesh), cAlphas_(), ddtAlphaMax_(0.0), limitedPhiAlphas_(phaseModels_.size()), @@ -71,7 +73,7 @@ Foam::multiphaseSystem::multiphaseSystem phases_.setSize(phaseModels_.size()); forAllIters(phaseModels_, iter) { - phaseModel& pm = iter()(); + multiphaseInter::phaseModel& pm = iter()(); phases_.set(phasei++, &pm); } @@ -80,7 +82,7 @@ Foam::multiphaseSystem::multiphaseSystem // Initiate Su and Sp forAllConstIters(phaseModels_, iter) { - const phaseModel& pm = iter()(); + const multiphaseInter::phaseModel& pm = iter()(); Su_.insert ( @@ -119,13 +121,13 @@ Foam::multiphaseSystem::multiphaseSystem // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -void Foam::multiphaseSystem::calculateSuSp() +void Foam::multiphaseInter::multiphaseSystem::calculateSuSp() { this->alphaTransfer(Su_, Sp_); } -void Foam::multiphaseSystem::solve() +void Foam::multiphaseInter::multiphaseSystem::solve() { const dictionary& alphaControls = mesh_.solverDict("alpha"); label nAlphaSubCycles(alphaControls.get