diff --git a/applications/solvers/multiphase/driftFluxFoam/Make/options b/applications/solvers/multiphase/driftFluxFoam/Make/options index c66f9de53b..b237960a08 100644 --- a/applications/solvers/multiphase/driftFluxFoam/Make/options +++ b/applications/solvers/multiphase/driftFluxFoam/Make/options @@ -1,17 +1,16 @@ EXE_INC = \ -IincompressibleTwoPhaseInteractingMixture \ -ImixtureViscosityModels/lnInclude \ + -I./relativeVelocityModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/fvOptions/lnInclude \ -I$(LIB_SRC)/transportModels \ + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I./relativeVelocityModels/lnInclude + -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude EXE_LIBS = \ -ldriftFluxTransportModels \ @@ -20,6 +19,6 @@ EXE_LIBS = \ -lmeshTools \ -lsampling \ -lfvOptions \ - -lincompressibleTransportModels \ + -lcompressibleTransportModels \ -lturbulenceModels \ -lcompressibleTurbulenceModels diff --git a/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.H b/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.H index 8339ce293e..cd380212fa 100644 --- a/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.H +++ b/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.H @@ -37,7 +37,7 @@ SourceFiles #ifndef incompressibleTwoPhaseInteractingMixture_H #define incompressibleTwoPhaseInteractingMixture_H -#include "incompressible/transportModel/transportModel.H" +#include "compressibleTransportModel.H" #include "incompressible/viscosityModels/viscosityModel/viscosityModel.H" #include "mixtureViscosityModel.H" #include "twoPhaseMixture.H" @@ -56,7 +56,7 @@ namespace Foam class incompressibleTwoPhaseInteractingMixture : public IOdictionary, - public transportModel, + public compressibleTransportModel, public twoPhaseMixture { protected: diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/Make/options b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/Make/options index fe35455445..25954b07b4 100644 --- a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/Make/options +++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/Make/options @@ -3,9 +3,8 @@ EXE_INC = \ -I../mixtureViscosityModels/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ - -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude + -I$(LIB_SRC)/transportModels/compressible/lnInclude \ + -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude LIB_LIBS = \ -lfiniteVolume \