Commit 6c6f777b authored by Mark Olesen's avatar Mark Olesen
Browse files

COMP: combine twoPhaseProperties library into interfaceProperties

- avoids unnecessary cyclic dependency
parent 606c0154
...@@ -20,7 +20,6 @@ EXE_LIBS = \ ...@@ -20,7 +20,6 @@ EXE_LIBS = \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \
-lspecie \ -lspecie \
-ltwoPhaseMixture \ -ltwoPhaseMixture \
-ltwoPhaseProperties \
-linterfaceProperties \ -linterfaceProperties \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
......
...@@ -16,7 +16,6 @@ LIB_LIBS = \ ...@@ -16,7 +16,6 @@ LIB_LIBS = \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \
-lspecie \ -lspecie \
-ltwoPhaseMixture \ -ltwoPhaseMixture \
-ltwoPhaseProperties \
-linterfaceProperties \ -linterfaceProperties \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
......
...@@ -23,7 +23,6 @@ EXE_LIBS = \ ...@@ -23,7 +23,6 @@ EXE_LIBS = \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \
-lspecie \ -lspecie \
-ltwoPhaseMixture \ -ltwoPhaseMixture \
-ltwoPhaseProperties \
-linterfaceProperties \ -linterfaceProperties \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
......
...@@ -32,7 +32,6 @@ EXE_LIBS = \ ...@@ -32,7 +32,6 @@ EXE_LIBS = \
-lfluidThermophysicalModels \ -lfluidThermophysicalModels \
-lspecie \ -lspecie \
-ltwoPhaseMixture \ -ltwoPhaseMixture \
-ltwoPhaseProperties \
-linterfaceProperties \ -linterfaceProperties \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \
......
...@@ -31,5 +31,5 @@ EXE_LIBS = \ ...@@ -31,5 +31,5 @@ EXE_LIBS = \
-lmassTransferModels \ -lmassTransferModels \
-lsolidThermo \ -lsolidThermo \
-lsolidSpecie \ -lsolidSpecie \
-ltwoPhaseProperties \ -linterfaceProperties \
-llaserDTRM -llaserDTRM
...@@ -20,7 +20,6 @@ EXE_LIBS = \ ...@@ -20,7 +20,6 @@ EXE_LIBS = \
-lphaseTemperatureChangeTwoPhaseMixtures \ -lphaseTemperatureChangeTwoPhaseMixtures \
-ltwoPhaseMixture \ -ltwoPhaseMixture \
-linterfaceProperties \ -linterfaceProperties \
-ltwoPhaseProperties \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-lturbulenceModels \ -lturbulenceModels \
-lincompressibleTurbulenceModels \ -lincompressibleTurbulenceModels \
......
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
...@@ -10,7 +9,6 @@ EXE_INC = \ ...@@ -10,7 +9,6 @@ EXE_INC = \
LIB_LIBS = \ LIB_LIBS = \
-ltwoPhaseMixture \ -ltwoPhaseMixture \
-linterfaceProperties \ -linterfaceProperties \
-ltwoPhaseProperties \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-lfiniteVolume \ -lfiniteVolume \
-lfluidThermophysicalModels -lfluidThermophysicalModels
...@@ -7,7 +7,6 @@ EXE_INC = \ ...@@ -7,7 +7,6 @@ EXE_INC = \
-IincompressibleThreePhaseMixture \ -IincompressibleThreePhaseMixture \
-IthreePhaseInterfaceProperties \ -IthreePhaseInterfaceProperties \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
...@@ -18,7 +17,7 @@ EXE_INC = \ ...@@ -18,7 +17,7 @@ EXE_INC = \
EXE_LIBS = \ EXE_LIBS = \
-ltwoPhaseMixture \ -ltwoPhaseMixture \
-ltwoPhaseProperties \ -linterfaceProperties \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-lturbulenceModels \ -lturbulenceModels \
-lincompressibleTurbulenceModels \ -lincompressibleTurbulenceModels \
......
...@@ -14,7 +14,6 @@ EXE_LIBS = \ ...@@ -14,7 +14,6 @@ EXE_LIBS = \
-lphaseChangeTwoPhaseMixtures \ -lphaseChangeTwoPhaseMixtures \
-ltwoPhaseMixture \ -ltwoPhaseMixture \
-linterfaceProperties \ -linterfaceProperties \
-ltwoPhaseProperties \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-lturbulenceModels \ -lturbulenceModels \
-lincompressibleTurbulenceModels \ -lincompressibleTurbulenceModels \
......
...@@ -17,7 +17,6 @@ EXE_LIBS = \ ...@@ -17,7 +17,6 @@ EXE_LIBS = \
-lphaseChangeTwoPhaseMixtures \ -lphaseChangeTwoPhaseMixtures \
-ltwoPhaseMixture \ -ltwoPhaseMixture \
-linterfaceProperties \ -linterfaceProperties \
-ltwoPhaseProperties \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-lturbulenceModels \ -lturbulenceModels \
-lincompressibleTurbulenceModels \ -lincompressibleTurbulenceModels \
......
...@@ -6,6 +6,6 @@ EXE_INC = \ ...@@ -6,6 +6,6 @@ EXE_INC = \
LIB_LIBS = \ LIB_LIBS = \
-ltwoPhaseMixture \ -ltwoPhaseMixture \
-ltwoPhaseProperties \ -linterfaceProperties \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-lfiniteVolume -lfiniteVolume
...@@ -6,7 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory ...@@ -6,7 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory
wmake $targetType twoPhaseMixture wmake $targetType twoPhaseMixture
wmake $targetType interfaceProperties wmake $targetType interfaceProperties
wmake $targetType twoPhaseProperties
wmake $targetType incompressible wmake $targetType incompressible
wmake $targetType compressible wmake $targetType compressible
wmake $targetType immiscibleIncompressibleTwoPhaseMixture wmake $targetType immiscibleIncompressibleTwoPhaseMixture
......
...@@ -9,5 +9,4 @@ LIB_LIBS = \ ...@@ -9,5 +9,4 @@ LIB_LIBS = \
-ltwoPhaseMixture \ -ltwoPhaseMixture \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-linterfaceProperties \ -linterfaceProperties \
-ltwoPhaseProperties \
-lfiniteVolume -lfiniteVolume
interfaceProperties.C interfaceProperties.C
interfaceCompression/interfaceCompression.C interfaceCompression/interfaceCompression.C
alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C
surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C
surfaceTensionModels/constant/constantSurfaceTension.C surfaceTensionModels/constant/constantSurfaceTension.C
......
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude
-I$(LIB_SRC)/finiteVolume/lnInclude
LIB_LIBS = \ LIB_LIBS = \
-ltwoPhaseMixture \ -lfiniteVolume \
-lfiniteVolume -ltwoPhaseMixture
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment