zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'feature-icoMulti-FOs' into 'develop'

Browse Source 
General enhancement to icoReactingMultiphaseInterFoam solver, sub-models and FO's

See merge request Development/openfoam!542
This commit is contained in:
Andrew Heather
2022-06-21 09:30:43 +00:00
parent e96990c8bf c0581fe8eb
commit ebac6c9b94
265 changed files with 3391 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/solvers/combustion/PDRFoam/Make/options
View File

@ -25,6 +25,7 @@ EXE_LIBS = \
-lengine \ -lengine \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lcompressibleTransportModels \ -lcompressibleTransportModels \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \
-lreactionThermophysicalModels \ -lreactionThermophysicalModels \

1
applications/solvers/combustion/XiFoam/Make/options
View File

@ -19,6 +19,7 @@ EXE_LIBS = \
-lengine \ -lengine \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lcompressibleTransportModels \ -lcompressibleTransportModels \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \
-lreactionThermophysicalModels \ -lreactionThermophysicalModels \

1
applications/solvers/combustion/XiFoam/XiDyMFoam/Make/options
View File

@ -26,6 +26,7 @@ EXE_LIBS = \
-lengine \ -lengine \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lcompressibleTransportModels \ -lcompressibleTransportModels \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \
-lreactionThermophysicalModels \ -lreactionThermophysicalModels \

1
applications/solvers/combustion/XiFoam/XiEngineFoam/Make/options
View File

@ -20,6 +20,7 @@ EXE_LIBS = \
-lengine \ -lengine \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lcompressibleTransportModels \ -lcompressibleTransportModels \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \
-lreactionThermophysicalModels \ -lreactionThermophysicalModels \

1
applications/solvers/combustion/coldEngineFoam/Make/options
View File

@ -20,6 +20,7 @@ EXE_LIBS = \
-lengine \ -lengine \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lcompressibleTransportModels \ -lcompressibleTransportModels \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \
-lspecie -lspecie

1
applications/solvers/combustion/fireFoam/Make/options
View File

@ -34,6 +34,7 @@ EXE_LIBS = \
-lsampling \ -lsampling \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lspecie \ -lspecie \
-lcompressibleTransportModels \ -lcompressibleTransportModels \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \

1
applications/solvers/combustion/reactingFoam/Make/options
View File

@ -19,6 +19,7 @@ EXE_LIBS = \
-lsampling \ -lsampling \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lreactionThermophysicalModels \ -lreactionThermophysicalModels \
-lspecie \ -lspecie \
-lcompressibleTransportModels \ -lcompressibleTransportModels \

1
applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/Make/options
View File

@ -20,6 +20,7 @@ EXE_LIBS = \
-lsampling \ -lsampling \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lreactionThermophysicalModels \ -lreactionThermophysicalModels \
-lspecie \ -lspecie \
-lcompressibleTransportModels \ -lcompressibleTransportModels \

1
applications/solvers/combustion/reactingFoam/rhoReactingFoam/Make/options
View File

@ -20,6 +20,7 @@ EXE_LIBS = \
-lsampling \ -lsampling \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lreactionThermophysicalModels \ -lreactionThermophysicalModels \
-lspecie \ -lspecie \
-lcompressibleTransportModels \ -lcompressibleTransportModels \

1
applications/solvers/compressible/rhoCentralFoam/Make/options
View File

@ -19,5 +19,6 @@ EXE_LIBS = \
-lrhoCentralFoam \ -lrhoCentralFoam \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-ldynamicFvMesh \ -ldynamicFvMesh \
-ltopoChangerFvMesh -ltopoChangerFvMesh

5
applications/solvers/compressible/rhoPimpleAdiabaticFoam/Make/options
View File

@ -6,7 +6,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-lfiniteVolume \ -lfiniteVolume \
@ -17,4 +17,5 @@ EXE_LIBS = \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \
-lspecie \ -lspecie \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels -lcompressibleTurbulenceModels \
-lthermoTools

1
applications/solvers/compressible/rhoPimpleFoam/Make/options
View File

@ -20,6 +20,7 @@ EXE_LIBS = \
-lspecie \ -lspecie \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-ldynamicMesh \ -ldynamicMesh \
-ldynamicFvMesh \ -ldynamicFvMesh \
-ltopoChangerFvMesh \ -ltopoChangerFvMesh \

1
applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/Make/options
View File

@ -21,6 +21,7 @@ EXE_LIBS = \
-lspecie \ -lspecie \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-ldynamicFvMesh \ -ldynamicFvMesh \
-ltopoChangerFvMesh \ -ltopoChangerFvMesh \
-loverset -loverset

1
applications/solvers/compressible/rhoSimpleFoam/Make/options
View File

@ -19,5 +19,6 @@ EXE_LIBS = \
-lspecie \ -lspecie \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-latmosphericModels \ -latmosphericModels \
-lregionFaModels -lregionFaModels

1
applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/Make/options
View File

@ -21,6 +21,7 @@ EXE_LIBS = \
-lspecie \ -lspecie \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-ldynamicFvMesh \ -ldynamicFvMesh \
-ltopoChangerFvMesh \ -ltopoChangerFvMesh \
-lsampling \ -lsampling \

3
applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options
View File

@ -18,4 +18,5 @@ EXE_LIBS = \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \
-lspecie \ -lspecie \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels -lcompressibleTurbulenceModels \
-lthermoTools

3
applications/solvers/compressible/sonicFoam/Make/options
View File

@ -16,4 +16,5 @@ EXE_LIBS = \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \
-lspecie \ -lspecie \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels -lcompressibleTurbulenceModels \
-lthermoTools

1
applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
View File

@ -21,6 +21,7 @@ EXE_LIBS = \
-lspecie \ -lspecie \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-ldynamicMesh \ -ldynamicMesh \
-ldynamicFvMesh \ -ldynamicFvMesh \
-ltopoChangerFvMesh \ -ltopoChangerFvMesh \

1
applications/solvers/heatTransfer/buoyantPimpleFoam/Make/options
View File

@ -23,6 +23,7 @@ EXE_LIBS = \
-lspecie \ -lspecie \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-latmosphericModels \ -latmosphericModels \
-ldynamicMesh \ -ldynamicMesh \
-ldynamicFvMesh \ -ldynamicFvMesh \

1
applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/Make/options
View File

@ -24,6 +24,7 @@ EXE_LIBS = \
-lspecie \ -lspecie \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-latmosphericModels \ -latmosphericModels \
-loverset \ -loverset \
-ldynamicFvMesh \ -ldynamicFvMesh \

1
applications/solvers/heatTransfer/buoyantSimpleFoam/Make/options
View File

@ -20,5 +20,6 @@ EXE_LIBS = \
-lradiationModels \ -lradiationModels \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-latmosphericModels \ -latmosphericModels \
-lregionFaModels -lregionFaModels

1
applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
View File

@ -37,6 +37,7 @@ EXE_LIBS = \
-lcombustionModels \ -lcombustionModels \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lradiationModels \ -lradiationModels \
-lregionModels \ -lregionModels \
-lregionFaModels -lregionFaModels

1
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
View File

