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/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/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.C b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.C index b4382754a6..3961c127bd 100644 --- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.C +++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.C @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2020-2021 OpenCFD Ltd. + Copyright (C) 2020-2022 OpenCFD Ltd. Copyright (C) 2020 Henning Scheufler ------------------------------------------------------------------------------- License @@ -265,23 +265,13 @@ correct() const dimensionedScalar& TSat = thermo.TSat(); const dimensionedScalar T0(dimTemperature, Zero); - dimensionedScalar L = mixture_.Hf2() - mixture_.Hf1(); + const dimensionedScalar L(mag(mixture_.Hf2() - mixture_.Hf1())); // interface heat resistance mDotc_ = interfaceArea_*R_*max(TSat - T, T0)/L; mDote_ = interfaceArea_*R_*max(T - TSat, T0)/L; - // Limiting max condensation - forAll(mDotc_, celli) - { - scalar rhobyDt = mixture_.rho1().value()/mesh_.time().deltaTValue(); - scalar maxEvap = mixture_.alpha1()[celli]*rhobyDt; // positive - scalar maxCond = -mixture_.alpha2()[celli]*rhobyDt; // negative - mDotc_[celli] = min(max(mDotc_[celli], maxCond), maxEvap); - } - // Calculate the spread sources - dimensionedScalar D ( "D", 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/createExternalCoupledPatchGeometry/Make/options b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options index 2a75a610c1..2738cef53e 100644 --- a/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options +++ b/applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options @@ -7,4 +7,6 @@ EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ -ldynamicMesh \ - -lfieldFunctionObjects + -lfieldFunctionObjects \ + -lincompressibleMultiphaseSystems \ + -lreactingMultiphaseSystem 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..700e799fc4 100755 --- a/src/functionObjects/Allwmake +++ b/src/functionObjects/Allwmake @@ -7,9 +7,9 @@ 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 +wmake $targetType phaseSystems ./randomProcesses/Allwmake $targetType diff --git a/src/functionObjects/field/Make/files b/src/functionObjects/field/Make/files index b7c2550efb..3fd56b2f79 100644 --- a/src/functionObjects/field/Make/files +++ b/src/functionObjects/field/Make/files @@ -33,6 +33,8 @@ heatTransferCoeff/heatTransferCoeffModels/heatTransferCoeffModel/heatTransferCoe heatTransferCoeff/heatTransferCoeffModels/fixedReferenceTemperature/fixedReferenceTemperature.C heatTransferCoeff/heatTransferCoeffModels/localReferenceTemperature/localReferenceTemperature.C heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C +heatTransferCoeff/reactingEulerHtcModel/reactingEulerHtcModel.C +heatTransferCoeff/multiphaseInterHtcModel/multiphaseInterHtcModel.C limitFields/limitFields.C diff --git a/src/functionObjects/field/Make/options b/src/functionObjects/field/Make/options index cc5819e29c..c5df9e3b47 100644 --- a/src/functionObjects/field/Make/options +++ b/src/functionObjects/field/Make/options @@ -21,7 +21,9 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/fvAgglomerationMethods/pairPatchAgglomeration/lnInclude + -I$(LIB_SRC)/fvAgglomerationMethods/pairPatchAgglomeration/lnInclude \ + -I$(LIB_SRC)/phaseSystemModels/multiphaseInter/phasesSystem/lnInclude \ + -I$(LIB_SRC)/phaseSystemModels/reactingEuler/multiphaseSystem/lnInclude LIB_LIBS = \ -lfiniteVolume \ @@ -43,4 +45,6 @@ LIB_LIBS = \ -lturbulenceModelSchemes \ -lchemistryModel \ -lreactionThermophysicalModels \ - -lpairPatchAgglomeration + -lpairPatchAgglomeration \ + -lincompressibleMultiphaseSystems \ + -lreactingMultiphaseSystem diff --git a/src/functionObjects/field/heatTransferCoeff/multiphaseInterHtcModel/multiphaseInterHtcModel.C b/src/functionObjects/field/heatTransferCoeff/multiphaseInterHtcModel/multiphaseInterHtcModel.C new file mode 100644 index 0000000000..108b4d473a --- /dev/null +++ b/src/functionObjects/field/heatTransferCoeff/multiphaseInterHtcModel/multiphaseInterHtcModel.C @@ -0,0 +1,173 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | www.openfoam.com + \\/ M anipulation | +------------------------------------------------------------------------------- + Copyright (C) 2022 OpenCFD Ltd. +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "multiphaseInterHtcModel.H" +#include "multiphaseInterSystem.H" +#include "addToRunTimeSelectionTable.H" +#include "dictionary.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ +namespace functionObjects +{ + defineTypeNameAndDebug(multiphaseInterHtcModel, 0); + addToRunTimeSelectionTable + ( + functionObject, + multiphaseInterHtcModel, + dictionary + ); +} +} + + +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // + +Foam::tmp> +Foam::functionObjects::multiphaseInterHtcModel::q() const +{ + const fvMesh& mesh = htcModelPtr_->mesh(); + + const auto& T = mesh.lookupObject(htcModelPtr_->TName()); + + const volScalarField::Boundary& Tbf = T.boundaryField(); + + auto tq = tmp>::New(Tbf.size()); + auto& q = tq.ref(); + + forAll(q, patchi) + { + q.set(patchi, new Field(Tbf[patchi].size(), Zero)); + } + + const auto* fluidPtr = + mesh.cfindObject("phaseProperties"); + + if (!fluidPtr) + { + FatalErrorInFunction + << "Unable to find a valid phaseSystem to evaluate q" << nl + << exit(FatalError); + } + + const multiphaseInterSystem& fluid = *fluidPtr; + + for (const label patchi : htcModelPtr_->patchSet()) + { + q[patchi] += fluid.kappaEff(patchi)()*Tbf[patchi].snGrad(); + } + + // Add radiative heat flux contribution if present + + const auto* qrPtr = + mesh.cfindObject(htcModelPtr_->qrName()); + + if (qrPtr) + { + const volScalarField::Boundary& qrbf = qrPtr->boundaryField(); + + for (const label patchi : htcModelPtr_->patchSet()) + { + q[patchi] += qrbf[patchi]; + } + } + + return tq; +} + + +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + +bool Foam::functionObjects::multiphaseInterHtcModel::calc() +{ + auto& htc = + htcModelPtr_->mesh().lookupObjectRef(resultName_); + + htcModelPtr_->calc(htc, q()); + + return true; +} + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::functionObjects::multiphaseInterHtcModel::multiphaseInterHtcModel +( + const word& name, + const Time& runTime, + const dictionary& dict +) +: + fieldExpression(name, runTime, dict), + htcModelPtr_(nullptr) +{ + read(dict); + + setResultName(typeName, "htc:" + htcModelPtr_->type()); + + auto* htcPtr = + new volScalarField + ( + IOobject + ( + resultName_, + mesh_.time().timeName(), + mesh_, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + mesh_, + dimensionedScalar(dimPower/dimArea/dimTemperature, Zero) + ); + + mesh_.objectRegistry::store(htcPtr); +} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +bool Foam::functionObjects::multiphaseInterHtcModel::read +( + const dictionary& dict +) +{ + if (!fieldExpression::read(dict)) + { + return false; + } + + htcModelPtr_ = heatTransferCoeffModel::New(dict, mesh_, fieldName_); + + htcModelPtr_->read(dict); + + return true; +} + + +// ************************************************************************* // diff --git a/src/functionObjects/field/heatTransferCoeff/multiphaseInterHtcModel/multiphaseInterHtcModel.H b/src/functionObjects/field/heatTransferCoeff/multiphaseInterHtcModel/multiphaseInterHtcModel.H new file mode 100644 index 0000000000..1e8645b8b9 --- /dev/null +++ b/src/functionObjects/field/heatTransferCoeff/multiphaseInterHtcModel/multiphaseInterHtcModel.H @@ -0,0 +1,122 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | www.openfoam.com + \\/ M anipulation | +------------------------------------------------------------------------------- + Copyright (C) 2022 OpenCFD Ltd. +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Class + Foam::functionObjects::multiphaseInterHtcModel + +Description + A heat transfer coefficient for multiphase inter solvers + (i.e. icoReactingMultiphaseFoam). + +SourceFiles + multiphaseInterHtcModel.C + +\*---------------------------------------------------------------------------*/ + +#ifndef Foam_functionObjects_multiphaseInterHtcModel_H +#define Foam_functionObjects_multiphaseInterHtcModel_H + +#include "HashSet.H" +#include "volFields.H" +#include "fieldExpression.H" +#include "runTimeSelectionTables.H" +#include "heatTransferCoeffModel.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ +namespace functionObjects +{ + +/*---------------------------------------------------------------------------*\ + Class multiphaseInterHtcModel Declaration +\*---------------------------------------------------------------------------*/ + +class multiphaseInterHtcModel +: + public fieldExpression +{ + // Private Data + + //- Heat transfer coefficient model + autoPtr htcModelPtr_; + + +protected: + + // Protected Member Functions + + //- Calculate the heat transfer coefficient field + // \return true on success + virtual bool calc(); + + //- Calculate heat flux + tmp> q() const; + + //- No copy construct + multiphaseInterHtcModel(const multiphaseInterHtcModel&) = delete; + + //- No copy assignment + void operator=(const multiphaseInterHtcModel&) = delete; + + +public: + + //- Runtime type information + TypeName("multiphaseInterHtcModel"); + + + // Constructors + + //- Construct from components + multiphaseInterHtcModel + ( + const word& name, + const Time& runTime, + const dictionary& dict + ); + + + //- Destructor + virtual ~multiphaseInterHtcModel() = default; + + + // Member Functions + + //- Read the heatTransferCoeff data + virtual bool read(const dictionary& dict); +}; + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace functionObjects +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/phaseSystemModels/reactingEuler/functionObjects/reactingEulerHtcModel/reactingEulerHtcModel.C b/src/functionObjects/field/heatTransferCoeff/reactingEulerHtcModel/reactingEulerHtcModel.C similarity index 99% rename from src/phaseSystemModels/reactingEuler/functionObjects/reactingEulerHtcModel/reactingEulerHtcModel.C rename to src/functionObjects/field/heatTransferCoeff/reactingEulerHtcModel/reactingEulerHtcModel.C index be169e7fb2..9360972ded 100644 --- a/src/phaseSystemModels/reactingEuler/functionObjects/reactingEulerHtcModel/reactingEulerHtcModel.C +++ b/src/functionObjects/field/heatTransferCoeff/reactingEulerHtcModel/reactingEulerHtcModel.C @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2020 OpenCFD Ltd. + Copyright (C) 2020-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. diff --git a/src/phaseSystemModels/reactingEuler/functionObjects/reactingEulerHtcModel/reactingEulerHtcModel.H b/src/functionObjects/field/heatTransferCoeff/reactingEulerHtcModel/reactingEulerHtcModel.H similarity index 94% rename from src/phaseSystemModels/reactingEuler/functionObjects/reactingEulerHtcModel/reactingEulerHtcModel.H rename to src/functionObjects/field/heatTransferCoeff/reactingEulerHtcModel/reactingEulerHtcModel.H index 7c1536bf7d..72fd176724 100644 --- a/src/phaseSystemModels/reactingEuler/functionObjects/reactingEulerHtcModel/reactingEulerHtcModel.H +++ b/src/functionObjects/field/heatTransferCoeff/reactingEulerHtcModel/reactingEulerHtcModel.H @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2020 OpenCFD Ltd. + Copyright (C) 2020-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -24,7 +24,7 @@ License along with OpenFOAM. If not, see . Class - Foam::reactingEulerHtcModel + Foam::functionObjects::reactingEulerHtcModel Description A heat transfer coefficient for reactingEuler solvers @@ -34,8 +34,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef reactingEulerHtcModel_H -#define reactingEulerHtcModel_H +#ifndef Foam_functionObjects_reactingEulerHtcModel_H +#define Foam_functionObjects_reactingEulerHtcModel_H #include "HashSet.H" #include "volFields.H" 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/functionObjects/phaseSystems/Make/files b/src/functionObjects/phaseSystems/Make/files new file mode 100644 index 0000000000..b925df49e1 --- /dev/null +++ b/src/functionObjects/phaseSystems/Make/files @@ -0,0 +1,4 @@ +sizeDistribution/sizeDistribution.C +phaseForces/phaseForces.C + +LIB = $(FOAM_LIBBIN)/libphaseFunctionObjects diff --git a/src/phaseSystemModels/reactingEuler/functionObjects/Make/options b/src/functionObjects/phaseSystems/Make/options similarity index 100% rename from src/phaseSystemModels/reactingEuler/functionObjects/Make/options rename to src/functionObjects/phaseSystems/Make/options diff --git a/src/phaseSystemModels/reactingEuler/functionObjects/phaseForces/phaseForces.C b/src/functionObjects/phaseSystems/phaseForces/phaseForces.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/functionObjects/phaseForces/phaseForces.C rename to src/functionObjects/phaseSystems/phaseForces/phaseForces.C diff --git a/src/phaseSystemModels/reactingEuler/functionObjects/phaseForces/phaseForces.H b/src/functionObjects/phaseSystems/phaseForces/phaseForces.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/functionObjects/phaseForces/phaseForces.H rename to src/functionObjects/phaseSystems/phaseForces/phaseForces.H diff --git a/src/phaseSystemModels/reactingEuler/functionObjects/sizeDistribution/sizeDistribution.C b/src/functionObjects/phaseSystems/sizeDistribution/sizeDistribution.C similarity index 100% rename from src/phaseSystemModels/reactingEuler/functionObjects/sizeDistribution/sizeDistribution.C rename to src/functionObjects/phaseSystems/sizeDistribution/sizeDistribution.C diff --git a/src/phaseSystemModels/reactingEuler/functionObjects/sizeDistribution/sizeDistribution.H b/src/functionObjects/phaseSystems/sizeDistribution/sizeDistribution.H similarity index 100% rename from src/phaseSystemModels/reactingEuler/functionObjects/sizeDistribution/sizeDistribution.H rename to src/functionObjects/phaseSystems/sizeDistribution/sizeDistribution.H 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/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 95% rename from src/phaseSystemModels/multiphaseEuler/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H rename to src/phaseSystemModels/multiphaseEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.H index 929c8ab78a..a9fac35aa3 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 @@ -134,7 +137,7 @@ private: public: //- Runtime type information - TypeName("alphaContactAngle"); + TypeName("multiphaseEuler::alphaContactAngle"); // Constructors @@ -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..baf820ab43 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 @@ -211,12 +213,58 @@ Foam::InterfaceCompositionModel::InterfaceCompositionModel template Foam::tmp -Foam::InterfaceCompositionModel::D +Foam::InterfaceCompositionModel::Dto ( const word& speciesName ) const { - const typename Thermo::thermoType& fromThermo = + const typename OtherThermo::thermoType& toThermoType = + getLocalThermo + ( + speciesName, + toThermo_ + ); + + const volScalarField& p = toThermo_.p(); + + const volScalarField& T = toThermo_.T(); + + auto tmpD = tmp::New + ( + IOobject + ( + IOobject::groupName("D", pair_.name()), + p.time().timeName(), + p.mesh() + ), + p.mesh(), + dimensionedScalar(dimArea/dimTime, Zero) + ); + + auto& D = tmpD.ref(); + + forAll(p, celli) + { + D[celli] = + toThermoType.alphah(p[celli], T[celli]) + /toThermoType.rho(p[celli], T[celli]); + } + + D /= Le_; + D.correctBoundaryConditions(); + + return tmpD; +} + + +template +Foam::tmp +Foam::InterfaceCompositionModel::Dfrom +( + const word& speciesName +) const +{ + const typename Thermo::thermoType& fromThermoType = getLocalThermo ( speciesName, @@ -241,11 +289,11 @@ Foam::InterfaceCompositionModel::D auto& D = tmpD.ref(); - forAll(p, cellI) + forAll(p, celli) { - D[cellI] = - fromThermo.alphah(p[cellI], T[cellI]) - /fromThermo.rho(p[cellI], T[cellI]); + D[celli] = + fromThermoType.alphah(p[celli], T[celli]) + /fromThermoType.rho(p[celli], T[celli]); } D /= Le_; @@ -286,9 +334,9 @@ Foam::InterfaceCompositionModel::L auto& L = tmpL.ref(); // from Thermo (from) to Thermo (to) - forAll(p, cellI) + forAll(p, celli) { - L[cellI] = fromThermo.Hc() - toThermo.Hc(); + L[celli] = fromThermo.Hc() - toThermo.Hc(); } L.correctBoundaryConditions(); diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.H index 8f70f06ed5..0e3171b3b3 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 @@ -151,12 +153,18 @@ public: const volScalarField& Tf ) const; - //- Mass diffusivity of the local thermo - virtual tmp D + //- Specie mass diffusivity for pure mixture + virtual tmp Dfrom ( const word& speciesName ) const; + //- Specie mass diffusivity for specie in a multicomponent + virtual tmp Dto + ( + const word& speciesName + ) const; + //- Latent heat (to - from)(thermo - otherThermo) virtual tmp L ( diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModels.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModels.C index cc18d3681c..980f5e0873 100644 --- a/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModels.C +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModels.C @@ -52,6 +52,7 @@ License #include "Lee.H" #include "interfaceHeatResistance.H" #include "interfaceOxideRate.H" +#include "diffusionGasEvaporation.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -726,6 +727,39 @@ namespace Foam pureMixture, constRhoHThermoPhysics ); + + + // diffusionGasEvaporation model definitions + + // From pure liquid (rhoConst) to a multi-component gas incomp phase + makeInterfaceContSpecieMixtureType + ( + diffusionGasEvaporation, + heRhoThermo, + rhoThermo, + pureMixture, + constRhoHThermoPhysics, + heRhoThermo, + rhoReactionThermo, + multiComponentMixture, + constIncompressibleGasHThermoPhysics + ); + + + // From pure liquid (BoussinesqFluid) to a multi-component gas incomp + // phase + makeInterfaceContSpecieMixtureType + ( + diffusionGasEvaporation, + heRhoThermo, + rhoThermo, + pureMixture, + BoussinesqFluidEThermoPhysics, + heRhoThermo, + rhoReactionThermo, + multiComponentMixture, + constIncompressibleGasHThermoPhysics + ); } 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/Make/options b/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/options index a4d6737537..f17cdb10d0 100644 --- a/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/options +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I../../reactingEuler/saturationModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ @@ -30,4 +31,5 @@ LIB_LIBS = \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ -lthermophysicalProperties \ - -lcombustionModels + -lcombustionModels \ + -lsaturationModel diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/MassTransferPhaseSystem/MassTransferPhaseSystem.C index 2f027a0de4..559fee3e63 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 @@ -119,7 +121,7 @@ Foam::MassTransferPhaseSystem::calculateL const word species(speciesName.substr(0, speciesName.find('.'))); - L += pos(dmdtNetki)*interfacePtr->L(species, T); + L -= pos(dmdtNetki)*interfacePtr->L(species, T); } return tL; @@ -238,7 +240,7 @@ Foam::MassTransferPhaseSystem::heatTransfer if (KSp.valid()) { - Sp -= KSp.ref(); + Sp += KSp.ref(); } tmp KSu = @@ -246,13 +248,13 @@ Foam::MassTransferPhaseSystem::heatTransfer if (KSu.valid()) { - Su -= KSu.ref(); + Su += KSu.ref(); } // If linearization is not provided used full explicit if (!KSp.valid() && !KSu.valid()) { - Su -= *dmdt_[keyik]; + Su += *dmdt_[keyik]; } } 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..3b6d64641c 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. @@ -43,6 +43,7 @@ SourceFiles #include "dictionary.H" #include "Enum.H" #include "runTimeSelectionTables.H" +#include "multiphaseInterSystem.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -50,9 +51,14 @@ namespace Foam { // Forward Declarations -class phaseModel; class phasePair; +namespace multiphaseInter +{ + +// Forward Declarations +class phaseModel; + /*---------------------------------------------------------------------------*\ Class interfaceCompositionModel Declaration \*---------------------------------------------------------------------------*/ @@ -147,6 +153,9 @@ public: //- The phase pair const phasePair& pair() const; + //- Return the multiphaseInterSystem this interface belongs to + const multiphaseInterSystem& fluid() const; + //- Interface mass fraction virtual tmp Yf ( @@ -161,12 +170,18 @@ public: const volScalarField& Tf ) const = 0; - //- Mass diffusivity - virtual tmp D + //- Specie mass diffusivity for pure mixture + virtual tmp Dfrom ( const word& speciesName ) const = 0; + //- Specie mass diffusivity for specie in a multicomponent + virtual tmp Dto + ( + const word& speciesName + ) const = 0; + //- Latent heat (delta Hc) virtual tmp L ( @@ -212,6 +227,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace Foam +} // End multiphaseInter // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/Lee/Lee.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/Lee/Lee.C index b8313ea33e..d0cde4679e 100644 --- a/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/Lee/Lee.C +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/Lee/Lee.C @@ -78,7 +78,7 @@ Foam::meltingEvaporationModels::Lee::Kexp { return ( - coeff*pos(Tactivate_ - refValue) + coeff*pos(Tactivate_ - refValue) ); } } diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/diffusionGasEvaporation/diffusionGasEvaporation.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/diffusionGasEvaporation/diffusionGasEvaporation.C new file mode 100644 index 0000000000..7a9139bc0b --- /dev/null +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/diffusionGasEvaporation/diffusionGasEvaporation.C @@ -0,0 +1,249 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | www.openfoam.com + \\/ M anipulation | +------------------------------------------------------------------------------- + Copyright (C) 2022 OpenCFD Ltd. +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "diffusionGasEvaporation.H" +#include "constants.H" +#include "cutCellIso.H" +#include "volPointInterpolation.H" +#include "fvcGrad.H" + +using namespace Foam::constant; + +// * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * * // + +template +void Foam::meltingEvaporationModels:: +diffusionGasEvaporation::updateInterface +( + const volScalarField& T +) +{ + const fvMesh& mesh = this->mesh_; + + const volScalarField& alpha = this->pair().from(); + + scalarField ap + ( + volPointInterpolation::New(mesh).interpolate(alpha) + ); + + cutCellIso cutCell(mesh, ap); + + forAll(interfaceArea_, celli) + { + const label status = cutCell.calcSubCell(celli, isoAlpha_); + interfaceArea_[celli] = 0; + if (status == 0) // cell is cut + { + interfaceArea_[celli] = mag(cutCell.faceArea())/mesh.V()[celli]; + } + } +} + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +template +Foam::meltingEvaporationModels::diffusionGasEvaporation +::diffusionGasEvaporation +( + const dictionary& dict, + const phasePair& pair +) +: + InterfaceCompositionModel(dict, pair), + saturationModelPtr_ + ( + saturationModel::New + ( + dict.subDict("saturationPressure"), + this->mesh_ + ) + ), + isoAlpha_(dict.getOrDefault("isoAlpha", 0.5)), + C_("C", dimless, dict), + Tactivate_("Tactivate", dimTemperature, 0, dict), + interfaceArea_ + ( + IOobject + ( + "interfaceArea", + this->mesh_.time().timeName(), + this->mesh_, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + this->mesh_, + dimensionedScalar(dimless/dimLength, Zero) + ), + mDotc_ + ( + IOobject + ( + "mDotc", + this->mesh_.time().timeName(), + this->mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + this->mesh_, + dimensionedScalar(dimDensity/dimTime, Zero) + ) +{} + + +// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // + +template +Foam::tmp +Foam::meltingEvaporationModels::diffusionGasEvaporation +::Kexp +( + const volScalarField& T +) +{ + const fvMesh& mesh = this->mesh_; + + const word speciesName(IOobject::member(this->transferSpecie())); + + const typename OtherThermo::thermoType& vapourThermo = + this->getLocalThermo + ( + speciesName, + this->toThermo_ + ); + + const volScalarField& from = this->pair().from(); + const volScalarField& to = this->pair().to(); + + const volScalarField& Yv = this->toThermo_.composition().Y(speciesName); + + updateInterface(T); + + auto tRhog = tmp::New + ( + IOobject + ( + "tRhog", + mesh.time().timeName(), + mesh + ), + mesh, + dimensionedScalar(dimDensity, Zero) + ); + volScalarField& rhog = tRhog.ref(); + rhog = this->pair().to().rho(); + + auto tDvg = tmp::New + ( + IOobject + ( + "tDvg", + mesh.time().timeName(), + mesh + ), + mesh, + dimensionedScalar(sqr(dimLength)/dimTime, Zero) + ); + volScalarField& Dvg = tDvg.ref(); + Dvg = this->Dto(speciesName); + + tmp tpSat = saturationModelPtr_->pSat(T); + + const volScalarField XvSat(tpSat()/this->toThermo_.p()); + + const dimensionedScalar Wv("Wv", dimMass/dimMoles, vapourThermo.W()); + const volScalarField YvSat + ( + XvSat + *( + Wv/(XvSat*Wv + (1-XvSat)*this->toThermo_.W()) + ) + ); + + const volScalarField Ygm(max(from*YvSat + to*Yv, Zero)); + + const multiphaseInterSystem& fluid = this->fluid(); + + tmp tnHatInt(fluid.nVolHatfv(to, from)); + + const volScalarField gradYgm(fvc::grad(Ygm) & tnHatInt()); + + mDotc_ = + -pos(T - Tactivate_) + *C_*rhog*Dvg*gradYgm*interfaceArea_ + /(1 - YvSat); + + if (debug && mesh.time().outputTime()) + { + volScalarField pSat("pSat", saturationModelPtr_->pSat(T)); + pSat.write(); + + volScalarField YvSat1("YvSat", YvSat); + YvSat1.write(); + + volScalarField YgmDebug("Ygm", Ygm); + YgmDebug.write(); + + volScalarField gradYgmD("gradYgm", gradYgm); + gradYgmD.write(); + + volVectorField nHatIntD("nHatInt", tnHatInt()); + nHatIntD.write(); + } + + return tmp::New(mDotc_); +} + + +template +Foam::tmp +Foam::meltingEvaporationModels::diffusionGasEvaporation:: +KSp +( + label variable, + const volScalarField& refValue +) +{ + return nullptr; +} + + +template +Foam::tmp +Foam::meltingEvaporationModels::diffusionGasEvaporation:: +KSu +( + label variable, + const volScalarField& refValue +) +{ + return nullptr; +} + + +//************************************************************************ // diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/diffusionGasEvaporation/diffusionGasEvaporation.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/diffusionGasEvaporation/diffusionGasEvaporation.H new file mode 100644 index 0000000000..20b92296a2 --- /dev/null +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/diffusionGasEvaporation/diffusionGasEvaporation.H @@ -0,0 +1,228 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | www.openfoam.com + \\/ M anipulation | +------------------------------------------------------------------------------- + Copyright (C) 2022 OpenCFD Ltd. +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Class + Foam::meltingEvaporationModels::diffusionGasEvaporation + +Description + Gas diffusion based evaporation/condensation mass transfer model. + + THE evaporation rate is given by: + + \f[ + \hat{m_i} = + - C \rho_{g} D_{v,i} + \frac + { + \frac{dY_{v,i}}{dn} + } + { + 1 - \; \sum_{1}^{Nv}Y_{g,j} + } + \f] + + where: + \vartable + \hat{m_i} | mass flux rate [kg/s/m2] + \rho_{g} | gas phase density + D_{v,i} | diffusion coefficient + C | model coefficient + \frac{dY_{v,i}}{dn} | normal derivative of evaporated component + Y_{g,j} | mass fraction at the surface + \endvartable + +Usage + Example usage: + \verbatim + massTransferModel + ( + (liquid to gas) + { + // Mandatory entries + type diffusionGasEvaporation; + species vapour.gas; + C 1; + saturationPressure + { + type Antoine; + A 3.55; + B 643; + C -198; + } + + // Optional entries + isoAlpha ; + Tactivate ; + + // Inherited entries + ... + } + ); + \endverbatim + + where: + \table + Property | Description | Type | Reqd | Deflt + type | Type name: diffusionGasEvaporation | word | yes | - + saturationPressure | Saturation model | dict | yes | - + isoAlpha | Iso-alpha for interface | scalar | no | 0.5 + C | Model coefficient | scalar | yes | - + Tactivate | Saturation temperature | scalar | no | 0 + \endtable + + The inherited entries are elaborated in: + - \link InterfaceCompositionModel.H \endlink + - \link saturationModel.H \endlink + +SourceFiles + diffusionGasEvaporation.C + +\*---------------------------------------------------------------------------*/ + +#ifndef Foam_meltingEvaporationModels_diffusionGasEvaporation_H +#define Foam_meltingEvaporationModels_diffusionGasEvaporation_H + +#include "InterfaceCompositionModel.H" +#include "saturationModel.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *// + +namespace Foam +{ + +// Forward Declarations +class phasePair; + +namespace meltingEvaporationModels +{ + +/*---------------------------------------------------------------------------*\ + Class diffusionGasEvaporation Declaration +\*---------------------------------------------------------------------------*/ + +template +class diffusionGasEvaporation +: + public InterfaceCompositionModel +{ + // Private Data + + //- Saturation pressure model + autoPtr saturationModelPtr_; + + //- Interface Iso-value + scalar isoAlpha_; + + //- Evaporation coefficient + dimensionedScalar C_; + + //- Activation temperature + const dimensionedScalar Tactivate_; + + //- Interface area + volScalarField interfaceArea_; + + //- Mass source + volScalarField mDotc_; + + + // Private Member Functions + + //- Update interface + void updateInterface(const volScalarField& T); + + +public: + + //- Runtime type information + TypeName("diffusionGasEvaporation"); + + + // Constructors + + //- Construct from components + diffusionGasEvaporation + ( + const dictionary& dict, + const phasePair& pair + ); + + + //- Destructor + virtual ~diffusionGasEvaporation() = default; + + + // Member Functions + + //- Explicit total mass transfer coefficient + virtual tmp Kexp + ( + const volScalarField& field + ); + + //- Implicit mass transfer coefficient + virtual tmp KSp + ( + label modelVariable, + const volScalarField& field + ); + + //- Explicit mass transfer coefficient + virtual tmp KSu + ( + label modelVariable, + const volScalarField& field + ); + + //- Return Tactivate + virtual const dimensionedScalar& Tactivate() const noexcept + { + return Tactivate_; + } + + //- Add/subtract alpha*div(U) as a source term + //- for alpha, substituting div(U) = mDot(1/rho1 - 1/rho2) + virtual bool includeDivU() const noexcept + { + return true; + } +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace meltingEvaporationModels +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#ifdef NoRepository +# include "diffusionGasEvaporation.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +#endif + +// ************************************************************************* // diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.C index ca76c43a51..0dfd7e8b11 100644 --- a/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.C +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/interfaceHeatResistance/interfaceHeatResistance.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2020 Henning Scheufler - Copyright (C) 2020-2021 OpenCFD Ltd. + Copyright (C) 2020-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -223,7 +223,7 @@ Foam::meltingEvaporationModels::interfaceHeatResistance auto tempOpen = fullSpeciesName.find('.'); const word speciesName(fullSpeciesName.substr(0, tempOpen)); - tmp L = this->L(speciesName, T); + tmp L = mag(this->L(speciesName, T)); htc_ = R_/L(); diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.C index 7b89464004..83f0d399d4 100644 --- a/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.C +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/massTransferModels/kineticGasEvaporation/kineticGasEvaporation.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. @@ -62,49 +62,6 @@ void Foam::meltingEvaporationModels::kineticGasEvaporation mag(cutCell.faceArea())/mesh.V()[celli]; } } - - for (const polyPatch& pp : mesh.boundaryMesh()) - { - if (isA(pp)) - { - forAll(pp.faceCells(), faceI) - { - const label pCelli = pp.faceCells()[faceI]; - bool interface(false); - if - ( - sign(C_.value()) > 0 - && (T[pCelli] - Tactivate_.value()) > 0 - ) - { - interface = true; - } - - if - ( - sign(C_.value()) < 0 - && (T[pCelli] - Tactivate_.value()) < 0 - ) - { - interface = true; - } - - if - ( - interface - && - ( - alpha[pCelli] < 2*isoAlpha_ - && alpha[pCelli] > 0.5*isoAlpha_ - ) - ) - { - interfaceArea_[pCelli] = - mag(pp.faceAreas()[faceI])/mesh.V()[pCelli]; - } - } - } - } } @@ -206,7 +163,7 @@ Foam::meltingEvaporationModels::kineticGasEvaporation ); word speciesName = IOobject::member(this->transferSpecie()); - tmp L = this->L(speciesName, T); + tmp L = mag(this->L(speciesName, T)); updateInterface(T); diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.C similarity index 74% rename from src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.C rename to src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.C index a4d0230bdc..3df86d343a 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,92 @@ 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 +{ + const volScalarField kappaEff + ( + this->kappa() + this->Cp()*turb_->mut()/Prt_ + ); + + return tmp::New(kappaEff); +} + + +Foam::tmp +Foam::multiphaseInterSystem::kappaEff(const label patchi) const +{ + const scalarField Cp(this->Cp()().boundaryField()[patchi]); + const scalarField kappaEffp + ( + this->kappa(patchi) + Cp*turb_->mut(patchi)/Prt_.value() + ); + + return tmp::New(kappaEffp); +} + + +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 +996,7 @@ void Foam::phaseSystem::correct() } -void Foam::phaseSystem::correctTurbulence() +void Foam::multiphaseInterSystem::correctTurbulence() { forAllIters(phaseModels_, iter) { @@ -928,32 +1005,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 +1047,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 +1067,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 +1124,7 @@ Foam::phaseSystem::surfaceTensionForce() const } -Foam::tmp Foam::phaseSystem::U() const +Foam::tmp Foam::multiphaseInterSystem::U() const { auto tstf = tmp::New ( @@ -1070,13 +1150,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 +1165,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 +1180,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 +1203,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 +1216,7 @@ Foam::tmp Foam::phaseSystem::K } -Foam::tmp Foam::phaseSystem::nearInterface +Foam::tmp Foam::multiphaseInterSystem::nearInterface ( const volScalarField& alpha1, const volScalarField& alpha2 @@ -1150,7 +1230,8 @@ Foam::tmp Foam::phaseSystem::nearInterface } -Foam::tmp Foam::phaseSystem::nearInterface() const +Foam::tmp +Foam::multiphaseInterSystem::nearInterface() const { auto tnearInt = tmp::New ( @@ -1188,17 +1269,26 @@ Foam::tmp Foam::phaseSystem::nearInterface() const } -Foam::tmp Foam::phaseSystem::nHatfv +Foam::tmp Foam::multiphaseInterSystem::nVolHatfv ( const volScalarField& alpha1, const volScalarField& alpha2 ) const { - - surfaceVectorField gradAlphaf + const volScalarField alpha1m ( - fvc::interpolate(alpha2)*fvc::interpolate(fvc::grad(alpha1)) - - fvc::interpolate(alpha1)*fvc::interpolate(fvc::grad(alpha2)) + min(max(alpha1, scalar(0)), scalar(1)) + ); + + const volScalarField alpha2m + ( + min(max(alpha2, scalar(0)), scalar(1)) + ); + + const volVectorField gradAlphaf + ( + alpha2m*(fvc::grad(alpha1m)) + - alpha1m*(fvc::grad(alpha2m)) ); const dimensionedScalar deltaN @@ -1212,7 +1302,41 @@ Foam::tmp Foam::phaseSystem::nHatfv } -Foam::tmp Foam::phaseSystem::nHatf +Foam::tmp Foam::multiphaseInterSystem::nHatfv +( + const volScalarField& alpha1, + const volScalarField& alpha2 +) const +{ + + const volScalarField alpha1b + ( + min(max(alpha1, scalar(0)), scalar(1)) + ); + + const volScalarField alpha2b + ( + min(max(alpha2, scalar(0)), scalar(1)) + ); + + surfaceVectorField gradAlphaf + ( + fvc::interpolate(alpha2b)*fvc::interpolate(fvc::grad(alpha1b)) + - fvc::interpolate(alpha1b)*fvc::interpolate(fvc::grad(alpha2b)) + ); + + const dimensionedScalar deltaN + ( + "deltaN", + 1e-8/cbrt(average(mesh_.V())) + ); + + // Face unit interface normal + return gradAlphaf/(mag(gradAlphaf) + deltaN); +} + + +Foam::tmp Foam::multiphaseInterSystem::nHatf ( const volScalarField& alpha1, const volScalarField& alpha2 @@ -1223,7 +1347,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 87% rename from src/phaseSystemModels/multiphaseInter/phasesSystem/phaseSystem/phaseSystem.H rename to src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.H index c6a30787cb..fbcacaefbc 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; @@ -636,14 +684,19 @@ public: const volScalarField& alpha2 ) const; - - //- Interface normal volume vector - tmp nHatf + //- Interface normal volField vector + tmp nVolHatfv ( const volScalarField& alpha1, const volScalarField& alpha2 ) const; + //- Interface normal surface vector + tmp nHatf + ( + const volScalarField& alpha1, + const volScalarField& alpha2 + ) const; //- Interface curvature tmp K @@ -652,7 +705,6 @@ public: const volScalarField& alpha2 ) const; - //- Near Interface of alpha1 and alpha2 tmp nearInterface ( @@ -672,7 +724,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