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

src/transportModels: split twoPhaseMixture from twoPhaseProperties as a separate library

Browse Source
This commit is contained in:
Henry
2013-03-09 16:15:29 +00:00
parent 2776655e00
commit d05e256dcd
22 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \

2
applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options
View File

@ -1,7 +1,7 @@
EXE_INC = \ EXE_INC = \
-I.. \ -I.. \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \

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

@ -1,7 +1,7 @@
EXE_INC = \ EXE_INC = \
-ItwoPhaseMixtureThermo \ -ItwoPhaseMixtureThermo \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
-I$(LIB_SRC)/finiteVolume/lnInclude -I$(LIB_SRC)/finiteVolume/lnInclude
@ -10,6 +10,7 @@ EXE_LIBS = \
-ltwoPhaseMixtureThermo \ -ltwoPhaseMixtureThermo \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \
-lspecie \ -lspecie \
-ltwoPhaseMixture \
-ltwoPhaseProperties \ -ltwoPhaseProperties \
-linterfaceProperties \ -linterfaceProperties \
-lcompressibleTurbulenceModel \ -lcompressibleTurbulenceModel \

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

@ -2,7 +2,7 @@ EXE_INC = \
-I.. \ -I.. \
-I../twoPhaseMixtureThermo \ -I../twoPhaseMixtureThermo \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
-I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \
@ -14,6 +14,7 @@ EXE_LIBS = \
-ltwoPhaseMixtureThermo \ -ltwoPhaseMixtureThermo \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \
-lspecie \ -lspecie \
-ltwoPhaseMixture \
-ltwoPhaseProperties \ -ltwoPhaseProperties \
-linterfaceProperties \ -linterfaceProperties \
-lcompressibleTurbulenceModel \ -lcompressibleTurbulenceModel \

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

@ -1,10 +1,10 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude -I$(LIB_SRC)/finiteVolume/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \
-lspecie \ -lspecie \
-ltwoPhaseProperties \ -ltwoPhaseMixture \
-lfiniteVolume -lfiniteVolume

3
applications/solvers/multiphase/interFoam/LTSInterFoam/Make/options
View File

@ -1,6 +1,6 @@
EXE_INC = \ EXE_INC = \
-I.. \ -I.. \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
@ -12,6 +12,7 @@ EXE_INC = \
EXE_LIBS = \ EXE_LIBS = \
-linterfaceProperties \ -linterfaceProperties \
-ltwoPhaseMixture \
-ltwoPhaseProperties \ -ltwoPhaseProperties \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-lincompressibleTurbulenceModel \ -lincompressibleTurbulenceModel \

3
applications/solvers/multiphase/interFoam/MRFInterFoam/Make/options
View File

@ -1,6 +1,6 @@
EXE_INC = \ EXE_INC = \
-I.. \ -I.. \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
@ -11,6 +11,7 @@ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude -I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-ltwoPhaseMixture \
-linterfaceProperties \ -linterfaceProperties \
-ltwoPhaseProperties \ -ltwoPhaseProperties \
-lincompressibleTransportModels \ -lincompressibleTransportModels \

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

@ -1,5 +1,5 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
@ -10,6 +10,7 @@ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude -I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-ltwoPhaseMixture \
-linterfaceProperties \ -linterfaceProperties \
-ltwoPhaseProperties \ -ltwoPhaseProperties \
-lincompressibleTransportModels \ -lincompressibleTransportModels \

3
applications/solvers/multiphase/interFoam/interDyMFoam/Make/options
View File

@ -1,6 +1,6 @@
EXE_INC = \ EXE_INC = \
-I.. \ -I.. \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
@ -13,6 +13,7 @@ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude -I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-ltwoPhaseMixture \
-linterfaceProperties \ -linterfaceProperties \
-ltwoPhaseProperties \ -ltwoPhaseProperties \
-lincompressibleTransportModels \ -lincompressibleTransportModels \

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

@ -1,6 +1,6 @@
EXE_INC = \ EXE_INC = \
-I.. \ -I.. \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-IincompressibleThreePhaseMixture \ -IincompressibleThreePhaseMixture \
-IthreePhaseInterfaceProperties \ -IthreePhaseInterfaceProperties \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
@ -13,6 +13,7 @@ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude -I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-ltwoPhaseMixture \
-ltwoPhaseProperties \ -ltwoPhaseProperties \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-lincompressibleTurbulenceModel \ -lincompressibleTurbulenceModel \

3
applications/solvers/multiphase/interFoam/porousInterFoam/Make/options
View File

@ -1,6 +1,6 @@
EXE_INC = \ EXE_INC = \
-I.. \ -I.. \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
@ -11,6 +11,7 @@ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude -I$(LIB_SRC)/sampling/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-ltwoPhaseMixture \
-linterfaceProperties \ -linterfaceProperties \
-ltwoPhaseProperties \ -ltwoPhaseProperties \
-lincompressibleTransportModels \ -lincompressibleTransportModels \

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

@ -1,5 +1,5 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
@ -8,6 +8,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude -I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-ltwoPhaseMixture \
-linterfaceProperties \ -linterfaceProperties \
-ltwoPhaseProperties \ -ltwoPhaseProperties \
-lincompressibleTransportModels \ -lincompressibleTransportModels \

4
applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
View File

@ -1,6 +1,6 @@
EXE_INC = \ EXE_INC = \
-I../interFoam \ -I../interFoam \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
@ -8,7 +8,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude -I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-ltwoPhaseProperties \ -ltwoPhaseMixture \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-lincompressibleTurbulenceModel \ -lincompressibleTurbulenceModel \
-lincompressibleRASModels \ -lincompressibleRASModels \

1
src/transportModels/Allwmake
View File

@ -3,6 +3,7 @@ cd ${0%/*} || exit 1 # run from this directory
makeType=${1:-libso} makeType=${1:-libso}
set -x set -x
wmake $makeType twoPhaseMixture
wmake $makeType interfaceProperties wmake $makeType interfaceProperties
wmake $makeType twoPhaseProperties wmake $makeType twoPhaseProperties
wmake $makeType incompressible wmake $makeType incompressible

4
src/transportModels/incompressible/Make/options
View File

@ -1,8 +1,8 @@
EXE_INC = \ EXE_INC = \
-I.. \ -I.. \
-I../twoPhaseProperties/lnInclude \ -I../twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude -I$(LIB_SRC)/finiteVolume/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-ltwoPhaseProperties \ -ltwoPhaseMixture \
-lfiniteVolume -lfiniteVolume

5
src/transportModels/interfaceProperties/Make/options
View File

@ -1,5 +1,8 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle \ -I$(LIB_SRC)/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle \
-I$(LIB_SRC)/finiteVolume/lnInclude -I$(LIB_SRC)/finiteVolume/lnInclude
LIB_LIBS = -lfiniteVolume LIB_LIBS = \
-ltwoPhaseMixture \
-lfiniteVolume

3
src/transportModels/twoPhaseMixture/Make/files Normal file
View File

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

5
src/transportModels/twoPhaseMixture/Make/options Normal file
View File

@ -0,0 +1,5 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
LIB_LIBS = \
-lfiniteVolume

0
src/transportModels/twoPhaseProperties/twoPhaseMixture/twoPhaseMixture.C → src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.C
View File

0
src/transportModels/twoPhaseProperties/twoPhaseMixture/twoPhaseMixture.H → src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.H
View File

2
src/transportModels/twoPhaseProperties/Make/files
View File

@ -1,5 +1,3 @@
twoPhaseMixture/twoPhaseMixture.C
alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C

2
src/transportModels/twoPhaseProperties/Make/options
View File

@ -1,7 +1,9 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude -I$(LIB_SRC)/finiteVolume/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-ltwoPhaseMixture \
-linterfaceProperties \ -linterfaceProperties \
-lfiniteVolume -lfiniteVolume