COMP: combine twoPhaseProperties library into interfaceProperties

- avoids unnecessary cyclic dependency

applications/solvers/multiphase/compressibleInterFoam/Make/options

@@ -20,7 +20,6 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -ltwoPhaseMixture \
-    -ltwoPhaseProperties \
     -linterfaceProperties \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \

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

@@ -16,7 +16,6 @@ LIB_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -ltwoPhaseMixture \
-    -ltwoPhaseProperties \
     -linterfaceProperties \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \

applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options

@@ -23,7 +23,6 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -ltwoPhaseMixture \
-    -ltwoPhaseProperties \
     -linterfaceProperties \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \

applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options

@@ -32,7 +32,6 @@ EXE_LIBS = \
     -lfluidThermophysicalModels \
     -lspecie \
     -ltwoPhaseMixture \
-    -ltwoPhaseProperties \
     -linterfaceProperties \
     -lturbulenceModels \
     -lcompressibleTurbulenceModels \

applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options

@@ -31,5 +31,5 @@ EXE_LIBS = \
     -lmassTransferModels \
     -lsolidThermo \
     -lsolidSpecie \
-    -ltwoPhaseProperties \
+    -linterfaceProperties \
     -llaserDTRM

applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options

@@ -20,7 +20,6 @@ EXE_LIBS = \
     -lphaseTemperatureChangeTwoPhaseMixtures \
     -ltwoPhaseMixture \
     -linterfaceProperties \
-    -ltwoPhaseProperties \
     -lincompressibleTransportModels \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \

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

@@ -1,4 +1,3 @@
-
 EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
@@ -10,7 +9,6 @@ EXE_INC = \
 LIB_LIBS = \
     -ltwoPhaseMixture \
     -linterfaceProperties \
-    -ltwoPhaseProperties \
     -lincompressibleTransportModels \
     -lfiniteVolume \
     -lfluidThermophysicalModels

applications/solvers/multiphase/interFoam/interMixingFoam/Make/options

@@ -7,7 +7,6 @@ EXE_INC = \
     -IincompressibleThreePhaseMixture \
     -IthreePhaseInterfaceProperties \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -18,7 +17,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     -ltwoPhaseMixture \
-    -ltwoPhaseProperties \
+    -linterfaceProperties \
     -lincompressibleTransportModels \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \

applications/solvers/multiphase/interPhaseChangeFoam/Make/options

@@ -14,7 +14,6 @@ EXE_LIBS = \
     -lphaseChangeTwoPhaseMixtures \
     -ltwoPhaseMixture \
     -linterfaceProperties \
-    -ltwoPhaseProperties \
     -lincompressibleTransportModels \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \

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

@@ -17,7 +17,6 @@ EXE_LIBS = \
     -lphaseChangeTwoPhaseMixtures \
     -ltwoPhaseMixture \
     -linterfaceProperties \
-    -ltwoPhaseProperties \
     -lincompressibleTransportModels \
     -lturbulenceModels \
     -lincompressibleTurbulenceModels \

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

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

src/transportModels/Allwmake

@@ -6,7 +6,6 @@ cd ${0%/*} || exit 1                        # Run from this directory
 
 wmake $targetType twoPhaseMixture
 wmake $targetType interfaceProperties
-wmake $targetType twoPhaseProperties
 wmake $targetType incompressible
 wmake $targetType compressible
 wmake $targetType immiscibleIncompressibleTwoPhaseMixture

src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options

@@ -9,5 +9,4 @@ LIB_LIBS = \
     -ltwoPhaseMixture \
     -lincompressibleTransportModels \
     -linterfaceProperties \
-    -ltwoPhaseProperties \
     -lfiniteVolume

src/transportModels/interfaceProperties/Make/files

@@ -1,6 +1,13 @@
 interfaceProperties.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/surfaceTensionModelNew.C
 surfaceTensionModels/constant/constantSurfaceTension.C

src/transportModels/interfaceProperties/Make/options

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

src/transportModels/twoPhaseProperties/Make/files

@@ -1,8 +0,0 @@
-alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
-alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
-alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
-alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
-alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
-alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
-
-LIB = $(FOAM_LIBBIN)/libtwoPhaseProperties

src/transportModels/twoPhaseProperties/Make/options

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