@ -30,6 +30,7 @@ EXE_LIBS = \
-lspecie \ -lspecie \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lradiationModels \ -lradiationModels \
-lfvOptions \ -lfvOptions \
-lfaOptions \ -lfaOptions \

3
applications/solvers/heatTransfer/solidFoam/Make/options
View File

@ -23,4 +23,5 @@ EXE_LIBS = \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \
-lsolidThermo \ -lsolidThermo \
-lradiationModels \ -lradiationModels \
-lspecie -lspecie \
-lthermoTools

3
applications/solvers/heatTransfer/thermoFoam/Make/options
View File

@ -18,4 +18,5 @@ EXE_LIBS = \
-lradiationModels \ -lradiationModels \
-lspecie \ -lspecie \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels -lcompressibleTurbulenceModels \
-lthermoTools

1
applications/solvers/lagrangian/coalChemistryFoam/Make/options
View File

@ -31,6 +31,7 @@ EXE_LIBS = \
-lmeshTools \ -lmeshTools \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-llagrangian \ -llagrangian \
-llagrangianIntermediate \ -llagrangianIntermediate \
-llagrangianTurbulence \ -llagrangianTurbulence \

1
applications/solvers/lagrangian/reactingParcelFoam/Make/options
View File

@ -36,6 +36,7 @@ EXE_LIBS = \
-lsampling \ -lsampling \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lspecie \ -lspecie \
-lcompressibleTransportModels \ -lcompressibleTransportModels \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \

1
applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options
View File

@ -36,6 +36,7 @@ EXE_LIBS = \
-ldynamicFvMesh \ -ldynamicFvMesh \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lspecie \ -lspecie \
-lcompressibleTransportModels \ -lcompressibleTransportModels \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \

1
applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
View File

@ -31,6 +31,7 @@ EXE_LIBS = \
-lmeshTools \ -lmeshTools \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-llagrangian \ -llagrangian \
-llagrangianIntermediate \ -llagrangianIntermediate \
-llagrangianTurbulence \ -llagrangianTurbulence \

1
applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options
View File

@ -31,6 +31,7 @@ EXE_LIBS = \
-lmeshTools \ -lmeshTools \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-llagrangian \ -llagrangian \
-llagrangianIntermediate \ -llagrangianIntermediate \
-llagrangianTurbulence \ -llagrangianTurbulence \

1
applications/solvers/lagrangian/sprayFoam/Make/options
View File

@ -31,6 +31,7 @@ EXE_LIBS = \
-lmeshTools \ -lmeshTools \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-llagrangian \ -llagrangian \
-llagrangianIntermediate \ -llagrangianIntermediate \
-llagrangianTurbulence \ -llagrangianTurbulence \

1
applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options
View File

@ -35,6 +35,7 @@ EXE_LIBS = \
-lsampling \ -lsampling \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-llagrangian \ -llagrangian \
-llagrangianIntermediate \ -llagrangianIntermediate \
-llagrangianTurbulence \ -llagrangianTurbulence \

1
applications/solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options
View File

@ -31,6 +31,7 @@ EXE_LIBS = \
-lmeshTools \ -lmeshTools \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-llagrangian \ -llagrangian \
-llagrangianIntermediate \ -llagrangianIntermediate \
-llagrangianSpray \ -llagrangianSpray \

1
applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
View File

@ -36,6 +36,7 @@ EXE_LIBS = \
-lmeshTools \ -lmeshTools \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-llagrangian \ -llagrangian \
-llagrangianIntermediate \ -llagrangianIntermediate \
-llagrangianTurbulence \ -llagrangianTurbulence \

1
applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
View File

@ -29,6 +29,7 @@ EXE_LIBS = \
-lradiationModels \ -lradiationModels \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lregionModels \ -lregionModels \
-lsurfaceFilmModels \ -lsurfaceFilmModels \
-lregionFaModels \ -lregionFaModels \

1
applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/Make/options
View File

@ -32,6 +32,7 @@ EXE_LIBS = \
-lradiationModels \ -lradiationModels \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lregionModels \ -lregionModels \
-lsurfaceFilmModels \ -lsurfaceFilmModels \
-ldynamicMesh \ -ldynamicMesh \

3
applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/options
View File

@ -23,4 +23,5 @@ LIB_LIBS = \
-linterfaceProperties \ -linterfaceProperties \
-lturbulenceModels \ -lturbulenceModels \
-lincompressibleTurbulenceModels \ -lincompressibleTurbulenceModels \
-lcompressibleTurbulenceModels -lcompressibleTurbulenceModels \
-lthermoTools

1
applications/solvers/multiphase/compressibleInterFoam/Make/options
View File

@ -26,4 +26,5 @@ EXE_LIBS = \
-linterfaceProperties \ -linterfaceProperties \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lVoFphaseCompressibleTurbulenceModels -lVoFphaseCompressibleTurbulenceModels

1
applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options
View File

@ -22,4 +22,5 @@ LIB_LIBS = \
-linterfaceProperties \ -linterfaceProperties \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lincompressibleTransportModels -lincompressibleTransportModels

1
applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
View File

@ -29,6 +29,7 @@ EXE_LIBS = \
-linterfaceProperties \ -linterfaceProperties \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lVoFphaseCompressibleTurbulenceModels \ -lVoFphaseCompressibleTurbulenceModels \
-ldynamicMesh \ -ldynamicMesh \
-ldynamicFvMesh -ldynamicFvMesh

1
applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options
View File

@ -36,6 +36,7 @@ EXE_LIBS = \
-linterfaceProperties \ -linterfaceProperties \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lVoFphaseCompressibleTurbulenceModels \ -lVoFphaseCompressibleTurbulenceModels \
-lSLGThermo \ -lSLGThermo \
-lsurfaceFilmModels \ -lsurfaceFilmModels \

1
applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options
View File

@ -36,5 +36,6 @@ EXE_LIBS = \
-linterfaceProperties \ -linterfaceProperties \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lVoFphaseCompressibleTurbulenceModels \ -lVoFphaseCompressibleTurbulenceModels \
-lgeometricVoF -lgeometricVoF

1
applications/solvers/multiphase/compressibleInterFoam/overCompressibleInterDyMFoam/Make/options
View File

@ -32,6 +32,7 @@ EXE_LIBS = \
-linterfaceProperties \ -linterfaceProperties \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lVoFphaseCompressibleTurbulenceModels \ -lVoFphaseCompressibleTurbulenceModels \
-ldynamicMesh \ -ldynamicMesh \
-ldynamicFvMesh \ -ldynamicFvMesh \

3
applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
View File

@ -21,4 +21,5 @@ EXE_LIBS = \
-lspecie \ -lspecie \
-linterfaceProperties \ -linterfaceProperties \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels -lcompressibleTurbulenceModels \
-lthermoTools

3
applications/solvers/multiphase/driftFluxFoam/Make/options
View File

@ -22,4 +22,5 @@ EXE_LIBS = \
-ldriftFluxTransportModels \ -ldriftFluxTransportModels \
-ldriftFluxRelativeVelocityModels \ -ldriftFluxRelativeVelocityModels \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels -lcompressibleTurbulenceModels \
-lthermoTools

