diff --git a/applications/solvers/cfdemSolverMultiphase/Make/options b/applications/solvers/cfdemSolverMultiphase/Make/options index 0cfccaff..6244f98f 100644 --- a/applications/solvers/cfdemSolverMultiphase/Make/options +++ b/applications/solvers/cfdemSolverMultiphase/Make/options @@ -1,6 +1,10 @@ +FOAM_VERSION_MAJOR := $(word 1,$(subst ., ,$(WM_PROJECT_VERSION))) +PFLAGS+= -DOPENFOAM_VERSION_MAJOR=$(FOAM_VERSION_MAJOR) + include $(CFDEM_ADD_LIBS_DIR)/additionalLibs EXE_INC = \ + $(PFLAGS) \ -I$(CFDEM_OFVERSION_DIR) \ -ImultiphaseMixture/lnInclude \ -I$(LIB_SRC)/transportModels \ diff --git a/applications/solvers/cfdemSolverMultiphase/cfdemSolverMultiphase.C b/applications/solvers/cfdemSolverMultiphase/cfdemSolverMultiphase.C index 42e514da..312b9168 100644 --- a/applications/solvers/cfdemSolverMultiphase/cfdemSolverMultiphase.C +++ b/applications/solvers/cfdemSolverMultiphase/cfdemSolverMultiphase.C @@ -46,6 +46,11 @@ Description int main(int argc, char *argv[]) { + +#if OPENFOAM_VERSION_MAJOR >= 6 + FatalError << "cfdemSolverMultiphase requires OpenFOAM 4.x or 5.x to work properly" << exit(FatalError); +#endif + #include "postProcess.H" #include "setRootCase.H" #include "createTime.H"