zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MomentumTransportModels: Library builds of multiphase models

Browse Source 
The MomentumTransportModels library now builds of a standard set of
phase-incompressible and phase-compressible models. This replaces most
solver-specific builds of these models.

This has been made possible by the addition of a new
"dynamicTransportModel" interface, from which all transport classes used
by the momentum transport models now derive. For the purpose of
disambiguation, the old "transportModel" has also been renamed
"kinematicTransportModel".

This change has been made in order to create a consistent definition of
phase-incompressible and phase-compressible MomentumTransportModels,
which can then be looked up by functionObjects, fvModels, and similar.

Some solvers still build specific momentum transport models, but these
are now in addition to the standard set. The solver does not build all
the models it uses.

There are also corresponding centralised builds of phase dependent
ThermophysicalTransportModels.
This commit is contained in:
Will Bainbridge
2021-03-25 11:04:09 +00:00
parent 227734ddf8
commit 8a5ee8aac1
269 changed files with 1509 additions and 1181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,13 +20,14 @@ EXE_INC = \
-IPDRModels/turbulence/PDRkEpsilon \
-IlaminarFlameSpeed/SCOPE \
-I$(LIB_SRC)/engine/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
-I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
@ -40,7 +41,7 @@ EXE_LIBS = \
-lreactionThermophysicalModels \
-lspecie \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lthermophysicalTransportModels \
-llaminarFlameSpeedModels \
-lfiniteVolume \

2
applications/solvers/combustion/PDRFoam/PDRFoam.C
View File

@ -69,7 +69,7 @@ Description
#include "fvCFD.H"
#include "psiuReactionThermo.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "fluidThermophysicalTransportModel.H"
#include "laminarFlameSpeed.H"
#include "XiModel.H"

4
applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -58,7 +58,7 @@ Description
#include "fvCFD.H"
#include "dynamicFvMesh.H"
#include "psiuReactionThermo.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "laminarFlameSpeed.H"
#include "XiModel.H"
#include "PDRDragModel.H"

4
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -38,7 +38,7 @@ SourceFiles
#include "IOdictionary.H"
#include "psiuReactionThermo.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "multivariateSurfaceInterpolationScheme.H"
#include "runTimeSelectionTables.H"

6
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -50,7 +50,7 @@ PDRkEpsilon::PDRkEpsilon
const volVectorField& U,
const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi,
const fluidThermo& thermophysicalModel,
const dynamicTransportModel& transport,
const word& modelName
)
:
@ -61,7 +61,7 @@ PDRkEpsilon::PDRkEpsilon
U,
phi,
phi,
thermophysicalModel,
transport,
modelName
),

6
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -61,7 +61,7 @@ SourceFiles
#define compressible_PDRkEpsilon_H
#include "kEpsilon.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -102,7 +102,7 @@ public:
const volVectorField& U,
const surfaceScalarField& alphaRhoPhi,
const surfaceScalarField& phi,
const fluidThermo& thermophysicalModel,
const dynamicTransportModel& transport,
const word& modelName = typeName
);

4
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -43,7 +43,7 @@ SourceFiles
#include "IOdictionary.H"
#include "psiuReactionThermo.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -40,7 +40,7 @@ SourceFiles
#include "IOdictionary.H"
#include "psiuReactionThermo.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -92,7 +92,7 @@ SourceFiles
#include "IOdictionary.H"
#include "psiuReactionThermo.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "multivariateSurfaceInterpolationScheme.H"
#include "fvcDiv.H"
#include "runTimeSelectionTables.H"

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

@ -1,5 +1,6 @@
EXE_INC = \
-I$(LIB_SRC)/engine/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
@ -14,7 +15,7 @@ EXE_INC = \
EXE_LIBS = \
-lengine \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lthermophysicalTransportModels \
-lfluidThermophysicalModels \
-lreactionThermophysicalModels \

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

@ -4,6 +4,7 @@ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/engine/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
@ -20,7 +21,7 @@ EXE_LIBS = \
-lmeshTools \
-lengine \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lthermophysicalTransportModels \
-lfluidThermophysicalModels \
-lreactionThermophysicalModels \

2
applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C
View File

@ -52,7 +52,7 @@ Description
#include "engineTime.H"
#include "engineMesh.H"
#include "psiuReactionThermo.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "fluidThermophysicalTransportModel.H"
#include "laminarFlameSpeed.H"
#include "ignition.H"

