songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENH: thermoTools: new library for thermophysics tools

Browse Source 
thermoTools is a relocation of various existing tools:

- src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/
- src/semiPermeableBaffle/derivedFvPatchFields/
- src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/

ENH: Allwmake: reordering various compilation steps

Co-authored-by: Kutalmis Bercin <kutalmis.bercin@esi-group.com>
This commit is contained in:
sergio 2022-06-14 13:42:00 +01:00 committed by Kutalmis Bercin
parent e96990c8bf
commit 9a80d0d5ef
105 changed files with 150 additions and 87 deletions
Show Stats 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 \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
-lthermoTools \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lreactionThermophysicalModels \

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -19,5 +19,6 @@ EXE_LIBS = \
-lrhoCentralFoam \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
-lthermoTools \
-ldynamicFvMesh \
-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)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude
EXE_LIBS = \
-lfiniteVolume \
@ -17,4 +17,5 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-lturbulenceModels \
-lcompressibleTurbulenceModels
-lcompressibleTurbulenceModels \
-lthermoTools

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

29
src/Allwmake
View File

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

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

@ -1,23 +1,4 @@
compressibleTurbulenceModel.C
turbulentFluidThermoModels/turbulentFluidThermoModels.C
BCs = turbulentFluidThermoModels/derivedFvPatchFields
$(BCs)/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C
$(BCs)/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
$(BCs)/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
$(BCs)/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
$(BCs)/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
$(BCs)/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
$(BCs)/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
$(BCs)/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
$(BCs)/temperatureCoupledBase/temperatureCoupledBase.C
$(BCs)/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
$(BCs)/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
$(BCs)/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
$(BCs)/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
$(BCs)/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
LIB = $(FOAM_LIBBIN)/libcompressibleTurbulenceModels

4
src/faOptions/Make/options
View File

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

1
src/functionObjects/Allwmake
View File

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

2
src/phaseSystemModels/Allwmake
View File

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

4
src/regionModels/regionCoupling/Make/options
View File

@ -14,6 +14,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/thermoTools/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/pyrolysisModels/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
@ -28,4 +29,5 @@ LIB_LIBS = \
-lreactionThermophysicalModels \
-lSLGThermo \
-lturbulenceModels \
-lcompressibleTurbulenceModels
-lcompressibleTurbulenceModels \
-lthermoTools

2
src/regionModels/thermalBaffleModels/Make/options
View File

@ -8,6 +8,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/thermoTools/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/mesh/extrudeModel/lnInclude
@ -19,5 +20,6 @@ LIB_LIBS = \
-lsolidThermo \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
-lthermoTools \
-lradiationModels \
-ldynamicMesh

4
src/semiPermeableBaffle/Make/files
View File

@ -1,4 +0,0 @@
derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
derivedFvPatchFields/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C
LIB = $(FOAM_LIBBIN)/libsemiPermeableBaffle

17
src/semiPermeableBaffle/Make/options
View File

@ -1,17 +0,0 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude
LIB_LIBS = \
-lfiniteVolume \
-lmeshTools \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
-lreactionThermophysicalModels \
-lturbulenceModels

24
src/thermoTools/Make/files Normal file
View File

@ -0,0 +1,24 @@
BCs = derivedFvPatchFields
$(BCs)/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
$(BCs)/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C
$(BCs)/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
$(BCs)/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C
$(BCs)/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
$(BCs)/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
$(BCs)/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
$(BCs)/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
$(BCs)/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
$(BCs)/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
$(BCs)/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
$(BCs)/temperatureCoupledBase/temperatureCoupledBase.C
$(BCs)/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
$(BCs)/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
$(BCs)/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
$(BCs)/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
$(BCs)/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
LIB = $(FOAM_LIBBIN)/libthermoTools

30
src/thermoTools/Make/options Normal file
View File

@ -0,0 +1,30 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/regionCoupled/lnInclude \
-I$(LIB_SRC)/phaseSystemModels/multiphaseInter/phasesSystem/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude
LIB_LIBS = \
-lcompressibleTransportModels \
-lfiniteVolume \
-lmeshTools \
-lradiationModels \
-lfluidThermophysicalModels \
-lsolidThermo \
-lsolidSpecie \
-lturbulenceModels \
-lspecie \
-lcompressibleTurbulenceModels \
-lturbulenceModels \
-lreactionThermophysicalModels \
-lincompressibleMultiphaseSystems

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C → src/thermoTools/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H → src/thermoTools/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.H
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C → src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H → src/thermoTools/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.H
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C → src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.C
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.H → src/thermoTools/derivedFvPatchFields/fixedIncidentRadiation/fixedIncidentRadiationFvPatchScalarField.H
View File

0
src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C → src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
View File

0
src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H → src/thermoTools/derivedFvPatchFields/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C → src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.C
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.H → src/thermoTools/derivedFvPatchFields/lumpedMassWallTemperature/lumpedMassWallTemperatureFvPatchScalarField.H
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C → src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.H → src/thermoTools/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.H
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C → src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H → src/thermoTools/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H
View File

0
src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C → src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.C
View File

0
src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.H → src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleMassFraction/semiPermeableBaffleMassFractionFvPatchScalarField.H
View File

0
src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C → src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.C
View File

0
src/semiPermeableBaffle/derivedFvPatchFields/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.H → src/thermoTools/derivedFvPatchFields/semiPermeableBaffle/semiPermeableBaffleVelocity/semiPermeableBaffleVelocityFvPatchVectorField.H
View File

10
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C → src/thermoTools/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2017-2021 OpenCFD Ltd.
Copyright (C) 2017-2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -31,6 +31,7 @@ License
#include "fluidThermo.H"
#include "solidThermo.H"
#include "turbulentFluidThermoModel.H"
#include "multiphaseInterSystem.H"
// * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * * * //
@ -255,11 +256,14 @@ Foam::tmp<Foam::scalarField> Foam::temperatureCoupledBase::kappa
{
const auto* ptr =
mesh.cfindObject<basicThermo>("phaseProperties");
mesh.cfindObject<multiphaseInterSystem>
(
multiphaseInterSystem::phasePropertiesName
);
if (ptr)
{
return ptr->kappa(patchi);
return ptr->kappaEff(patchi);
}
}

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H → src/thermoTools/derivedFvPatchFields/temperatureCoupledBase/temperatureCoupledBase.H
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C → src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H → src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.H
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C → src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.C
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H → src/thermoTools/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarFields.H
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C → src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H → src/thermoTools/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.H
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H → src/thermoTools/derivedFvPatchFields/turbulenceBoundaryConditionsDoc.H
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C → src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H → src/thermoTools/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C → src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H → src/thermoTools/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.H
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C → src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H → src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.H
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C → src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
View File

0
src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H → src/thermoTools/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
View File

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