COMP: link twoPhaseProperties library (#2424)

applications/solvers/multiphase/MPPICInterFoam/Make/options

@@ -35,10 +35,10 @@ EXE_LIBS = \
     -lspecie \
     -lincompressibleTransportModels \
     -limmiscibleIncompressibleTwoPhaseMixture \
+    -ltwoPhaseProperties \
     -linterfaceProperties \
     -lturbulenceModels \
     -lsampling \
     -lregionModels \
     -lsurfaceFilmModels \
     -lcompressibleTwoPhaseMixtureTurbulenceModels
-

applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/options

@@ -19,6 +19,7 @@ LIB_LIBS = \
     -lmeshTools \
     -lincompressibleTransportModels \
     -limmiscibleIncompressibleTwoPhaseMixture \
+    -ltwoPhaseProperties \
     -linterfaceProperties \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \

applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options

@@ -1,16 +1,18 @@
 EXE_INC = \
     -I../twoPhaseMixtureThermo \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
+    -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
 
 LIB_LIBS = \
+    -lfiniteVolume \
+    -lmeshTools \
     -ltwoPhaseMixtureThermo \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
@@ -20,6 +22,4 @@ LIB_LIBS = \
     -linterfaceProperties \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
-    -lincompressibleTransportModels \
+    -lincompressibleTransportModels
-    -lfiniteVolume \
-    -lmeshTools

applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options

@@ -26,6 +26,7 @@ EXE_LIBS = \
     -ldynamicMesh \
     -ldynamicFvMesh \
     -ltwoPhaseMixtureThermo \
+    -ltwoPhaseProperties \
     -ltwoPhaseSurfaceTension \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \

applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options

@@ -28,8 +28,8 @@ EXE_LIBS = \
     -ldynamicFvMesh \
     -lphaseTemperatureChangeTwoPhaseMixtures \
     -ltwoPhaseMixture \
-    -linterfaceProperties \
     -ltwoPhaseProperties \
+    -linterfaceProperties \
     -lincompressibleTransportModels \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \

applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/options

@@ -13,7 +13,7 @@ LIB_LIBS = \
     -lmeshTools \
     -lgeometricVoF \
     -ltwoPhaseMixture \
-    -linterfaceProperties \
     -ltwoPhaseProperties \
+    -linterfaceProperties \
     -lincompressibleTransportModels \
     -lfluidThermophysicalModels

applications/solvers/multiphase/interFoam/Make/options

@@ -24,6 +24,7 @@ EXE_LIBS = \
     -lincompressibleTransportModels \
     -linterfaceProperties \
     -limmiscibleIncompressibleTwoPhaseMixture \
+    -ltwoPhaseProperties \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \
     -lwaveModels \

applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/options

@@ -23,6 +23,7 @@ EXE_LIBS = \
     -lincompressibleTransportModels \
     -linterfaceProperties \
     -limmiscibleIncompressibleTwoPhaseMixture \
+    -ltwoPhaseProperties \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \
     -ldynamicMesh \

applications/solvers/multiphase/interIsoFoam/Make/options

@@ -33,5 +33,7 @@ EXE_LIBS = \
     -lincompressibleTurbulenceModels \
     -lwaveModels \
     -lgeometricVoF \
+    -ltwoPhaseMixture \
+    -ltwoPhaseProperties \
     -lVoFphaseTurbulentTransportModels \
     -lincompressibleInterPhaseTransportModels

applications/solvers/multiphase/interPhaseChangeFoam/Make/options

@@ -17,8 +17,8 @@ EXE_LIBS = \
     -lsampling \
     -lphaseChangeTwoPhaseMixtures \
     -ltwoPhaseMixture \
-    -linterfaceProperties \
     -ltwoPhaseProperties \
+    -linterfaceProperties \
     -lincompressibleTransportModels \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels

applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options

@@ -20,8 +20,8 @@ EXE_LIBS = \
     -lsampling \
     -lphaseChangeTwoPhaseMixtures \
     -ltwoPhaseMixture \
-    -linterfaceProperties \
     -ltwoPhaseProperties \
+    -linterfaceProperties \
     -lincompressibleTransportModels \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \

applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/Make/options

@@ -23,8 +23,8 @@ EXE_LIBS = \
     -lsampling \
     -lphaseChangeTwoPhaseMixtures \
     -ltwoPhaseMixture \
-    -linterfaceProperties \
     -ltwoPhaseProperties \
+    -linterfaceProperties \
     -lincompressibleTransportModels \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \

applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/options

@@ -1,13 +1,13 @@
 EXE_INC = \
-    -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
+    -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
+    -I$(LIB_SRC)/transportModels/incompressible/lnInclude
 
 LIB_LIBS = \
+    -lfiniteVolume \
+    -lmeshTools \
     -ltwoPhaseMixture \
     -ltwoPhaseProperties \
-    -lincompressibleTransportModels \
+    -lincompressibleTransportModels
-    -lfiniteVolume \
-    -lmeshTools

applications/test/reconstructedDistanceFunction/Make/options

@@ -10,4 +10,6 @@ EXE_LIBS = \
     -lsurfMesh \
     -lmeshTools \
     -lsampling \
-    -lgeometricVoF
+    -lgeometricVoF \
+    -ltwoPhaseMixture \
+    -ltwoPhaseProperties

applications/utilities/preProcessing/setAlphaField/Make/options

@@ -1,9 +1,9 @@
 EXE_INC = \
     -IalphaFieldFunctions/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/transportModels/geometricVoF/lnInclude
 
@@ -14,4 +14,6 @@ EXE_LIBS = \
     -lmeshTools \
     -lsampling \
     -lgeometricVoF \
+    -ltwoPhaseMixture \
+    -ltwoPhaseProperties \
     -lalphaFieldFunctions

src/phaseSystemModels/multiphaseInter/phasesSystem/Make/options

@@ -25,6 +25,8 @@ LIB_LIBS = \
     -lcompressibleTransportModels \
     -lincompressibleTransportModels \
     -lgeometricVoF \
+    -ltwoPhaseMixture \
+    -ltwoPhaseProperties \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \
     -lthermophysicalProperties \

src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options

@@ -7,7 +7,7 @@ EXE_INC = \
 
 LIB_LIBS = \
     -ltwoPhaseMixture \
+    -ltwoPhaseProperties \
     -lincompressibleTransportModels \
     -linterfaceProperties \
-    -ltwoPhaseProperties \
     -lfiniteVolume