2
applications/solvers/combustion/XiFoam/XiFoam.C
View File

@ -51,7 +51,7 @@ Description
#include "fvCFD.H"
#include "psiuReactionThermo.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "fluidThermophysicalTransportModel.H"
#include "laminarFlameSpeed.H"
#include "ignition.H"

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

@ -1,4 +1,5 @@
EXE_INC = \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \

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

@ -4,6 +4,7 @@ EXE_INC = \
-I../XiFoam \
-I../../compressible/rhoPimpleFoam \
-I$(LIB_SRC)/engine/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
@ -18,7 +19,7 @@ EXE_LIBS = \
-lengine \
-lfluidThermophysicalModels \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lthermophysicalTransportModels \
-lspecie \
-lfiniteVolume \

2
applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
View File

@ -33,7 +33,7 @@ Description
#include "engineTime.H"
#include "engineMesh.H"
#include "psiThermo.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "fluidThermophysicalTransportModel.H"
#include "OFstream.H"
#include "fvModels.H"

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

@ -7,6 +7,7 @@ EXE_INC = \
-I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
-I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \
-I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
@ -26,7 +27,7 @@ EXE_LIBS = \
-lmeshTools \
-lsampling \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lthermophysicalTransportModels \
-lfluidReactionThermophysicalTransportModels \
-lspecie \

2
applications/solvers/combustion/fireFoam/fireFoam.C
View File

@ -31,7 +31,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "fluidReactionThermophysicalTransportModel.H"
#include "parcelCloudList.H"
#include "surfaceFilmModel.H"

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

@ -3,6 +3,7 @@ EXE_INC = \
-I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
-I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
-I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
@ -23,7 +24,7 @@ EXE_LIBS = \
-lcombustionModels \
-lreactionThermophysicalModels \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lthermophysicalTransportModels \
-lfluidReactionThermophysicalTransportModels \
-lfiniteVolume \

3
applications/solvers/combustion/reactingFoam/buoyantReactingFoam/Make/options
View File

@ -9,6 +9,7 @@ EXE_INC = \
-I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
-I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
-I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
@ -24,7 +25,7 @@ EXE_LIBS = \
-lmeshTools \
-lsampling \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lthermophysicalTransportModels \
-lfluidReactionThermophysicalTransportModels \
-lreactionThermophysicalModels \

2
applications/solvers/combustion/reactingFoam/buoyantReactingFoam/buoyantReactingFoam.C
View File

@ -33,7 +33,7 @@ Description
#include "fvCFD.H"
#include "fluidReactionThermo.H"
#include "combustionModel.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "fluidReactionThermophysicalTransportModel.H"
#include "multivariateScheme.H"
#include "pimpleControl.H"

2
applications/solvers/combustion/reactingFoam/reactingFoam.C
View File

@ -33,7 +33,7 @@ Description
#include "dynamicFvMesh.H"
#include "fluidReactionThermo.H"
#include "combustionModel.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "fluidReactionThermophysicalTransportModel.H"
#include "multivariateScheme.H"
#include "pimpleControl.H"

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

@ -1,5 +1,6 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude

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

@ -1,6 +1,7 @@
EXE_INC = \
-IBCs/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
@ -17,7 +18,7 @@ EXE_LIBS = \
-lspecie \
-lrhoCentralFoam \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lthermophysicalTransportModels \
-ldynamicFvMesh \
-ltopoChangerFvMesh \

4
applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -33,7 +33,7 @@ Description
#include "fvCFD.H"
#include "dynamicFvMesh.H"
#include "psiThermo.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "fluidThermophysicalTransportModel.H"
#include "fixedRhoFvPatchScalarField.H"
#include "directionInterpolate.H"

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

@ -1,4 +1,5 @@
EXE_INC = \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
@ -13,7 +14,7 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lthermophysicalTransportModels \
-lfiniteVolume \
-ldynamicFvMesh \

2
applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
View File

@ -36,7 +36,7 @@ Description
#include "fvCFD.H"
#include "dynamicFvMesh.H"
#include "fluidThermo.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "fluidThermophysicalTransportModel.H"
#include "pimpleControl.H"
#include "pressureControl.H"

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

@ -1,4 +1,5 @@
EXE_INC = \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
@ -12,7 +13,7 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lthermophysicalTransportModels \
-lfiniteVolume \
-lsampling \

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

