From 3721a61fe0e1f0a4fb67b545fe1dbf4ff5a22399 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 30 Mar 2022 17:35:44 +0200 Subject: [PATCH] COMP: link twoPhaseProperties library (#2424) --- .../solvers/multiphase/MPPICInterFoam/Make/options | 2 +- .../Make/options | 1 + .../Make/options | 12 ++++++------ .../compressibleInterIsoFoam/Make/options | 1 + .../interCondensatingEvaporatingFoam/Make/options | 2 +- .../Make/options | 2 +- .../solvers/multiphase/interFoam/Make/options | 1 + .../interFoam/overInterDyMFoam/Make/options | 1 + .../solvers/multiphase/interIsoFoam/Make/options | 2 ++ .../multiphase/interPhaseChangeFoam/Make/options | 2 +- .../interPhaseChangeDyMFoam/Make/options | 2 +- .../overInterPhaseChangeDyMFoam/Make/options | 2 +- .../phaseChangeTwoPhaseMixtures/Make/options | 14 +++++++------- .../reconstructedDistanceFunction/Make/options | 4 +++- .../preProcessing/setAlphaField/Make/options | 4 +++- .../multiphaseInter/phasesSystem/Make/options | 2 ++ .../Make/options | 2 +- 17 files changed, 34 insertions(+), 22 deletions(-) diff --git a/applications/solvers/multiphase/MPPICInterFoam/Make/options b/applications/solvers/multiphase/MPPICInterFoam/Make/options index 078ccece86..40ba55939a 100644 --- a/applications/solvers/multiphase/MPPICInterFoam/Make/options +++ b/applications/solvers/multiphase/MPPICInterFoam/Make/options @@ -35,10 +35,10 @@ EXE_LIBS = \ -lspecie \ -lincompressibleTransportModels \ -limmiscibleIncompressibleTwoPhaseMixture \ + -ltwoPhaseProperties \ -linterfaceProperties \ -lturbulenceModels \ -lsampling \ -lregionModels \ -lsurfaceFilmModels \ -lcompressibleTwoPhaseMixtureTurbulenceModels - diff --git a/applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/options b/applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/options index 42c94360af..7c6e585672 100644 --- a/applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/options +++ b/applications/solvers/multiphase/MPPICInterFoam/compressibleTwoPhaseMixtureTurbulenceModels/Make/options @@ -19,6 +19,7 @@ LIB_LIBS = \ -lmeshTools \ -lincompressibleTransportModels \ -limmiscibleIncompressibleTwoPhaseMixture \ + -ltwoPhaseProperties \ -linterfaceProperties \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options index d6736fe7c8..746ca9a443 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options +++ b/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)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude + -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude LIB_LIBS = \ + -lfiniteVolume \ + -lmeshTools \ -ltwoPhaseMixtureThermo \ -lcompressibleTransportModels \ -lfluidThermophysicalModels \ @@ -20,6 +22,4 @@ LIB_LIBS = \ -linterfaceProperties \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ - -lincompressibleTransportModels \ - -lfiniteVolume \ - -lmeshTools + -lincompressibleTransportModels diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options index bb9d9dc559..20f4d1aa68 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterIsoFoam/Make/options @@ -26,6 +26,7 @@ EXE_LIBS = \ -ldynamicMesh \ -ldynamicFvMesh \ -ltwoPhaseMixtureThermo \ + -ltwoPhaseProperties \ -ltwoPhaseSurfaceTension \ -lcompressibleTransportModels \ -lfluidThermophysicalModels \ diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options index c1a909b423..b7f9efca08 100644 --- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options +++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options @@ -28,8 +28,8 @@ EXE_LIBS = \ -ldynamicFvMesh \ -lphaseTemperatureChangeTwoPhaseMixtures \ -ltwoPhaseMixture \ - -linterfaceProperties \ -ltwoPhaseProperties \ + -linterfaceProperties \ -lincompressibleTransportModels \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/options b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/options index b9fc8596f5..72b5ee1020 100644 --- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/options +++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/options @@ -13,7 +13,7 @@ LIB_LIBS = \ -lmeshTools \ -lgeometricVoF \ -ltwoPhaseMixture \ - -linterfaceProperties \ -ltwoPhaseProperties \ + -linterfaceProperties \ -lincompressibleTransportModels \ -lfluidThermophysicalModels diff --git a/applications/solvers/multiphase/interFoam/Make/options b/applications/solvers/multiphase/interFoam/Make/options index 8a9ec092de..6aaa57eead 100644 --- a/applications/solvers/multiphase/interFoam/Make/options +++ b/applications/solvers/multiphase/interFoam/Make/options @@ -24,6 +24,7 @@ EXE_LIBS = \ -lincompressibleTransportModels \ -linterfaceProperties \ -limmiscibleIncompressibleTwoPhaseMixture \ + -ltwoPhaseProperties \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ -lwaveModels \ diff --git a/applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/options b/applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/options index b5364f3e44..8c7945a019 100644 --- a/applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/options +++ b/applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/options @@ -23,6 +23,7 @@ EXE_LIBS = \ -lincompressibleTransportModels \ -linterfaceProperties \ -limmiscibleIncompressibleTwoPhaseMixture \ + -ltwoPhaseProperties \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ -ldynamicMesh \ diff --git a/applications/solvers/multiphase/interIsoFoam/Make/options b/applications/solvers/multiphase/interIsoFoam/Make/options index 3a3d5bb109..11e09be89d 100644 --- a/applications/solvers/multiphase/interIsoFoam/Make/options +++ b/applications/solvers/multiphase/interIsoFoam/Make/options @@ -33,5 +33,7 @@ EXE_LIBS = \ -lincompressibleTurbulenceModels \ -lwaveModels \ -lgeometricVoF \ + -ltwoPhaseMixture \ + -ltwoPhaseProperties \ -lVoFphaseTurbulentTransportModels \ -lincompressibleInterPhaseTransportModels diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/Make/options index 6e898b3f43..514613caaf 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/Make/options +++ b/applications/solvers/multiphase/interPhaseChangeFoam/Make/options @@ -17,8 +17,8 @@ EXE_LIBS = \ -lsampling \ -lphaseChangeTwoPhaseMixtures \ -ltwoPhaseMixture \ - -linterfaceProperties \ -ltwoPhaseProperties \ + -linterfaceProperties \ -lincompressibleTransportModels \ -lturbulenceModels \ -lincompressibleTurbulenceModels diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options index 9985961973..7cb05d9739 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options +++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options @@ -20,8 +20,8 @@ EXE_LIBS = \ -lsampling \ -lphaseChangeTwoPhaseMixtures \ -ltwoPhaseMixture \ - -linterfaceProperties \ -ltwoPhaseProperties \ + -linterfaceProperties \ -lincompressibleTransportModels \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/Make/options index c7c01f96e6..9ff6b05fe1 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/Make/options +++ b/applications/solvers/multiphase/interPhaseChangeFoam/overInterPhaseChangeDyMFoam/Make/options @@ -23,8 +23,8 @@ EXE_LIBS = \ -lsampling \ -lphaseChangeTwoPhaseMixtures \ -ltwoPhaseMixture \ - -linterfaceProperties \ -ltwoPhaseProperties \ + -linterfaceProperties \ -lincompressibleTransportModels \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/options index 6f70f673dc..8c1b67bdc3 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/options +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/options @@ -1,13 +1,13 @@ EXE_INC = \ - -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ - -I$(LIB_SRC)/transportModels \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude + -I$(LIB_SRC)/transportModels \ + -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/transportModels/incompressible/lnInclude LIB_LIBS = \ + -lfiniteVolume \ + -lmeshTools \ -ltwoPhaseMixture \ -ltwoPhaseProperties \ - -lincompressibleTransportModels \ - -lfiniteVolume \ - -lmeshTools + -lincompressibleTransportModels diff --git a/applications/test/reconstructedDistanceFunction/Make/options b/applications/test/reconstructedDistanceFunction/Make/options index 11a6714782..34a092bfb8 100644 --- a/applications/test/reconstructedDistanceFunction/Make/options +++ b/applications/test/reconstructedDistanceFunction/Make/options @@ -10,4 +10,6 @@ EXE_LIBS = \ -lsurfMesh \ -lmeshTools \ -lsampling \ - -lgeometricVoF + -lgeometricVoF \ + -ltwoPhaseMixture \ + -ltwoPhaseProperties diff --git a/applications/utilities/preProcessing/setAlphaField/Make/options b/applications/utilities/preProcessing/setAlphaField/Make/options index 8f9558bba0..aa905ff409 100644 --- a/applications/utilities/preProcessing/setAlphaField/Make/options +++ b/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 diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/options b/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/options index 115e1029fc..a4d6737537 100644 --- a/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/options +++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/Make/options @@ -25,6 +25,8 @@ LIB_LIBS = \ -lcompressibleTransportModels \ -lincompressibleTransportModels \ -lgeometricVoF \ + -ltwoPhaseMixture \ + -ltwoPhaseProperties \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ -lthermophysicalProperties \ diff --git a/src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options b/src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options index 4ae2fbf966..61617d3b62 100644 --- a/src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options +++ b/src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options @@ -7,7 +7,7 @@ EXE_INC = \ LIB_LIBS = \ -ltwoPhaseMixture \ + -ltwoPhaseProperties \ -lincompressibleTransportModels \ -linterfaceProperties \ - -ltwoPhaseProperties \ -lfiniteVolume