diff --git a/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/Make/options b/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/Make/options index f8ffa1cf..82eb6cb6 100644 --- a/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/Make/options +++ b/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/Make/options @@ -1,10 +1,15 @@ +FOAM_VERSION_MAJOR := $(word 1,$(subst ., ,$(WM_PROJECT_VERSION))) +PFLAGS+= -DOPENFOAM_VERSION_MAJOR=$(FOAM_VERSION_MAJOR) + EXE_INC = \ + $(PFLAGS) \ -IalphaContactAngle \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude + -I$(LIB_SRC)/meshTools/lnInclude \ + -Wno-deprecated-copy LIB_LIBS = \ -linterfaceProperties \ diff --git a/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/multiphaseMixture.C b/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/multiphaseMixture.C index 1daf644e..8d07d821 100644 --- a/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/multiphaseMixture.C +++ b/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/multiphaseMixture.C @@ -831,8 +831,13 @@ void Foam::multiphaseMixture::solveAlphas alphaPhiCorr, zeroField(), zeroField(), +#if OPENFOAM_VERSION_MAJOR < 6 1, 0, +#else + oneField(), + zeroField(), +#endif true );