@ -1,6 +1,7 @@
EXE_INC = \
-I. \
-I.. \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
@ -14,7 +15,7 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lthermophysicalTransportModels \
-lfiniteVolume \
-lsampling \

2
applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
View File

@ -32,7 +32,7 @@ Description
#include "fvCFD.H"
#include "fluidThermo.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "fluidThermophysicalTransportModel.H"
#include "simpleControl.H"
#include "pressureControl.H"

2
applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
View File

@ -31,7 +31,7 @@ Description
#include "fvCFD.H"
#include "fluidThermo.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "fluidThermophysicalTransportModel.H"
#include "simpleControl.H"
#include "pressureControl.H"

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

@ -1,6 +1,7 @@
EXE_INC = \
-I. \
-I../../compressible/rhoPimpleFoam \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
@ -15,7 +16,7 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lthermophysicalTransportModels \
-lfiniteVolume \
-ldynamicFvMesh \

2
applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
View File

@ -37,7 +37,7 @@ Description
#include "fvCFD.H"
#include "dynamicFvMesh.H"
#include "fluidThermo.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "fluidThermophysicalTransportModel.H"
#include "pimpleControl.H"
#include "pressureControl.H"

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

@ -3,6 +3,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/cfdTools \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
@ -18,5 +19,5 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lmeshTools

2
applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
View File

@ -31,7 +31,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "fluidThermophysicalTransportModel.H"
#include "simpleControl.H"
#include "pressureControl.H"

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

@ -9,6 +9,7 @@ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/finiteVolume/cfdTools \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
@ -32,7 +33,7 @@ EXE_LIBS = \
-lODE \
-lcombustionModels \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lthermophysicalTransportModels \
-lfluidReactionThermophysicalTransportModels \
-lmeshTools \

2
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
View File

@ -32,7 +32,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "fluidReactionThermophysicalTransportModel.H"
#include "fluidReactionThermo.H"
#include "combustionModel.H"

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

@ -2,6 +2,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
@ -16,5 +17,5 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lthermophysicalTransportModels

2
applications/solvers/heatTransfer/thermoFoam/thermoFoam.C
View File

@ -31,7 +31,7 @@ Description
#include "fvCFD.H"
#include "fluidThermo.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "fluidThermophysicalTransportModel.H"
#include "LESModel.H"
#include "fvModels.H"

2
applications/solvers/incompressible/adjointShapeOptimizationFoam/Make/options
View File

@ -11,7 +11,7 @@ EXE_INC = \
EXE_LIBS = \
-lmomentumTransportModels \
-lincompressibleMomentumTransportModels \
-lincompressibleTransportModels \
-ltransportModels \
-lfiniteVolume \
-lmeshTools \
-lfvModels \

2
applications/solvers/incompressible/boundaryFoam/Make/options
View File

@ -9,7 +9,7 @@ EXE_INC = \
EXE_LIBS = \
-lmomentumTransportModels \
-lincompressibleMomentumTransportModels \
-lincompressibleTransportModels \
-ltransportModels \
-lfiniteVolume \
-lmeshTools \
-lfvModels \

2
applications/solvers/incompressible/nonNewtonianIcoFoam/Make/options
View File

@ -4,6 +4,6 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
-lincompressibleTransportModels \
-ltransportModels \
-lfiniteVolume \
-lmeshTools

2
applications/solvers/incompressible/pimpleFoam/Make/options
View File

@ -11,7 +11,7 @@ EXE_INC = \
EXE_LIBS = \
-lmomentumTransportModels \
-lincompressibleMomentumTransportModels \
-lincompressibleTransportModels \
-ltransportModels \
-lfiniteVolume \
-lfvModels \
-lfvConstraints \

2
applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options
View File

@ -11,7 +11,7 @@ EXE_INC = \
EXE_LIBS = \
-lmomentumTransportModels \
-lincompressibleMomentumTransportModels \
-lincompressibleTransportModels \
-ltransportModels \
-lfiniteVolume \
-lmeshTools \
-lfvModels \

2
applications/solvers/incompressible/pisoFoam/Make/options
View File

@ -9,7 +9,7 @@ EXE_INC = \
EXE_LIBS = \
-lmomentumTransportModels \
-lincompressibleMomentumTransportModels \
-lincompressibleTransportModels \
-ltransportModels \
-lfiniteVolume \
-lmeshTools \
-lfvModels \

3
applications/solvers/incompressible/simpleFoam/Make/options
View File

@ -6,11 +6,10 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \
-lmomentumTransportModels \
-lincompressibleMomentumTransportModels \
-lincompressibleTransportModels \
-ltransportModels \
-lfiniteVolume \
-lmeshTools \
-lfvModels \

2
applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/Make/options
View File

@ -11,7 +11,7 @@ EXE_INC = \
EXE_LIBS = \
-lmomentumTransportModels \
-lincompressibleMomentumTransportModels \
-lincompressibleTransportModels \
-ltransportModels \
-lfiniteVolume \
-lmeshTools \
-lfvModels \

2
applications/solvers/incompressible/simpleFoam/porousSimpleFoam/Make/options
View File

@ -11,7 +11,7 @@ EXE_INC = \
EXE_LIBS = \
-lmomentumTransportModels \
-lincompressibleMomentumTransportModels \
-lincompressibleTransportModels \
-ltransportModels \
-lfiniteVolume \
-lmeshTools \
-lfvModels \

9
applications/solvers/lagrangian/denseParticleFoam/Allwclean
View File

@ -1,9 +0,0 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
wclean libso denseParticleMomentumTransportModels
wclean
wclean MPPICFoam
#------------------------------------------------------------------------------

11
applications/solvers/lagrangian/denseParticleFoam/Allwmake
View File

@ -1,11 +0,0 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
wmake $targetType denseParticleMomentumTransportModels
wmake $targetType
#------------------------------------------------------------------------------

7
applications/solvers/lagrangian/denseParticleFoam/Make/options
View File

@ -1,11 +1,10 @@
EXE_INC = \
-I./denseParticleMomentumTransportModels/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/parcel/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/phaseIncompressible/lnInclude \
@ -19,10 +18,10 @@ EXE_LIBS = \
-llagrangian \
-llagrangianParcel \
-llagrangianParcelTurbulence \
-lincompressibleTransportModels \
-ltransportModels \
-lmomentumTransportModels \
-lincompressibleMomentumTransportModels \
-ldenseParticleMomentumTransportModels \
-lphaseIncompressibleMomentumTransportModels \
-lfiniteVolume \
-ldynamicFvMesh \
-ltopoChangerFvMesh \

5
applications/solvers/lagrangian/denseParticleFoam/createFields.H
View File