1
applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options
View File

@ -25,6 +25,7 @@ EXE_LIBS = \
-ldynamicFvMesh \ -ldynamicFvMesh \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lcompressibleTransportModels \ -lcompressibleTransportModels \
-lradiationModels \ -lradiationModels \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \

2
applications/solvers/multiphase/icoReactingMultiphaseInterFoam/YEqns.H
View File

@ -1,5 +1,5 @@
{ {
for (phaseModel& phase : fluid.phases()) for (multiphaseInter::phaseModel& phase : fluid.phases())
{ {
PtrList<volScalarField>& Y = phase.Y(); PtrList<volScalarField>& Y = phase.Y();

14
applications/solvers/multiphase/icoReactingMultiphaseInterFoam/createFields.H
View File

@ -63,9 +63,10 @@
Info<< "Creating multiphaseSystem\n" << endl; Info<< "Creating multiphaseSystem\n" << endl;
autoPtr<multiphaseSystem> fluidPtr = multiphaseSystem::New(mesh); autoPtr<multiphaseInter::multiphaseSystem> fluidPtr =
multiphaseInter::multiphaseSystem::New(mesh);
multiphaseSystem& fluid = fluidPtr(); multiphaseInter::multiphaseSystem& fluid = fluidPtr();
if (!fluid.incompressible()) if (!fluid.incompressible())
{ {
@ -118,9 +119,12 @@
surfaceScalarField& rhoPhi = fluid.rhoPhi(); surfaceScalarField& rhoPhi = fluid.rhoPhi();
// Construct incompressible turbulence model // Construct incompressible turbulence model
autoPtr<CompressibleTurbulenceModel<multiphaseSystem>> turbulence autoPtr
<
CompressibleTurbulenceModel<multiphaseInter::multiphaseSystem>
> turbulence
( (
CompressibleTurbulenceModel<multiphaseSystem>::New CompressibleTurbulenceModel<multiphaseInter::multiphaseSystem>::New
( (
rho, rho,
U, U,
@ -129,6 +133,8 @@
) )
); );
fluid.setTurbulence(turbulence());
// Creating radiation model // Creating radiation model
autoPtr<radiation::radiationModel> radiation autoPtr<radiation::radiationModel> radiation
( (

14
applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/interfaceHeatResistance/interfaceHeatResistance.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com \\ / A nd | www.openfoam.com
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2020-2021 OpenCFD Ltd. Copyright (C) 2020-2022 OpenCFD Ltd.
Copyright (C) 2020 Henning Scheufler Copyright (C) 2020 Henning Scheufler
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -265,23 +265,13 @@ correct()
const dimensionedScalar& TSat = thermo.TSat(); const dimensionedScalar& TSat = thermo.TSat();
const dimensionedScalar T0(dimTemperature, Zero); const dimensionedScalar T0(dimTemperature, Zero);
dimensionedScalar L = mixture_.Hf2() - mixture_.Hf1(); const dimensionedScalar L(mag(mixture_.Hf2() - mixture_.Hf1()));
// interface heat resistance // interface heat resistance
mDotc_ = interfaceArea_*R_*max(TSat - T, T0)/L; mDotc_ = interfaceArea_*R_*max(TSat - T, T0)/L;
mDote_ = interfaceArea_*R_*max(T - TSat, 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 // Calculate the spread sources
dimensionedScalar D dimensionedScalar D
( (
"D", "D",

3
applications/solvers/multiphase/reactingTwoPhaseEulerFoam/Make/options
View File

@ -20,4 +20,5 @@ EXE_LIBS = \
-lsampling \ -lsampling \
-lreactingMultiphaseSystem \ -lreactingMultiphaseSystem \
-lreactingTwoPhaseSystem \ -lreactingTwoPhaseSystem \
-ltwoPhaseReactingTurbulenceModels -ltwoPhaseReactingTurbulenceModels \
-lthermoTools

1
applications/solvers/multiphase/twoPhaseEulerFoam/Make/options
View File

@ -23,6 +23,7 @@ EXE_LIBS = \
-lspecie \ -lspecie \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-lcompressibleTwoPhaseSystem \ -lcompressibleTwoPhaseSystem \
-lphaseCompressibleTurbulenceModels -lphaseCompressibleTurbulenceModels

1
applications/utilities/mesh/advanced/PDRMesh/Make/options
View File

@ -10,5 +10,6 @@ EXE_LIBS = \
-ldynamicMesh \ -ldynamicMesh \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lcompressibleTransportModels \ -lcompressibleTransportModels \
-lfluidThermophysicalModels -lfluidThermophysicalModels

1
applications/utilities/miscellaneous/foamHelp/Make/options
View File

@ -10,5 +10,6 @@ EXE_LIBS = \
-lturbulenceModels \ -lturbulenceModels \
-lincompressibleTurbulenceModels \ -lincompressibleTurbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lradiationModels \ -lradiationModels \
-lfluidThermophysicalModels -lfluidThermophysicalModels

1
applications/utilities/miscellaneous/foamHelp/helpTypes/Make/options
View File

@ -6,5 +6,6 @@ LIB_LIBS = \
-lturbulenceModels \ -lturbulenceModels \
-lincompressibleTurbulenceModels \ -lincompressibleTurbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lradiationModels \ -lradiationModels \
-lfluidThermophysicalModels -lfluidThermophysicalModels

1
applications/utilities/postProcessing/postProcess/Make/options
View File

@ -19,6 +19,7 @@ EXE_LIBS = \
-lturbulenceModels \ -lturbulenceModels \
-lincompressibleTurbulenceModels \ -lincompressibleTurbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-lcompressibleTransportModels \ -lcompressibleTransportModels \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \

1
applications/utilities/preProcessing/applyBoundaryLayer/Make/options
View File

@ -16,6 +16,7 @@ EXE_LIBS = \
-lturbulenceModels \ -lturbulenceModels \
-lincompressibleTurbulenceModels \ -lincompressibleTurbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-lcompressibleTransportModels \ -lcompressibleTransportModels \

4
applications/utilities/preProcessing/createExternalCoupledPatchGeometry/Make/options
View File

@ -7,4 +7,6 @@ EXE_LIBS = \
-lfiniteVolume \ -lfiniteVolume \
-lmeshTools \ -lmeshTools \
-ldynamicMesh \ -ldynamicMesh \
-lfieldFunctionObjects -lfieldFunctionObjects \
-lincompressibleMultiphaseSystems \
-lreactingMultiphaseSystem

1
applications/utilities/preProcessing/setTurbulenceFields/Make/options
View File

@ -16,6 +16,7 @@ EXE_LIBS = \
-lturbulenceModels \ -lturbulenceModels \
-lincompressibleTurbulenceModels \ -lincompressibleTurbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
-lthermoTools \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-lcompressibleTransportModels \ -lcompressibleTransportModels \

29
src/Allwmake
View File

@ -90,16 +90,13 @@ wmake $targetType combustionModels
wmakeLnInclude -u regionFaModels wmakeLnInclude -u regionFaModels
wmakeLnInclude -u faOptions wmakeLnInclude -u faOptions
regionModels/Allwmake $targetType $*
wmakeLnInclude -u overset
wmake $targetType overset
wmake $targetType fvOptions wmake $targetType fvOptions
wmake $targetType faOptions
wmake $targetType fvMotionSolver wmake $targetType fvMotionSolver
wmake $targetType regionFaModels
lagrangian/Allwmake $targetType $*
wmake $targetType overset
# snappyHexMesh uses overset voxelMesh # snappyHexMesh uses overset voxelMesh
mesh/Allwmake $targetType $* mesh/Allwmake $targetType $*
@ -111,15 +108,25 @@ wmake $targetType engine
conversion/Allwmake $targetType $* conversion/Allwmake $targetType $*
functionObjects/Allwmake $targetType $*
phaseSystemModels/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 lumpedPointMotion
wmake $targetType sixDoFRigidBodyMotion wmake $targetType sixDoFRigidBodyMotion
wmake $targetType sixDoFRigidBodyState wmake $targetType sixDoFRigidBodyState
wmake $targetType rigidBodyDynamics wmake $targetType rigidBodyDynamics
wmake $targetType rigidBodyMeshMotion wmake $targetType rigidBodyMeshMotion
wmake $targetType semiPermeableBaffle
wmake $targetType atmosphericModels wmake $targetType atmosphericModels
wmake $targetType optimisation/adjointOptimisation/adjoint wmake $targetType optimisation/adjointOptimisation/adjoint
@ -128,10 +135,6 @@ wmake $targetType optimisation/adjointOptimisation/adjoint
dynamicFaMesh/Allwmake $targetType $* dynamicFaMesh/Allwmake $targetType $*
# Needs access to Turbulence
wmake $targetType thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
echo ======================================== echo ========================================

19
src/TurbulenceModels/compressible/Make/files
View File

@ -1,23 +1,4 @@
compressibleTurbulenceModel.C compressibleTurbulenceModel.C
turbulentFluidThermoModels/turbulentFluidThermoModels.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 LIB = $(FOAM_LIBBIN)/libcompressibleTurbulenceModels

4
src/faOptions/Make/options
View File

@ -10,6 +10,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/thermoTools/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude
LIB_LIBS = \ LIB_LIBS = \
@ -19,4 +20,5 @@ LIB_LIBS = \
-lmeshTools \ -lmeshTools \
-lturbulenceModels \ -lturbulenceModels \
-lincompressibleTurbulenceModels \ -lincompressibleTurbulenceModels \
-lcompressibleTurbulenceModels -lcompressibleTurbulenceModels \
-lthermoTools

2
src/functionObjects/Allwmake
View File

@ -7,9 +7,9 @@ cd "${0%/*}" || exit # Run from this directory
wmake $targetType field wmake $targetType field
wmake $targetType forces wmake $targetType forces
wmake $targetType initialisation wmake $targetType initialisation
wmake $targetType lagrangian
wmake $targetType utilities wmake $targetType utilities
wmake $targetType solvers wmake $targetType solvers
wmake $targetType phaseSystems
./randomProcesses/Allwmake $targetType ./randomProcesses/Allwmake $targetType

2
src/functionObjects/field/Make/files
View File

@ -33,6 +33,8 @@ heatTransferCoeff/heatTransferCoeffModels/heatTransferCoeffModel/heatTransferCoe
heatTransferCoeff/heatTransferCoeffModels/fixedReferenceTemperature/fixedReferenceTemperature.C heatTransferCoeff/heatTransferCoeffModels/fixedReferenceTemperature/fixedReferenceTemperature.C
heatTransferCoeff/heatTransferCoeffModels/localReferenceTemperature/localReferenceTemperature.C heatTransferCoeff/heatTransferCoeffModels/localReferenceTemperature/localReferenceTemperature.C
heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C
heatTransferCoeff/reactingEulerHtcModel/reactingEulerHtcModel.C
heatTransferCoeff/multiphaseInterHtcModel/multiphaseInterHtcModel.C
limitFields/limitFields.C limitFields/limitFields.C

8
src/functionObjects/field/Make/options
View File

@ -21,7 +21,9 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/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 = \ LIB_LIBS = \
-lfiniteVolume \ -lfiniteVolume \
@ -43,4 +45,6 @@ LIB_LIBS = \
-lturbulenceModelSchemes \ -lturbulenceModelSchemes \
-lchemistryModel \ -lchemistryModel \
-lreactionThermophysicalModels \ -lreactionThermophysicalModels \
-lpairPatchAgglomeration -lpairPatchAgglomeration \
-lincompressibleMultiphaseSystems \
-lreactingMultiphaseSystem

173
src/functionObjects/field/heatTransferCoeff/multiphaseInterHtcModel/multiphaseInterHtcModel.C Normal file
View File

@ -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 <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#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::FieldField<Foam::Field, Foam::scalar>>
Foam::functionObjects::multiphaseInterHtcModel::q() const
{
const fvMesh& mesh = htcModelPtr_->mesh();
const auto& T = mesh.lookupObject<volScalarField>(htcModelPtr_->TName());
const volScalarField::Boundary& Tbf = T.boundaryField();
auto tq = tmp<FieldField<Field, scalar>>::New(Tbf.size());
auto& q = tq.ref();
forAll(q, patchi)
{
q.set(patchi, new Field<scalar>(Tbf[patchi].size(), Zero));
}
const auto* fluidPtr =
mesh.cfindObject<multiphaseInterSystem>("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<volScalarField>(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<volScalarField>(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;
}
// ************************************************************************* //

122
src/functionObjects/field/heatTransferCoeff/multiphaseInterHtcModel/multiphaseInterHtcModel.H Normal file
View File

@ -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 <http://www.gnu.org/licenses/>.
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<heatTransferCoeffModel> htcModelPtr_;
protected:
// Protected Member Functions
//- Calculate the heat transfer coefficient field
// \return true on success
virtual bool calc();
//- Calculate heat flux
tmp<FieldField<Field, scalar>> 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
// ************************************************************************* //

2
src/phaseSystemModels/reactingEuler/functionObjects/reactingEulerHtcModel/reactingEulerHtcModel.C → src/functionObjects/field/heatTransferCoeff/reactingEulerHtcModel/reactingEulerHtcModel.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com \\ / A nd | www.openfoam.com
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2020 OpenCFD Ltd. Copyright (C) 2020-2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.

8
src/phaseSystemModels/reactingEuler/functionObjects/reactingEulerHtcModel/reactingEulerHtcModel.H → src/functionObjects/field/heatTransferCoeff/reactingEulerHtcModel/reactingEulerHtcModel.H
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com \\ / A nd | www.openfoam.com
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2020 OpenCFD Ltd. Copyright (C) 2020-2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -24,7 +24,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::reactingEulerHtcModel Foam::functionObjects::reactingEulerHtcModel
Description Description
A heat transfer coefficient for reactingEuler solvers A heat transfer coefficient for reactingEuler solvers
@ -34,8 +34,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef reactingEulerHtcModel_H #ifndef Foam_functionObjects_reactingEulerHtcModel_H
#define reactingEulerHtcModel_H #define Foam_functionObjects_reactingEulerHtcModel_H
#include "HashSet.H" #include "HashSet.H"
#include "volFields.H" #include "volFields.H"

16
src/functionObjects/field/wallHeatFlux/wallHeatFlux.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2016-2017 OpenFOAM Foundation Copyright (C) 2016-2017 OpenFOAM Foundation
Copyright (C) 2016-2020 OpenCFD Ltd. Copyright (C) 2016-2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -34,6 +34,7 @@ License
#include "wallPolyPatch.H" #include "wallPolyPatch.H"
#include "turbulentFluidThermoModel.H" #include "turbulentFluidThermoModel.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "multiphaseInterSystem.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -236,6 +237,19 @@ bool Foam::functionObjects::wallHeatFlux::execute()
calcHeatFlux(thermo.alpha(), thermo.he(), wallHeatFlux); calcHeatFlux(thermo.alpha(), thermo.he(), wallHeatFlux);
} }
else if
(
foundObject<multiphaseInterSystem>
(multiphaseInterSystem::phasePropertiesName)
)
{
const auto& thermo = lookupObject<multiphaseInterSystem>
(
multiphaseInterSystem::phasePropertiesName
);
calcHeatFlux(thermo.kappaEff()(), thermo.T(), wallHeatFlux);
}
else else
{ {
FatalErrorInFunction FatalErrorInFunction

4
src/functionObjects/phaseSystems/Make/files Normal file
View File

@ -0,0 +1,4 @@
sizeDistribution/sizeDistribution.C
phaseForces/phaseForces.C
LIB = $(FOAM_LIBBIN)/libphaseFunctionObjects

0
src/phaseSystemModels/reactingEuler/functionObjects/Make/options → src/functionObjects/phaseSystems/Make/options
View File

0
src/phaseSystemModels/reactingEuler/functionObjects/phaseForces/phaseForces.C → src/functionObjects/phaseSystems/phaseForces/phaseForces.C
View File

0
src/phaseSystemModels/reactingEuler/functionObjects/phaseForces/phaseForces.H → src/functionObjects/phaseSystems/phaseForces/phaseForces.H
View File

0
src/phaseSystemModels/reactingEuler/functionObjects/sizeDistribution/sizeDistribution.C → src/functionObjects/phaseSystems/sizeDistribution/sizeDistribution.C
View File

0
src/phaseSystemModels/reactingEuler/functionObjects/sizeDistribution/sizeDistribution.H → src/functionObjects/phaseSystems/sizeDistribution/sizeDistribution.H
View File

2
src/phaseSystemModels/Allwmake
View File

@ -3,9 +3,9 @@ cd "${0%/*}" || exit # Run from this directory
. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments . ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
reactingEuler/Allwmake $targetType $*
multiphaseInter/Allwmake $targetType $* multiphaseInter/Allwmake $targetType $*
multiphaseEuler/Allwmake $targetType $* multiphaseEuler/Allwmake $targetType $*
reactingEuler/Allwmake $targetType $*
twoPhaseEuler/Allwmake $targetType $* twoPhaseEuler/Allwmake $targetType $*
twoPhaseInter/Allwmake $targetType $* twoPhaseInter/Allwmake $targetType $*

3
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/Make/files
View File

@ -7,7 +7,6 @@ $(diameter)/diameterModel/diameterModel.C
$(diameter)/constantDiameter/constantDiameter.C $(diameter)/constantDiameter/constantDiameter.C
$(diameter)/isothermalDiameter/isothermalDiameter.C $(diameter)/isothermalDiameter/isothermalDiameter.C
drag = interfacialModels/dragModels drag = interfacialModels/dragModels
$(drag)/dragModel/dragModel.C $(drag)/dragModel/dragModel.C
$(drag)/Ergun/Ergun.C $(drag)/Ergun/Ergun.C
@ -24,7 +23,7 @@ heatTransfer = interfacialModels/heatTransferModels
$(heatTransfer)/heatTransferModel/heatTransferModel.C $(heatTransfer)/heatTransferModel/heatTransferModel.C
$(heatTransfer)/RanzMarshall/RanzMarshall.C $(heatTransfer)/RanzMarshall/RanzMarshall.C
derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
alphaContactAngle/alphaContactAngleFvPatchScalarField.C
LIB = $(FOAM_LIBBIN)/libmultiphaseSystem LIB = $(FOAM_LIBBIN)/libmultiphaseSystem

4
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C → src/phaseSystemModels/multiphaseEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation Copyright (C) 2011 OpenFOAM Foundation
Copyright (C) 2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -33,6 +34,8 @@ License
namespace Foam namespace Foam
{ {
namespace multiphaseEuler
{
alphaContactAngleFvPatchScalarField::interfaceThetaProps::interfaceThetaProps alphaContactAngleFvPatchScalarField::interfaceThetaProps::interfaceThetaProps
( (
@ -142,6 +145,7 @@ makePatchTypeField
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace multiphaseEuler
} // End namespace Foam } // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

10
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H → src/phaseSystemModels/multiphaseEuler/multiphaseSystem/derivedFvPatchFields/alphaContactAngle/alphaContactAngleFvPatchScalarField.H
View File

@ -6,6 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2012 OpenFOAM Foundation Copyright (C) 2011-2012 OpenFOAM Foundation
Copyright (C) 2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -35,8 +36,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef alphaContactAngleFvPatchScalarField_H #ifndef Foam_multiphaseEuler_alphaContactAngleFvPatchScalarField_H
#define alphaContactAngleFvPatchScalarField_H #define Foam_multiphaseEuler_alphaContactAngleFvPatchScalarField_H
#include "zeroGradientFvPatchFields.H" #include "zeroGradientFvPatchFields.H"
#include "multiphaseSystem.H" #include "multiphaseSystem.H"
@ -45,6 +46,8 @@ SourceFiles
namespace Foam namespace Foam
{ {
namespace multiphaseEuler
{
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class alphaContactAngleFvPatch Declaration Class alphaContactAngleFvPatch Declaration
@ -134,7 +137,7 @@ private:
public: public:
//- Runtime type information //- Runtime type information
TypeName("alphaContactAngle"); TypeName("multiphaseEuler::alphaContactAngle");
// Constructors // Constructors
@ -208,6 +211,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace multiphaseEuler
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

9
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2015 OpenFOAM Foundation Copyright (C) 2011-2015 OpenFOAM Foundation
Copyright (C) 2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -32,6 +33,8 @@ License
namespace Foam namespace Foam
{ {
namespace multiphaseEuler
{
namespace diameterModels namespace diameterModels
{ {
defineTypeNameAndDebug(constant, 0); defineTypeNameAndDebug(constant, 0);
@ -44,11 +47,12 @@ namespace diameterModels
); );
} }
} }
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::diameterModels::constant::constant Foam::multiphaseEuler::diameterModels::constant::constant
( (
const dictionary& dict, const dictionary& dict,
const phaseModel& phase const phaseModel& phase
@ -61,7 +65,8 @@ Foam::diameterModels::constant::constant
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::tmp<Foam::volScalarField> Foam::diameterModels::constant::d() const Foam::tmp<Foam::volScalarField>
Foam::multiphaseEuler::diameterModels::constant::d() const
{ {
return tmp<Foam::volScalarField> return tmp<Foam::volScalarField>
( (

11
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2013 OpenFOAM Foundation Copyright (C) 2011-2013 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd. Copyright (C) 2020-2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -25,7 +25,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::diameterModels::constant Foam::multiphaseEuler::diameterModels::constant
Description Description
Constant dispersed-phase particle diameter model. Constant dispersed-phase particle diameter model.
@ -35,8 +35,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef diameterModels_constant_H #ifndef Foam_multiphaseEuler_diameterModels_constant_H
#define diameterModels_constant_H #define Foam_multiphaseEuler_diameterModels_constant_H
#include "diameterModel.H" #include "diameterModel.H"
@ -44,6 +44,8 @@ SourceFiles
namespace Foam namespace Foam
{ {
namespace multiphaseEuler
{
namespace diameterModels namespace diameterModels
{ {
@ -90,6 +92,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace diameterModels } // End namespace diameterModels
} // End namespace multiphaseEuler
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

10
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2013 OpenFOAM Foundation Copyright (C) 2011-2013 OpenFOAM Foundation
Copyright (C) 2019-2021 OpenCFD Ltd. Copyright (C) 2019-2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -31,15 +31,18 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{
namespace multiphaseEuler
{ {
defineTypeNameAndDebug(diameterModel, 0); defineTypeNameAndDebug(diameterModel, 0);
defineRunTimeSelectionTable(diameterModel, dictionary); defineRunTimeSelectionTable(diameterModel, dictionary);
} }
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::diameterModel::diameterModel Foam::multiphaseEuler::diameterModel::diameterModel
( (
const dictionary& dict, const dictionary& dict,
const phaseModel& phase const phaseModel& phase
@ -52,7 +55,8 @@ Foam::diameterModel::diameterModel
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
Foam::autoPtr<Foam::diameterModel> Foam::diameterModel::New Foam::autoPtr<Foam::multiphaseEuler::diameterModel>
Foam::multiphaseEuler::diameterModel::New
( (
const dictionary& dict, const dictionary& dict,
const phaseModel& phase const phaseModel& phase

11
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2013 OpenFOAM Foundation Copyright (C) 2011-2013 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd. Copyright (C) 2020-2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -25,7 +25,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::diameterModel Foam::multiphaseEuler::diameterModel
Description Description
Abstract base-class for dispersed-phase particle diameter models. Abstract base-class for dispersed-phase particle diameter models.
@ -35,8 +35,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef diameterModel_H #ifndef Foam_multiphaseEuler_diameterModel_H
#define diameterModel_H #define Foam_multiphaseEuler_diameterModel_H
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -46,6 +46,8 @@ SourceFiles
namespace Foam namespace Foam
{ {
namespace multiphaseEuler
{
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class diameterModel Declaration Class diameterModel Declaration
@ -115,6 +117,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam } // End namespace Foam
} // End namespace multiphaseEuler
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

9
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2015 OpenFOAM Foundation Copyright (C) 2011-2015 OpenFOAM Foundation
Copyright (C) 2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -32,6 +33,8 @@ License
namespace Foam namespace Foam
{ {
namespace multiphaseEuler
{
namespace diameterModels namespace diameterModels
{ {
defineTypeNameAndDebug(isothermal, 0); defineTypeNameAndDebug(isothermal, 0);
@ -44,11 +47,12 @@ namespace diameterModels
); );
} }
} }
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::diameterModels::isothermal::isothermal Foam::multiphaseEuler::diameterModels::isothermal::isothermal
( (
const dictionary& dict, const dictionary& dict,
const phaseModel& phase const phaseModel& phase
@ -62,7 +66,8 @@ Foam::diameterModels::isothermal::isothermal
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::tmp<Foam::volScalarField> Foam::diameterModels::isothermal::d() const Foam::tmp<Foam::volScalarField>
Foam::multiphaseEuler::diameterModels::isothermal::d() const
{ {
const volScalarField& p = phase_.U().db().lookupObject<volScalarField> const volScalarField& p = phase_.U().db().lookupObject<volScalarField>
( (

11
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2013 OpenFOAM Foundation Copyright (C) 2011-2013 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd. Copyright (C) 2020-2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -25,7 +25,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::diameterModels::isothermal Foam::multiphaseEuler::diameterModels::isothermal
Description Description
Isothermal dispersed-phase particle diameter model. Isothermal dispersed-phase particle diameter model.
@ -35,8 +35,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef diameterModels_isothermal_H #ifndef Foam_multiphaseEuler_diameterModels_isothermal_H
#define diameterModels_isothermal_H #define Foam_multiphaseEuler_diameterModels_isothermal_H
#include "diameterModel.H" #include "diameterModel.H"
@ -44,6 +44,8 @@ SourceFiles
namespace Foam namespace Foam
{ {
namespace multiphaseEuler
{
namespace diameterModels namespace diameterModels
{ {
@ -93,6 +95,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace diameterModels } // End namespace diameterModels
} // End namespace multiphaseEuler
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

10
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2012 OpenFOAM Foundation Copyright (C) 2011-2012 OpenFOAM Foundation
Copyright (C) 2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -32,6 +33,8 @@ License
namespace Foam namespace Foam
{ {
namespace multiphaseEuler
{
namespace dragModels namespace dragModels
{ {
defineTypeNameAndDebug(Ergun, 0); defineTypeNameAndDebug(Ergun, 0);
@ -44,11 +47,12 @@ namespace dragModels
); );
} }
} }
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::dragModels::Ergun::Ergun Foam::multiphaseEuler::dragModels::Ergun::Ergun
( (
const dictionary& interfaceDict, const dictionary& interfaceDict,
const phaseModel& phase1, const phaseModel& phase1,
@ -61,13 +65,13 @@ Foam::dragModels::Ergun::Ergun
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::dragModels::Ergun::~Ergun() Foam::multiphaseEuler::dragModels::Ergun::~Ergun()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::tmp<Foam::volScalarField> Foam::dragModels::Ergun::K Foam::tmp<Foam::volScalarField> Foam::multiphaseEuler::dragModels::Ergun::K
( (
const volScalarField& Ur const volScalarField& Ur
) const ) const

10
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.H
View File

@ -6,6 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation Copyright (C) 2011 OpenFOAM Foundation
Copyright (C) 2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -24,7 +25,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::dragModels::Ergun Foam::multiphaseEuler::dragModels::Ergun
Description Description
H, Enwald, E. Peirano, A-E Almstedt H, Enwald, E. Peirano, A-E Almstedt
@ -37,8 +38,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef Ergun_H #ifndef Foam_multiphaseEuler_dragModels_Ergun_H
#define Ergun_H #define Foam_multiphaseEuler_dragModels_Ergun_H
#include "dragModel.H" #include "dragModel.H"
@ -46,6 +47,8 @@ SourceFiles
namespace Foam namespace Foam
{ {
namespace multiphaseEuler
{
namespace dragModels namespace dragModels
{ {
@ -88,6 +91,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace dragModels } // End namespace dragModels
} // End namespace multiphaseEuler
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

10
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2012 OpenFOAM Foundation Copyright (C) 2011-2012 OpenFOAM Foundation
Copyright (C) 2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -32,6 +33,8 @@ License
namespace Foam namespace Foam
{ {
namespace multiphaseEuler
{
namespace dragModels namespace dragModels
{ {
defineTypeNameAndDebug(Gibilaro, 0); defineTypeNameAndDebug(Gibilaro, 0);
@ -44,11 +47,12 @@ namespace dragModels
); );
} }
} }
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::dragModels::Gibilaro::Gibilaro Foam::multiphaseEuler::dragModels::Gibilaro::Gibilaro
( (
const dictionary& interfaceDict, const dictionary& interfaceDict,
const phaseModel& phase1, const phaseModel& phase1,
@ -61,13 +65,13 @@ Foam::dragModels::Gibilaro::Gibilaro
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::dragModels::Gibilaro::~Gibilaro() Foam::multiphaseEuler::dragModels::Gibilaro::~Gibilaro()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::tmp<Foam::volScalarField> Foam::dragModels::Gibilaro::K Foam::tmp<Foam::volScalarField> Foam::multiphaseEuler::dragModels::Gibilaro::K
( (
const volScalarField& Ur const volScalarField& Ur
) const ) const

10
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.H
View File

@ -6,6 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation Copyright (C) 2011 OpenFOAM Foundation
Copyright (C) 2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -24,7 +25,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::dragModels::Gibilaro Foam::multiphaseEuler::dragModels::Gibilaro
Description Description
H, Enwald, E. Peirano, A-E Almstedt H, Enwald, E. Peirano, A-E Almstedt
@ -37,8 +38,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef Gibilaro_H #ifndef Foam_multiphaseEuler_dragModels_Gibilaro_H
#define Gibilaro_H #define Foam_multiphaseEuler_dragModels_Gibilaro_H
#include "dragModel.H" #include "dragModel.H"
@ -46,6 +47,8 @@ SourceFiles
namespace Foam namespace Foam
{ {
namespace multiphaseEuler
{
namespace dragModels namespace dragModels
{ {
@ -88,6 +91,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace dragModels } // End namespace dragModels
} // End namespace multiphaseEuler
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

11
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -32,6 +33,8 @@ License
namespace Foam namespace Foam
{ {
namespace multiphaseEuler
{
namespace dragModels namespace dragModels
{ {
defineTypeNameAndDebug(GidaspowErgunWenYu, 0); defineTypeNameAndDebug(GidaspowErgunWenYu, 0);
@ -44,11 +47,12 @@ namespace dragModels
); );
} }
} }
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::dragModels::GidaspowErgunWenYu::GidaspowErgunWenYu Foam::multiphaseEuler::dragModels::GidaspowErgunWenYu::GidaspowErgunWenYu
( (
const dictionary& interfaceDict, const dictionary& interfaceDict,
const phaseModel& phase1, const phaseModel& phase1,
@ -61,13 +65,14 @@ Foam::dragModels::GidaspowErgunWenYu::GidaspowErgunWenYu
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::dragModels::GidaspowErgunWenYu::~GidaspowErgunWenYu() Foam::multiphaseEuler::dragModels::GidaspowErgunWenYu::~GidaspowErgunWenYu()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::tmp<Foam::volScalarField> Foam::dragModels::GidaspowErgunWenYu::K Foam::tmp<Foam::volScalarField>
Foam::multiphaseEuler::dragModels::GidaspowErgunWenYu::K
( (
const volScalarField& Ur const volScalarField& Ur
) const ) const

10
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H
View File

@ -6,6 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation Copyright (C) 2011 OpenFOAM Foundation
Copyright (C) 2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -24,7 +25,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::dragModels::GidaspowErgunWenYu Foam::multiphaseEuler::dragModels::GidaspowErgunWenYu
Description Description
D. Gidaspow, Multiphase flow and fluidization, D. Gidaspow, Multiphase flow and fluidization,
@ -35,8 +36,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef GidaspowErgunWenYu_H #ifndef Foam_multiphaseEuler_dragModels_GidaspowErgunWenYu_H
#define GidaspowErgunWenYu_H #define Foam_multiphaseEuler_dragModels_GidaspowErgunWenYu_H
#include "dragModel.H" #include "dragModel.H"
@ -44,6 +45,8 @@ SourceFiles
namespace Foam namespace Foam
{ {
namespace multiphaseEuler
{
namespace dragModels namespace dragModels
{ {
@ -86,6 +89,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace dragModels } // End namespace dragModels
} // End namespace multiphaseEuler
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

13
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -32,6 +33,8 @@ License
namespace Foam namespace Foam
{ {
namespace multiphaseEuler
{
namespace dragModels namespace dragModels
{ {
defineTypeNameAndDebug(GidaspowSchillerNaumann, 0); defineTypeNameAndDebug(GidaspowSchillerNaumann, 0);
@ -44,11 +47,13 @@ namespace dragModels
); );
} }
} }
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::dragModels::GidaspowSchillerNaumann::GidaspowSchillerNaumann Foam::multiphaseEuler::dragModels::GidaspowSchillerNaumann::
GidaspowSchillerNaumann
( (
const dictionary& interfaceDict, const dictionary& interfaceDict,
const phaseModel& phase1, const phaseModel& phase1,
@ -61,13 +66,15 @@ Foam::dragModels::GidaspowSchillerNaumann::GidaspowSchillerNaumann
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::dragModels::GidaspowSchillerNaumann::~GidaspowSchillerNaumann() Foam::multiphaseEuler::dragModels::GidaspowSchillerNaumann::
~GidaspowSchillerNaumann()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::tmp<Foam::volScalarField> Foam::dragModels::GidaspowSchillerNaumann::K Foam::tmp<Foam::volScalarField>
Foam::multiphaseEuler::dragModels::GidaspowSchillerNaumann::K
( (
const volScalarField& Ur const volScalarField& Ur
) const ) const

10
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H
View File

@ -6,6 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation Copyright (C) 2011 OpenFOAM Foundation
Copyright (C) 2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -24,7 +25,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::dragModels::GidaspowSchillerNaumann Foam::multiphaseEuler::dragModels::GidaspowSchillerNaumann
Description Description
H, Enwald, E. Peirano, A-E Almstedt H, Enwald, E. Peirano, A-E Almstedt
@ -44,8 +45,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef GidaspowSchillerNaumann_H #ifndef Foam_multiphaseEuler_dragModels_GidaspowSchillerNaumann_H
#define GidaspowSchillerNaumann_H #define Foam_multiphaseEuler_dragModels_GidaspowSchillerNaumann_H
#include "dragModel.H" #include "dragModel.H"
@ -53,6 +54,8 @@ SourceFiles
namespace Foam namespace Foam
{ {
namespace multiphaseEuler
{
namespace dragModels namespace dragModels
{ {
@ -95,6 +98,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace dragModels } // End namespace dragModels
} // End namespace multiphaseEuler
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

11
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -32,6 +33,8 @@ License
namespace Foam namespace Foam
{ {
namespace multiphaseEuler
{
namespace dragModels namespace dragModels
{ {
defineTypeNameAndDebug(SchillerNaumann, 0); defineTypeNameAndDebug(SchillerNaumann, 0);
@ -44,11 +47,12 @@ namespace dragModels
); );
} }
} }
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::dragModels::SchillerNaumann::SchillerNaumann Foam::multiphaseEuler::dragModels::SchillerNaumann::SchillerNaumann
( (
const dictionary& interfaceDict, const dictionary& interfaceDict,
const phaseModel& phase1, const phaseModel& phase1,
@ -61,13 +65,14 @@ Foam::dragModels::SchillerNaumann::SchillerNaumann
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::dragModels::SchillerNaumann::~SchillerNaumann() Foam::multiphaseEuler::dragModels::SchillerNaumann::~SchillerNaumann()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::tmp<Foam::volScalarField> Foam::dragModels::SchillerNaumann::K Foam::tmp<Foam::volScalarField>
Foam::multiphaseEuler::dragModels::SchillerNaumann::K
( (
const volScalarField& Ur const volScalarField& Ur
) const ) const

10
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H
View File

@ -6,6 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation Copyright (C) 2011 OpenFOAM Foundation
Copyright (C) 2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -24,7 +25,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::dragModels::SchillerNaumann Foam::multiphaseEuler::dragModels::SchillerNaumann
Description Description
@ -33,8 +34,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef SchillerNaumann_H #ifndef Foam_multiphaseEuler_dragModels_SchillerNaumann_H
#define SchillerNaumann_H #define Foam_multiphaseEuler_dragModels_SchillerNaumann_H
#include "dragModel.H" #include "dragModel.H"
@ -42,6 +43,8 @@ SourceFiles
namespace Foam namespace Foam
{ {
namespace multiphaseEuler
{
namespace dragModels namespace dragModels
{ {
@ -84,6 +87,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace dragModels } // End namespace dragModels
} // End namespace multiphaseEuler
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

11
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -32,6 +33,8 @@ License
namespace Foam namespace Foam
{ {
namespace multiphaseEuler
{
namespace dragModels namespace dragModels
{ {
defineTypeNameAndDebug(SyamlalOBrien, 0); defineTypeNameAndDebug(SyamlalOBrien, 0);
@ -44,11 +47,12 @@ namespace dragModels
); );
} }
} }
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::dragModels::SyamlalOBrien::SyamlalOBrien Foam::multiphaseEuler::dragModels::SyamlalOBrien::SyamlalOBrien
( (
const dictionary& interfaceDict, const dictionary& interfaceDict,
const phaseModel& phase1, const phaseModel& phase1,
@ -61,13 +65,14 @@ Foam::dragModels::SyamlalOBrien::SyamlalOBrien
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::dragModels::SyamlalOBrien::~SyamlalOBrien() Foam::multiphaseEuler::dragModels::SyamlalOBrien::~SyamlalOBrien()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::tmp<Foam::volScalarField> Foam::dragModels::SyamlalOBrien::K Foam::tmp<Foam::volScalarField>
Foam::multiphaseEuler::dragModels::SyamlalOBrien::K
( (
const volScalarField& Ur const volScalarField& Ur
) const ) const

10
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H
View File

@ -6,6 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation Copyright (C) 2011 OpenFOAM Foundation
Copyright (C) 2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -24,7 +25,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::dragModels::SyamlalOBrien Foam::multiphaseEuler::dragModels::SyamlalOBrien
Description Description
Syamlal, M., Rogers, W. and O'Brien, T. J. (1993) MFIX documentation, Syamlal, M., Rogers, W. and O'Brien, T. J. (1993) MFIX documentation,
@ -36,8 +37,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef SyamlalOBrien_H #ifndef Foam_multiphaseEuler_dragModels_SyamlalOBrien_H
#define SyamlalOBrien_H #define Foam_multiphaseEuler_dragModels_SyamlalOBrien_H
#include "dragModel.H" #include "dragModel.H"
@ -45,6 +46,8 @@ SourceFiles
namespace Foam namespace Foam
{ {
namespace multiphaseEuler
{
namespace dragModels namespace dragModels
{ {
@ -87,6 +90,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace dragModels } // End namespace dragModels
} // End namespace multiphaseEuler
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

10
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -32,6 +33,8 @@ License
namespace Foam namespace Foam
{ {
namespace multiphaseEuler
{
namespace dragModels namespace dragModels
{ {
defineTypeNameAndDebug(WenYu, 0); defineTypeNameAndDebug(WenYu, 0);
@ -44,11 +47,12 @@ namespace dragModels
); );
} }
} }
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::dragModels::WenYu::WenYu Foam::multiphaseEuler::dragModels::WenYu::WenYu
( (
const dictionary& interfaceDict, const dictionary& interfaceDict,
const phaseModel& phase1, const phaseModel& phase1,
@ -61,13 +65,13 @@ Foam::dragModels::WenYu::WenYu
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::dragModels::WenYu::~WenYu() Foam::multiphaseEuler::dragModels::WenYu::~WenYu()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::tmp<Foam::volScalarField> Foam::dragModels::WenYu::K Foam::tmp<Foam::volScalarField> Foam::multiphaseEuler::dragModels::WenYu::K
( (
const volScalarField& Ur const volScalarField& Ur
) const ) const

10
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.H
View File

@ -6,6 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation Copyright (C) 2011 OpenFOAM Foundation
Copyright (C) 2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -24,7 +25,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::dragModels::WenYu Foam::multiphaseEuler::dragModels::WenYu
Description Description
H, Enwald, E. Peirano, A-E Almstedt H, Enwald, E. Peirano, A-E Almstedt
@ -47,8 +48,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef WenYu_H #ifndef Foam_multiphaseEuler_dragModels_WenYu_H
#define WenYu_H #define Foam_multiphaseEuler_dragModels_WenYu_H
#include "dragModel.H" #include "dragModel.H"
@ -56,6 +57,8 @@ SourceFiles
namespace Foam namespace Foam
{ {
namespace multiphaseEuler
{
namespace dragModels namespace dragModels
{ {
@ -98,6 +101,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace dragModels } // End namespace dragModels
} // End namespace multiphaseEuler
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

9
src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation Copyright (C) 2011 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd. Copyright (C) 2020-2022 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -33,6 +33,8 @@ License
namespace Foam namespace Foam
{ {
namespace multiphaseEuler
{
namespace dragModels namespace dragModels
{ {
defineTypeNameAndDebug(blended, 0); defineTypeNameAndDebug(blended, 0);
@ -45,11 +47,12 @@ namespace dragModels
); );
} }
} }
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::dragModels::blended::blended Foam::multiphaseEuler::dragModels::blended::blended
( (
const dictionary& interfaceDict, const dictionary& interfaceDict,
const phaseModel& phase1, const phaseModel& phase1,
@ -64,7 +67,7 @@ Foam::dragModels::blended::blended
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::tmp<Foam::volScalarField> Foam::dragModels::blended::K Foam::tmp<Foam::volScalarField> Foam::multiphaseEuler::dragModels::blended::K
( (
const volScalarField& Ur const volScalarField& Ur
) const ) const

Some files were not shown because too many files have changed in this diff Show More