From 6c6f777bd51977b0bbd7848802f5101d04ee49e0 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 26 Apr 2019 20:55:46 +0200 Subject: [PATCH] COMP: combine twoPhaseProperties library into interfaceProperties - avoids unnecessary cyclic dependency --- .../multiphase/compressibleInterFoam/Make/options | 1 - .../VoFphaseCompressibleTurbulenceModels/Make/options | 1 - .../compressibleInterDyMFoam/Make/options | 1 - .../compressibleInterFilmFoam/Make/options | 1 - .../icoReactingMultiphaseInterFoam/Make/options | 2 +- .../interCondensatingEvaporatingFoam/Make/options | 1 - .../temperaturePhaseChangeTwoPhaseMixtures/Make/options | 2 -- .../multiphase/interFoam/interMixingFoam/Make/options | 3 +-- .../solvers/multiphase/interPhaseChangeFoam/Make/options | 1 - .../interPhaseChangeDyMFoam/Make/options | 1 - .../phaseChangeTwoPhaseMixtures/Make/options | 2 +- src/transportModels/Allwmake | 1 - .../immiscibleIncompressibleTwoPhaseMixture/Make/options | 1 - src/transportModels/interfaceProperties/Make/files | 7 +++++++ src/transportModels/interfaceProperties/Make/options | 9 ++++----- .../alphaContactAngleFvPatchScalarField.C | 0 .../alphaContactAngleFvPatchScalarField.H | 0 .../constantAlphaContactAngleFvPatchScalarField.C | 0 .../constantAlphaContactAngleFvPatchScalarField.H | 0 .../dynamicAlphaContactAngleFvPatchScalarField.C | 0 .../dynamicAlphaContactAngleFvPatchScalarField.H | 0 ...eratureDependentAlphaContactAngleFvPatchScalarField.C | 0 ...eratureDependentAlphaContactAngleFvPatchScalarField.H | 0 .../timeVaryingAlphaContactAngleFvPatchScalarField.C | 0 .../timeVaryingAlphaContactAngleFvPatchScalarField.H | 0 .../alphaFixedPressureFvPatchScalarField.C | 0 .../alphaFixedPressureFvPatchScalarField.H | 0 src/transportModels/twoPhaseProperties/Make/files | 8 -------- src/transportModels/twoPhaseProperties/Make/options | 9 --------- 29 files changed, 14 insertions(+), 37 deletions(-) rename src/transportModels/{twoPhaseProperties => interfaceProperties}/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C (100%) rename src/transportModels/{twoPhaseProperties => interfaceProperties}/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H (100%) rename src/transportModels/{twoPhaseProperties => interfaceProperties}/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C (100%) rename src/transportModels/{twoPhaseProperties => interfaceProperties}/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H (100%) rename src/transportModels/{twoPhaseProperties => interfaceProperties}/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C (100%) rename src/transportModels/{twoPhaseProperties => interfaceProperties}/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.H (100%) rename src/transportModels/{twoPhaseProperties => interfaceProperties}/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C (100%) rename src/transportModels/{twoPhaseProperties => interfaceProperties}/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H (100%) rename src/transportModels/{twoPhaseProperties => interfaceProperties}/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C (100%) rename src/transportModels/{twoPhaseProperties => interfaceProperties}/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.H (100%) rename src/transportModels/{twoPhaseProperties => interfaceProperties}/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C (100%) rename src/transportModels/{twoPhaseProperties => interfaceProperties}/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.H (100%) delete mode 100644 src/transportModels/twoPhaseProperties/Make/files delete mode 100644 src/transportModels/twoPhaseProperties/Make/options diff --git a/applications/solvers/multiphase/compressibleInterFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/Make/options index 57c4b80dce..ef1fd258ac 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/Make/options @@ -20,7 +20,6 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -ltwoPhaseMixture \ - -ltwoPhaseProperties \ -linterfaceProperties \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options index d6736fe7c8..43c9b6871f 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options @@ -16,7 +16,6 @@ LIB_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -ltwoPhaseMixture \ - -ltwoPhaseProperties \ -linterfaceProperties \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options index 53bc21eada..07052af6d9 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options @@ -23,7 +23,6 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -ltwoPhaseMixture \ - -ltwoPhaseProperties \ -linterfaceProperties \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options index c4ba110bb3..c4a8a69a9c 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options @@ -32,7 +32,6 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -ltwoPhaseMixture \ - -ltwoPhaseProperties \ -linterfaceProperties \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options index f7ae70f032..798a4dd7dc 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options @@ -31,5 +31,5 @@ EXE_LIBS = \ -lmassTransferModels \ -lsolidThermo \ -lsolidSpecie \ - -ltwoPhaseProperties \ + -linterfaceProperties \ -llaserDTRM diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options index e3fb4e28e5..363605027e 100644 --- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options +++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options @@ -20,7 +20,6 @@ EXE_LIBS = \ -lphaseTemperatureChangeTwoPhaseMixtures \ -ltwoPhaseMixture \ -linterfaceProperties \ - -ltwoPhaseProperties \ -lincompressibleTransportModels \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/options b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/options index 4a85a0ae9f..4da1b25615 100644 --- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/options +++ b/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 diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options index f5dc7cc328..cad354904e 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options +++ b/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 \ diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/Make/options index a29ad660e8..04f187da35 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/Make/options +++ b/applications/solvers/multiphase/interPhaseChangeFoam/Make/options @@ -14,7 +14,6 @@ EXE_LIBS = \ -lphaseChangeTwoPhaseMixtures \ -ltwoPhaseMixture \ -linterfaceProperties \ - -ltwoPhaseProperties \ -lincompressibleTransportModels \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options index 0a4397e063..209a251cce 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options +++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options @@ -17,7 +17,6 @@ EXE_LIBS = \ -lphaseChangeTwoPhaseMixtures \ -ltwoPhaseMixture \ -linterfaceProperties \ - -ltwoPhaseProperties \ -lincompressibleTransportModels \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/options index 2e61e4ba77..0391ed7c62 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/options +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/options @@ -6,6 +6,6 @@ EXE_INC = \ LIB_LIBS = \ -ltwoPhaseMixture \ - -ltwoPhaseProperties \ + -linterfaceProperties \ -lincompressibleTransportModels \ -lfiniteVolume diff --git a/src/transportModels/Allwmake b/src/transportModels/Allwmake index 4790540e34..e94119d61a 100755 --- a/src/transportModels/Allwmake +++ b/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 diff --git a/src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options b/src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options index 4ae2fbf966..4f2d1e9eeb 100644 --- a/src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options +++ b/src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options @@ -9,5 +9,4 @@ LIB_LIBS = \ -ltwoPhaseMixture \ -lincompressibleTransportModels \ -linterfaceProperties \ - -ltwoPhaseProperties \ -lfiniteVolume diff --git a/src/transportModels/interfaceProperties/Make/files b/src/transportModels/interfaceProperties/Make/files index 976c263cff..71a9d307c9 100644 --- a/src/transportModels/interfaceProperties/Make/files +++ b/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 diff --git a/src/transportModels/interfaceProperties/Make/options b/src/transportModels/interfaceProperties/Make/options index cc63db7dcc..8ca45c1d12 100644 --- a/src/transportModels/interfaceProperties/Make/options +++ b/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 diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C similarity index 100% rename from src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C rename to src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H similarity index 100% rename from src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H rename to src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C similarity index 100% rename from src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C rename to src/transportModels/interfaceProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H b/src/transportModels/interfaceProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H similarity index 100% rename from src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H rename to src/transportModels/interfaceProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C similarity index 100% rename from src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C rename to src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.H b/src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.H similarity index 100% rename from src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.H rename to src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.H diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C similarity index 100% rename from src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C rename to src/transportModels/interfaceProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H b/src/transportModels/interfaceProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H similarity index 100% rename from src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H rename to src/transportModels/interfaceProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C similarity index 100% rename from src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C rename to src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.H b/src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.H similarity index 100% rename from src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.H rename to src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.H diff --git a/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C similarity index 100% rename from src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C rename to src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C diff --git a/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.H b/src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.H similarity index 100% rename from src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.H rename to src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.H diff --git a/src/transportModels/twoPhaseProperties/Make/files b/src/transportModels/twoPhaseProperties/Make/files deleted file mode 100644 index 2e5b03ff0e..0000000000 --- a/src/transportModels/twoPhaseProperties/Make/files +++ /dev/null @@ -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 diff --git a/src/transportModels/twoPhaseProperties/Make/options b/src/transportModels/twoPhaseProperties/Make/options deleted file mode 100644 index 32ce36b959..0000000000 --- a/src/transportModels/twoPhaseProperties/Make/options +++ /dev/null @@ -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