@ -147,10 +147,9 @@ surfaceScalarField alphaPhic
alphacf*phic
);
autoPtr<PhaseIncompressibleMomentumTransportModel<singlePhaseTransportModel>>
continuousPhaseTurbulence
autoPtr<phaseIncompressible::momentumTransportModel> continuousPhaseTurbulence
(
PhaseIncompressibleMomentumTransportModel<singlePhaseTransportModel>::New
phaseIncompressible::momentumTransportModel::New
(
alphac,
Uc,

2
applications/solvers/lagrangian/denseParticleFoam/denseParticleFoam.C
View File

@ -78,7 +78,7 @@ namespace Foam
#include "fvCFD.H"
#include "dynamicFvMesh.H"
#include "singlePhaseTransportModel.H"
#include "PhaseIncompressibleMomentumTransportModel.H"
#include "phaseKinematicMomentumTransportModel.H"
#include "pimpleControl.H"
#include "CorrectPhi.H"
#include "fvModels.H"

3
applications/solvers/lagrangian/denseParticleFoam/denseParticleMomentumTransportModels/Make/files
View File

@ -1,3 +0,0 @@
denseParticleMomentumTransportModels.C
LIB = $(FOAM_LIBBIN)/libdenseParticleMomentumTransportModels

8
applications/solvers/lagrangian/denseParticleFoam/denseParticleMomentumTransportModels/Make/options
View File

@ -1,8 +0,0 @@
EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/phaseIncompressible/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude

2
applications/solvers/lagrangian/particleFoam/Make/options
View File

@ -16,7 +16,7 @@ EXE_LIBS = \
-llagrangianParcelTurbulence \
-lmomentumTransportModels \
-lincompressibleMomentumTransportModels \
-lincompressibleTransportModels \
-ltransportModels \
-lfiniteVolume \
-lregionModels \
-lsurfaceFilmModels \

3
applications/solvers/lagrangian/reactingParticleFoam/Make/options
View File

@ -9,6 +9,7 @@ EXE_INC = \
-I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
-I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \
-I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
@ -29,7 +30,7 @@ EXE_LIBS = \
-lmeshTools \
-ldynamicFvMesh \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lthermophysicalTransportModels \
-lfluidReactionThermophysicalTransportModels \
-lspecie \

3
applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/Make/options
View File

@ -10,6 +10,7 @@ EXE_INC = \
-I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
-I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \
-I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
@ -30,7 +31,7 @@ EXE_LIBS = \
-lmeshTools \
-ldynamicFvMesh \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lthermophysicalTransportModels \
-lfluidReactionThermophysicalTransportModels \
-lspecie \

2
applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/buoyantReactingParticleFoam.C
View File

@ -32,7 +32,7 @@ Description
#include "fvCFD.H"
#include "dynamicFvMesh.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "fluidReactionThermophysicalTransportModel.H"
#include "parcelCloudList.H"
#include "surfaceFilmModel.H"

3
applications/solvers/lagrangian/reactingParticleFoam/engineFoam/Make/options
View File

@ -10,6 +10,7 @@ EXE_INC = \
-I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \
-I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \
-I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
@ -31,7 +32,7 @@ EXE_LIBS = \
-lmeshTools \
-ldynamicFvMesh \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lthermophysicalTransportModels \
-lfluidReactionThermophysicalTransportModels \
-lspecie \

2
applications/solvers/lagrangian/reactingParticleFoam/engineFoam/engineFoam.C
View File

@ -32,7 +32,7 @@ Description
#include "fvCFD.H"
#include "engineMesh.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "fluidReactionThermophysicalTransportModel.H"
#include "parcelCloudList.H"
#include "surfaceFilmModel.H"

2
applications/solvers/lagrangian/reactingParticleFoam/reactingParticleFoam.C
View File

@ -32,7 +32,7 @@ Description
#include "fvCFD.H"
#include "dynamicFvMesh.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "fluidReactionThermophysicalTransportModel.H"
#include "parcelCloudList.H"
#include "surfaceFilmModel.H"

3
applications/solvers/lagrangian/rhoParticleFoam/Make/options
View File

@ -1,6 +1,7 @@
EXE_INC = \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/parcel/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
@ -19,7 +20,7 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lfiniteVolume \
-lfvModels \
-lfvConstraints \

4
applications/solvers/lagrangian/rhoParticleFoam/rhoParticleFoam.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -34,7 +34,7 @@ Description
#include "fvCFD.H"
#include "dynamicFvMesh.H"
#include "fluidThermo.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "parcelCloudList.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

3
applications/solvers/lagrangian/simpleReactingParticleFoam/Make/options
View File

@ -9,6 +9,7 @@ EXE_INC = \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/parcel/lnInclude \
-I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
@ -25,7 +26,7 @@ EXE_LIBS = \
-lfiniteVolume \
-lmeshTools \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lthermophysicalTransportModels \
-lfluidReactionThermophysicalTransportModels \
-llagrangian \

2
applications/solvers/lagrangian/simpleReactingParticleFoam/simpleReactingParticleFoam.C
View File

@ -31,7 +31,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "fvCFD.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "fluidReactionThermophysicalTransportModel.H"
#include "parcelCloudList.H"
#include "fluidReactionThermo.H"

2
applications/solvers/multiphase/compressibleInterFoam/Allwclean
View File

@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory
wclean libso twoPhaseMixtureThermo
wclean libso surfaceTensionModels
wclean libso twoPhaseChange
wclean libso VoFphaseCompressibleMomentumTransportModels
wclean libso compressibleInterPhaseTransportModel
wclean

2
applications/solvers/multiphase/compressibleInterFoam/Allwmake
View File

@ -7,7 +7,7 @@ cd ${0%/*} || exit 1 # Run from this directory
wmake $targetType twoPhaseMixtureThermo
wmake $targetType surfaceTensionModels
wmake $targetType twoPhaseChange
wmake $targetType VoFphaseCompressibleMomentumTransportModels
wmake $targetType compressibleInterPhaseTransportModel
wmake $targetType

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

@ -1,18 +1,18 @@
EXE_INC = \
-I. \
-ItwoPhaseMixtureThermo \
-IVoFphaseCompressibleMomentumTransportModels/lnInclude \
-IcompressibleInterPhaseTransportModel/lnInclude \
-ItwoPhaseChange/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
@ -31,8 +31,8 @@ EXE_LIBS = \
-linterfaceProperties \
-lcompressibleTwoPhaseChangeModels \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lVoFphaseCompressibleMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lcompressibleInterPhaseTransportModel \
-lsurfaceFilmModels \
-lsurfaceFilmDerivedFvPatchFields \
-lfiniteVolume \

4
applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/Make/files
View File

@ -1,4 +0,0 @@
VoFphaseCompressibleMomentumTransportModels.C
compressibleInterPhaseTransportModel.C
LIB = $(FOAM_LIBBIN)/libVoFphaseCompressibleMomentumTransportModels

3
applications/solvers/multiphase/compressibleInterFoam/compressibleInterPhaseTransportModel/Make/files Normal file
View File

@ -0,0 +1,3 @@
compressibleInterPhaseTransportModel.C
LIB = $(FOAM_LIBBIN)/libcompressibleInterPhaseTransportModel

6
applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/Make/options → applications/solvers/multiphase/compressibleInterFoam/compressibleInterPhaseTransportModel/Make/options
View File

@ -1,5 +1,6 @@
EXE_INC = \
-I../twoPhaseMixtureThermo \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \
@ -17,7 +18,8 @@ LIB_LIBS = \
-ltwoPhaseProperties \
-linterfaceProperties \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lincompressibleTransportModels \
-lcompressibleMomentumTransportModels \
-lphaseCompressibleMomentumTransportModels \
-ltransportModels \
-lfiniteVolume \
-lmeshTools

6
applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/compressibleInterPhaseTransportModel.C → applications/solvers/multiphase/compressibleInterFoam/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -94,7 +94,7 @@ Foam::compressibleInterPhaseTransportModel::compressibleInterPhaseTransportModel
turbulence1_ =
(
PhaseCompressibleMomentumTransportModel<fluidThermo>::New
phaseCompressible::momentumTransportModel::New
(
alpha1,
rho1,
@ -107,7 +107,7 @@ Foam::compressibleInterPhaseTransportModel::compressibleInterPhaseTransportModel
turbulence2_ =
(
PhaseCompressibleMomentumTransportModel<fluidThermo>::New
phaseCompressible::momentumTransportModel::New
(
alpha2,
rho2,

12
applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleMomentumTransportModels/compressibleInterPhaseTransportModel.H → applications/solvers/multiphase/compressibleInterFoam/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2017-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -46,8 +46,8 @@ SourceFiles
#include "twoPhaseMixture.H"
#include "twoPhaseMixtureThermo.H"
#include "fluidThermoMomentumTransportModel.H"
#include "VoFphaseCompressibleMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "phaseDynamicMomentumTransportModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -84,12 +84,10 @@ class compressibleInterPhaseTransportModel
autoPtr<compressible::momentumTransportModel> turbulence_;
//- Phase-1 transport model (constructed for two-phase transport)
autoPtr<PhaseCompressibleMomentumTransportModel<fluidThermo>>
turbulence1_;
autoPtr<phaseCompressible::momentumTransportModel> turbulence1_;
//- Phase-2 transport model (constructed for two-phase transport)
autoPtr<PhaseCompressibleMomentumTransportModel<fluidThermo>>
turbulence2_;
autoPtr<phaseCompressible::momentumTransportModel> turbulence2_;
public:

3
applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/Make/options
View File

@ -1,8 +1,9 @@
EXE_INC = \
-I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude
LIB_LIBS = \

3
applications/solvers/multiphase/compressibleInterFoam/twoPhaseChange/Make/options
View File

@ -1,8 +1,9 @@
EXE_INC = \
-I../twoPhaseMixtureThermo/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \
-I../twoPhaseMixtureThermo/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude

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

@ -1,4 +1,5 @@
EXE_INC = \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \

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

@ -2,6 +2,7 @@ EXE_INC = \
-I. \
-I../interFoam \
-ImultiphaseMixtureThermo/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/twoPhaseModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/twoPhaseModels/interfaceProperties/lnInclude \
@ -16,6 +17,6 @@ EXE_LIBS = \
-lspecie \
-linterfaceProperties \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lfiniteVolume \
-lmeshTools

4
applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2013-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -37,7 +37,7 @@ Description
#include "fvCFD.H"
#include "multiphaseMixtureThermo.H"
#include "fluidThermoMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "pimpleControl.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

1
applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/Make/options
View File

@ -1,4 +1,5 @@
EXE_INC = \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude

1
applications/solvers/multiphase/driftFluxFoam/Make/files
View File

@ -1,5 +1,4 @@
incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C
compressibleMomentumTransportModels.C
driftFluxFoam.C
EXE = $(FOAM_APPBIN)/driftFluxFoam

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

@ -19,4 +19,4 @@ EXE_LIBS = \
-lfvModels \
-lfvConstraints \
-lmomentumTransportModels \
-lfluidThermoMomentumTransportModels
-lcompressibleMomentumTransportModels

104
applications/solvers/multiphase/driftFluxFoam/compressibleMomentumTransportModels.C
View File

@ -1,104 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "CompressibleMomentumTransportModel.H"
#include "incompressibleTwoPhaseInteractingMixture.H"
#include "addToRunTimeSelectionTable.H"
#include "makeMomentumTransportModel.H"
#include "laminarModel.H"
#include "RASModel.H"
#include "LESModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makeMomentumTransportModelTypes
(
geometricOneField,
volScalarField,
compressibleMomentumTransportModel,
CompressibleMomentumTransportModel,
incompressibleTwoPhaseInteractingMixture
);
makeBaseMomentumTransportModel
(
geometricOneField,
volScalarField,
compressibleMomentumTransportModel,
CompressibleMomentumTransportModel,
incompressibleTwoPhaseInteractingMixture
);
#define makeLaminarModel(Type) \
makeTemplatedMomentumTransportModel \
( \
incompressibleTwoPhaseInteractingMixture \
##CompressibleMomentumTransportModel, \
laminar, \
Type \
)
#define makeRASModel(Type) \
makeTemplatedMomentumTransportModel \
( \
incompressibleTwoPhaseInteractingMixture \
##CompressibleMomentumTransportModel, \
RAS, \
Type \
)
#define makeLESModel(Type) \
makeTemplatedMomentumTransportModel \
( \
incompressibleTwoPhaseInteractingMixture \
##CompressibleMomentumTransportModel, \
LES, \
Type \
)
#include "Stokes.H"
makeLaminarModel(Stokes);
#include "kEpsilon.H"
makeRASModel(kEpsilon);
#include "buoyantKEpsilon.H"
makeRASModel(buoyantKEpsilon);
#include "Smagorinsky.H"
makeLESModel(Smagorinsky);
#include "kEqn.H"
makeLESModel(kEqn);
#include "LRR.H"
makeRASModel(LRR);
#include "SSG.H"
makeRASModel(SSG);
// ************************************************************************* //

8
applications/solvers/multiphase/driftFluxFoam/createFields.H
View File

@ -75,13 +75,9 @@ autoPtr<relativeVelocityModel> UdmModelPtr
// Construct compressible turbulence model
autoPtr
<
CompressibleMomentumTransportModel<incompressibleTwoPhaseInteractingMixture>
> turbulence
autoPtr<compressible::momentumTransportModel> turbulence
(
CompressibleMomentumTransportModel<incompressibleTwoPhaseInteractingMixture>
::New(rho, U, rhoPhi, mixture)
compressible::momentumTransportModel::New(rho, U, rhoPhi, mixture)
);

2
applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
View File

@ -39,7 +39,7 @@ Description
#include "incompressibleTwoPhaseInteractingMixture.H"
#include "relativeVelocityModel.H"
#include "momentumTransportModel.H"
#include "CompressibleMomentumTransportModel.H"
#include "dynamicMomentumTransportModel.H"
#include "pimpleControl.H"
#include "fvModels.H"
#include "fvConstraints.H"

3
applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -57,6 +57,7 @@ incompressibleTwoPhaseInteractingMixture
)
),
twoPhaseMixture(U.mesh(), *this),
dynamicTransportModel(),
muModel_
(

7
applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -40,9 +40,9 @@ SourceFiles
#include "viscosityModel.H"
#include "mixtureViscosityModel.H"
#include "twoPhaseMixture.H"
#include "dynamicTransportModel.H"
#include "IOdictionary.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
@ -55,7 +55,8 @@ namespace Foam
class incompressibleTwoPhaseInteractingMixture
:
public IOdictionary,
public twoPhaseMixture
public twoPhaseMixture,
public dynamicTransportModel
{
protected:

2
applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/Make/options
View File

@ -6,5 +6,5 @@ EXE_INC = \
LIB_LIBS = \
-ltwoPhaseMixture \
-lincompressibleTransportModels \
-ltransportModels \
-lfiniteVolume

2
applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/Make/options
View File

@ -7,6 +7,6 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \
-lincompressibleTransportModels \
-ltransportModels \
-lfiniteVolume \
-lmeshTools

2
applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
View File

@ -18,7 +18,7 @@ EXE_INC = \
EXE_LIBS = \
-ltwoPhaseMixture \
-ltwoPhaseProperties \
-lincompressibleTransportModels \
-ltransportModels \
-lmomentumTransportModels \
-lincompressibleMomentumTransportModels \
-lfiniteVolume \

4
applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -213,7 +213,7 @@ Foam::incompressibleThreePhaseMixture::nuf() const
bool Foam::incompressibleThreePhaseMixture::read()
{
if (transportModel::read())
if (regIOobject::read())
{
if
(

6
applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -34,7 +34,7 @@ SourceFiles
#ifndef incompressibleThreePhaseMixture_H
#define incompressibleThreePhaseMixture_H
#include "transportModel.H"
#include "kinematicTransportModel.H"
#include "IOdictionary.H"
#include "viscosityModel.H"
#include "dimensionedScalar.H"
@ -52,7 +52,7 @@ namespace Foam
class incompressibleThreePhaseMixture
:
public IOdictionary,
public transportModel
public kinematicTransportModel
{
// Private Data

1
applications/solvers/multiphase/multiphaseEulerFoam/Allwclean
View File

@ -5,7 +5,6 @@ wclean libso phaseSystems
wclean libso interfacialModels
wclean libso interfacialCompositionModels
wclean libso multiphaseCompressibleMomentumTransportModels
wclean libso multiphaseThermophysicalTransportModels
multiphaseEulerFoam/Allwclean
wclean libso functionObjects

1
applications/solvers/multiphase/multiphaseEulerFoam/Allwmake
View File

@ -8,7 +8,6 @@ wmake $targetType phaseSystems
wmake $targetType interfacialModels
wmake $targetType interfacialCompositionModels
wmake $targetType multiphaseCompressibleMomentumTransportModels
wmake $targetType multiphaseThermophysicalTransportModels
wmake $targetType multiphaseReactions
multiphaseEulerFoam/Allwmake $targetType $*
wmake $targetType functionObjects

20
applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/Make/options
View File

@ -1,12 +1,18 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/functionObjects/field/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I../phaseSystems/lnInclude \
-I../interfacialModels/lnInclude \
-I../phaseSystems/lnInclude
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/phaseCompressible/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
-I$(LIB_SRC)/functionObjects/field/lnInclude \
LIB_LIBS = \
-lfieldFunctionObjects \
-lfiniteVolume \
-lmeshTools \
-lfileFormats \
-lfiniteVolume
-lfieldFunctionObjects

1
applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/Make/options
View File

@ -1,5 +1,6 @@
EXE_INC = \
-I../phaseSystems/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \

1
applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/Make/options
View File

@ -1,5 +1,6 @@
EXE_INC = \
-I../phaseSystems/lnInclude \
-I$(LIB_SRC)/transportModels/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \

4
applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -25,7 +25,7 @@ License
#include "Burns.H"
#include "phasePair.H"
#include "phaseCompressibleMomentumTransportModel.H"
#include "phaseDynamicMomentumTransportModel.H"
#include "addToRunTimeSelectionTable.H"
#include "dragModel.H"

4
applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -25,7 +25,7 @@ License
#include "Gosman.H"
#include "phasePair.H"
#include "phaseCompressibleMomentumTransportModel.H"
#include "phaseDynamicMomentumTransportModel.H"
#include "addToRunTimeSelectionTable.H"
#include "dragModel.H"

4
applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2021 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -25,7 +25,7 @@ License
#include "LopezDeBertodano.H"
#include "phasePair.H"
#include "phaseCompressibleMomentumTransportModel.H"
#include "phaseDynamicMomentumTransportModel.H"
#include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

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