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" diff --git a/applications/solvers/cfdemSolverMultiphase/multiphaseMixture/Make/options b/applications/solvers/cfdemSolverMultiphase/multiphaseMixture/Make/options index f8ffa1cf..15704fe2 100644 --- a/applications/solvers/cfdemSolverMultiphase/multiphaseMixture/Make/options +++ b/applications/solvers/cfdemSolverMultiphase/multiphaseMixture/Make/options @@ -1,4 +1,8 @@ +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 \ diff --git a/applications/solvers/cfdemSolverMultiphase/multiphaseMixture/multiphaseMixture.C b/applications/solvers/cfdemSolverMultiphase/multiphaseMixture/multiphaseMixture.C index a1ea1537..e152ae4a 100644 --- a/applications/solvers/cfdemSolverMultiphase/multiphaseMixture/multiphaseMixture.C +++ b/applications/solvers/cfdemSolverMultiphase/multiphaseMixture/multiphaseMixture.C @@ -679,8 +679,13 @@ void Foam::multiphaseMixture::solveAlphas alphaPhiCorr, zeroField(), zeroField(), +#if OPENFOAM_VERSION_MAJOR < 6 1, 0, +#else + oneField(), + zeroField(), +#endif true ); diff --git a/applications/solvers/cfdemSolverRhoPimple/Make/options b/applications/solvers/cfdemSolverRhoPimple/Make/options index 0377ece5..cc67835d 100644 --- a/applications/solvers/cfdemSolverRhoPimple/Make/options +++ b/applications/solvers/cfdemSolverRhoPimple/Make/options @@ -1,5 +1,7 @@ include $(CFDEM_ADD_LIBS_DIR)/additionalLibs +FOAM_VERSION_MAJOR := $(word 1,$(subst ., ,$(WM_PROJECT_VERSION))) +PFLAGS+= -DOPENFOAM_VERSION_MAJOR=$(FOAM_VERSION_MAJOR) PFLAGS+= -Dcompre EXE_INC = \ diff --git a/applications/solvers/cfdemSolverRhoPimple/cfdemSolverRhoPimple.C b/applications/solvers/cfdemSolverRhoPimple/cfdemSolverRhoPimple.C index eb4d2c47..88dce166 100644 --- a/applications/solvers/cfdemSolverRhoPimple/cfdemSolverRhoPimple.C +++ b/applications/solvers/cfdemSolverRhoPimple/cfdemSolverRhoPimple.C @@ -113,7 +113,11 @@ int main(int argc, char *argv[]) particleCloud.clockM().start(26,"Flow"); +#if OPENFOAM_VERSION_MAJOR < 6 if (pimple.nCorrPIMPLE() <= 1) +#else + if (pimple.nCorrPimple() <= 1) +#endif { #include "rhoEqn.H" } diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/Make/options b/applications/solvers/cfdemSolverRhoPimpleChem/Make/options index aa2a2273..8f25c877 100644 --- a/applications/solvers/cfdemSolverRhoPimpleChem/Make/options +++ b/applications/solvers/cfdemSolverRhoPimpleChem/Make/options @@ -1,5 +1,7 @@ include $(CFDEM_ADD_LIBS_DIR)/additionalLibs +FOAM_VERSION_MAJOR := $(word 1,$(subst ., ,$(WM_PROJECT_VERSION))) +PFLAGS+= -DOPENFOAM_VERSION_MAJOR=$(FOAM_VERSION_MAJOR) PFLAGS+= -Dcompre EXE_INC = \ @@ -19,12 +21,8 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ @@ -48,9 +46,6 @@ EXE_LIBS = \ -l$(CFDEM_LIB_COMP_NAME) \ $(CFDEM_ADD_LIB_PATHS) \ $(CFDEM_ADD_LIBS) \ - -lliquidProperties \ - -lliquidMixtureProperties \ - -lthermophysicalFunctions \ -lreactionThermophysicalModels \ -lchemistryModel \ -lradiationModels \ diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/YEqn.H b/applications/solvers/cfdemSolverRhoPimpleChem/YEqn.H index 3c82ddc8..e4d58344 100644 --- a/applications/solvers/cfdemSolverRhoPimpleChem/YEqn.H +++ b/applications/solvers/cfdemSolverRhoPimpleChem/YEqn.H @@ -13,7 +13,11 @@ tmp > mvConvection { combustion->correct(); +#if OPENFOAM_VERSION_MAJOR < 5 dQ = combustion->dQ(); +#else + Qdot = combustion->Qdot(); +#endif label inertIndex = -1; volScalarField Yt(0.0*Y[0]); @@ -72,4 +76,5 @@ tmp > mvConvection Y[inertIndex].max(0.0); } } + particleCloud.clockM().stop("Y"); diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/cfdemSolverRhoPimpleChem.C b/applications/solvers/cfdemSolverRhoPimpleChem/cfdemSolverRhoPimpleChem.C index a634ef7a..c4da39ff 100644 --- a/applications/solvers/cfdemSolverRhoPimpleChem/cfdemSolverRhoPimpleChem.C +++ b/applications/solvers/cfdemSolverRhoPimpleChem/cfdemSolverRhoPimpleChem.C @@ -30,7 +30,12 @@ Description #include "fvCFD.H" #include "turbulentFluidThermoModel.H" +#if OPENFOAM_VERSION_MAJOR < 6 #include "rhoCombustionModel.H" +#else +#include "rhoReactionThermo.H" +#include "CombustionModel.H" +#endif #include "bound.H" #include "pimpleControl.H" #include "fvOptions.H" @@ -115,7 +120,11 @@ int main(int argc, char *argv[]) particleCloud.clockM().start(26,"Flow"); +#if OPENFOAM_VERSION_MAJOR < 6 if (pimple.nCorrPIMPLE() <= 1) +#else + if (pimple.nCorrPimple() <= 1) +#endif { #include "rhoEqn.H" } diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/createFields.H b/applications/solvers/cfdemSolverRhoPimpleChem/createFields.H index 85624d06..4cda15ee 100644 --- a/applications/solvers/cfdemSolverRhoPimpleChem/createFields.H +++ b/applications/solvers/cfdemSolverRhoPimpleChem/createFields.H @@ -1,20 +1,28 @@ // thermodynamics, chemistry +#if OPENFOAM_VERSION_MAJOR < 6 Info<< "Creating combustion model\n" << endl; - autoPtr combustion ( combustionModels::rhoCombustionModel::New(mesh) ); - rhoReactionThermo& thermo = combustion->thermo(); +#else + Info<< "Reading thermophysical properties\n" << endl; + autoPtr pThermo(rhoReactionThermo::New(mesh)); + rhoReactionThermo& thermo = pThermo(); +#endif thermo.validate(args.executable(), "h", "e"); basicSpecieMixture& composition = thermo.composition(); PtrList& Y = composition.Y(); // read molecular weight +#if OPENFOAM_VERSION_MAJOR < 6 volScalarField W(composition.W()); +#else + volScalarField W(thermo.W()); +#endif bool propagateInertSpecie = true; @@ -198,6 +206,14 @@ ) ); +#if OPENFOAM_VERSION_MAJOR >= 6 + Info<< "Creating combustion model\n" << endl; + autoPtr> combustion + ( + CombustionModel::New(thermo, turbulence()) + ); +#endif + Info<< "Creating field dpdt\n" << endl; volScalarField dpdt ( @@ -214,6 +230,7 @@ Info<< "Creating field kinetic energy K\n" << endl; volScalarField K("K", 0.5*magSqr(U)); +#if OPENFOAM_VERSION_MAJOR < 5 volScalarField dQ ( IOobject @@ -227,6 +244,21 @@ mesh, dimensionedScalar("dQ", dimEnergy/dimTime, 0.0) ); +#else + volScalarField Qdot + ( + IOobject + ( + "Qdot", + runTime.timeName(), + mesh, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + mesh, + dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0.0) + ); +#endif Info<< "\nReading momentum exchange field Ksl\n" << endl; volScalarField Ksl diff --git a/applications/solvers/rStatAnalysis/Make/options b/applications/solvers/rStatAnalysis/Make/options index f91d7947..0d54afbc 100644 --- a/applications/solvers/rStatAnalysis/Make/options +++ b/applications/solvers/rStatAnalysis/Make/options @@ -23,4 +23,4 @@ EXE_LIBS = \ -lmeshTools \ -l$(CFDEM_LIB_NAME) \ $(CFDEM_ADD_LIB_PATHS) \ -$(CFDEM_ADD_LIBS) + $(CFDEM_ADD_LIBS) diff --git a/applications/solvers/rStatAnalysis/rStatAnalysis.C b/applications/solvers/rStatAnalysis/rStatAnalysis.C index 38356182..72523bfd 100644 --- a/applications/solvers/rStatAnalysis/rStatAnalysis.C +++ b/applications/solvers/rStatAnalysis/rStatAnalysis.C @@ -29,11 +29,6 @@ Description \*---------------------------------------------------------------------------*/ -// #include "fvCFD.H" -// #include "singlePhaseTransportModel.H" -// #include "turbulentTransportModel.H" -// #include "fvOptions.H" - #include "recBase.H" #include "recStatAnalysis.H" diff --git a/applications/solvers/rcfdemSolverRhoSteadyPimple/Make/options b/applications/solvers/rcfdemSolverRhoSteadyPimple/Make/options index b2b37fe7..a97830ba 100644 --- a/applications/solvers/rcfdemSolverRhoSteadyPimple/Make/options +++ b/applications/solvers/rcfdemSolverRhoSteadyPimple/Make/options @@ -1,5 +1,7 @@ include $(CFDEM_ADD_LIBS_DIR)/additionalLibs +FOAM_VERSION_MAJOR := $(word 1,$(subst ., ,$(WM_PROJECT_VERSION))) +PFLAGS+= -DOPENFOAM_VERSION_MAJOR=$(FOAM_VERSION_MAJOR) PFLAGS+= -Dcompre EXE_INC = \ diff --git a/applications/solvers/rcfdemSolverRhoSteadyPimple/rcfdemSolverRhoSteadyPimple.C b/applications/solvers/rcfdemSolverRhoSteadyPimple/rcfdemSolverRhoSteadyPimple.C index 6d2fe6e1..5eaeed0b 100644 --- a/applications/solvers/rcfdemSolverRhoSteadyPimple/rcfdemSolverRhoSteadyPimple.C +++ b/applications/solvers/rcfdemSolverRhoSteadyPimple/rcfdemSolverRhoSteadyPimple.C @@ -69,15 +69,15 @@ int main(int argc, char *argv[]) #include "createFvOptions.H" // create cfdemCloud - // #include "readGravitationalAcceleration.H" + //#include "readGravitationalAcceleration.H" cfdemCloudRec particleCloud(mesh); #include "checkModelType.H" recBase recurrenceBase(mesh); #include "updateFields.H" turbulence->validate(); - // #include "compressibleCourantNo.H" - // #include "setInitialDeltaT.H" + //#include "compressibleCourantNo.H" + //#include "setInitialDeltaT.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -108,8 +108,8 @@ int main(int argc, char *argv[]) particleCloud.clockM().start(2,"Coupling"); bool hasEvolved = particleCloud.evolve(voidfraction,Us,U); -//voidfraction = voidfractionRec; -//Us = UsRec; + //voidfraction = voidfractionRec; + //Us = UsRec; if(hasEvolved) { @@ -137,7 +137,11 @@ int main(int argc, char *argv[]) while (pimple.loop()) { // if needed, perform drag update here +#if OPENFOAM_VERSION_MAJOR < 6 if (pimple.nCorrPIMPLE() <= 1) +#else + if (pimple.nCorrPimple() <= 1) +#endif { #include "rhoEqn.H" } diff --git a/etc/bashrc b/etc/bashrc index 97057592..d430a61d 100755 --- a/etc/bashrc +++ b/etc/bashrc @@ -25,7 +25,7 @@ export CFDEM_VERSION=19.09 # Please set to the appropriate path if the default is not correct. # # activate compatible OpenFOAM version -. $HOME/OpenFOAM/OpenFOAM-4.x/etc/bashrc +. $HOME/OpenFOAM/OpenFOAM-6/etc/bashrc # # CFDEMcoupling export CFDEM_INST_DIR=$HOME/$CFDEM_PROJECT diff --git a/etc/cshrc b/etc/cshrc index feb0022c..4c02a331 100755 --- a/etc/cshrc +++ b/etc/cshrc @@ -23,7 +23,7 @@ setenv CFDEM_VERSION 19.09 # Please set to the appropriate path if the default is not correct. # # activate compatible OpenFOAM version -. $HOME/OpenFOAM/OpenFOAM-4.x/etc/cshrc +. $HOME/OpenFOAM/OpenFOAM-6/etc/cshrc # # CFDEMcoupling setenv CFDEM_INST_DIR $HOME/$CFDEM_PROJECT diff --git a/src/lagrangian/cfdemParticle/Make/options b/src/lagrangian/cfdemParticle/Make/options index 8a84bb35..f8a3be9b 100644 --- a/src/lagrangian/cfdemParticle/Make/options +++ b/src/lagrangian/cfdemParticle/Make/options @@ -3,6 +3,8 @@ sinclude $(RULES)/mplib$(WM_MPLIB) GIT_VERSION := $(shell git describe --dirty --always --tags) PFLAGS+= -DGITVERSION=\"$(GIT_VERSION)\" +FOAM_VERSION_MAJOR := $(word 1,$(subst ., ,$(WM_PROJECT_VERSION))) +PFLAGS+= -DOPENFOAM_VERSION_MAJOR=$(FOAM_VERSION_MAJOR) include $(CFDEM_ADD_LIBS_DIR)/additionalLibs diff --git a/src/lagrangian/cfdemParticle/cfdTools/versionInfo.H b/src/lagrangian/cfdemParticle/cfdTools/versionInfo.H index 7fb67161..d8483ab8 100755 --- a/src/lagrangian/cfdemParticle/cfdTools/versionInfo.H +++ b/src/lagrangian/cfdemParticle/cfdTools/versionInfo.H @@ -36,7 +36,7 @@ Description word CFDEMversion="PFM 19.09"; word compatibleLIGGGHTSversion="PFM 19.09"; -word OFversion="4.x"; +word OFversion="6"; Info << "\nCFDEMcoupling version: " << CFDEMversion << endl; Info << "compatible to LIGGGHTS version: " << compatibleLIGGGHTSversion << endl; diff --git a/src/lagrangian/cfdemParticle/subModels/IOModel/IOModel/IOModel.C b/src/lagrangian/cfdemParticle/subModels/IOModel/IOModel/IOModel.C index 3a773c16..ce63280d 100644 --- a/src/lagrangian/cfdemParticle/subModels/IOModel/IOModel/IOModel.C +++ b/src/lagrangian/cfdemParticle/subModels/IOModel/IOModel/IOModel.C @@ -30,6 +30,7 @@ Description \*---------------------------------------------------------------------------*/ #include "error.H" +#include "particle.H" #include "IOModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -99,13 +100,22 @@ void IOModel::streamDataToPath(const fileName& path, const double* const* array, OFstream fileStream(path/name); fileStream - << "FoamFile\n{\n" - << " version " << fileStream.version() << ";\n" - << " format " << fileStream.format() << ";\n" - << " class " << className << ";\n" - << " location " << 0 << ";\n" - << " object " << name << ";\n" - << "}" << nl; + << "/*--------------------------------*- C++ -*----------------------------------*\\" << nl + << " ========= |" << nl + << " \\\\ / F ield | OpenFOAM: The Open Source CFD Toolbox" << nl + << " \\\\ / O peration | Website: https://openfoam.org" << nl + << " \\\\ / A nd | Version: " << FOAMversion << nl + << " \\\\/ M anipulation |" << nl + << "\\*---------------------------------------------------------------------------*/" << nl + << "FoamFile" << nl + << "{" << nl + << " version " << fileStream.version() << ";" << nl + << " format " << fileStream.format() << ";" << nl + << " class " << className << ";" << nl + << " location " << 0 << ";" << nl + << " object " << name << ";" << nl + << "}" << nl + << "// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //" << nl << nl; fileStream << nPProc << "\n"; @@ -129,7 +139,19 @@ void IOModel::streamDataToPath(const fileName& path, const double* const* array, } else if (type == "position") { - fileStream << "( "<< array[index][0] << " " << array[index][1] << " " << array[index][2] << " ) " << cellIDs[index][0] << " \n"; +#if OPENFOAM_VERSION_MAJOR < 5 + fileStream << "( " << array[index][0] << " " << array[index][1] << " " << array[index][2] << " ) " << cellIDs[index][0] << nl; +#else + particle part + ( + particleCloud_.mesh(), + vector(array[index][0],array[index][1],array[index][2]), + cellIDs[index][0] + ); + + part.writePosition(fileStream); + fileStream << nl; +#endif } else if (type == "vector") { diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C b/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C index 513f2cf7..496556d2 100755 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillRWDrag/KochHillRWDrag.C @@ -291,7 +291,11 @@ void KochHillRWDrag::setForce() const // modify current fluid velocity for (int dim=0; dim<3; dim++) { +#if OPENFOAM_VERSION_MAJOR < 6 partUfluct_[index][dim] = RanGen_.GaussNormal()*sqrt(2.*k/3.); +#else + partUfluct_[index][dim] = RanGen_.scalarNormal()*sqrt(2.*k/3.); +#endif //Pout << "RW-TEST: Ufluid[" << dim << "] = " << Ufluid[dim] << " Ufluct = " << partUfluct_[index][dim] << " k = " << k << endl; // TEST-Output Ufluid[dim] = Ufluid[dim] + partUfluct_[index][dim]; } diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/isotropicFluctuations/isotropicFluctuations.C b/src/lagrangian/cfdemParticle/subModels/forceModel/isotropicFluctuations/isotropicFluctuations.C index 6c9c5579..ea8ec320 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/isotropicFluctuations/isotropicFluctuations.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/isotropicFluctuations/isotropicFluctuations.C @@ -1,6 +1,6 @@ /*---------------------------------------------------------------------------*\ CFDEMcoupling academic - Open Source CFD-DEM coupling - + Contributing authors: Thomas Lichtenegger Copyright (C) 2015- Johannes Kepler University, Linz @@ -83,7 +83,7 @@ isotropicFluctuations::isotropicFluctuations dimensionedScalar("D0", dimensionSet(0,0,0,0,0,0,0), D0_) ), dtDEM_(particleCloud_.dataExchangeM().DEMts()), - ranGen_(osRandomInteger()) + ranGen_(clock::getTime()+pid()) { if(ignoreCellsName_ != "none") { @@ -122,10 +122,10 @@ void isotropicFluctuations::setForce() const vector flucU(0,0,0); label cellI=0; scalar relVolfractionExcess(0.0); - + interpolationCellPoint voidfractionInterpolator_(voidfraction_); interpolationCellPoint voidfractionRecInterpolator_(voidfractionRec_); - + for(int index = 0;index < particleCloud_.numberOfParticles(); ++index) { cellI = particleCloud_.cellIDs()[index][0]; @@ -151,14 +151,14 @@ void isotropicFluctuations::setForce() const voidfractionRec = voidfractionRec_[cellI]; } // write particle based data to global array - + deltaVoidfrac=voidfractionRec-voidfraction; relVolfractionExcess=deltaVoidfrac/(1-voidfraction+SMALL); if(deltaVoidfrac>0) { D = D0Field_[cellI]; flucU=unitFlucDir()*fluctuationMag(relVolfractionExcess,D); - } + } // write particle based data to global array for(int j=0;j<3;j++) @@ -168,11 +168,11 @@ void isotropicFluctuations::setForce() const } } } - + if (measureDiff_) { dimensionedScalar diff( fvc::domainIntegrate( sqr( voidfraction_ - voidfractionRec_ ) ) ); - scalar t = particleCloud_.mesh().time().timeOutputValue(); + scalar t = particleCloud_.mesh().time().timeOutputValue(); recErrorFile_ << t << "\t" << diff.value() << endl; } } diff --git a/src/lagrangian/cfdemParticleComp/Make/options b/src/lagrangian/cfdemParticleComp/Make/options index 65a87bc4..5bd1810f 100644 --- a/src/lagrangian/cfdemParticleComp/Make/options +++ b/src/lagrangian/cfdemParticleComp/Make/options @@ -6,6 +6,8 @@ sinclude $(RULES)/mplib$(WM_MPLIB) GIT_VERSION := $(shell git describe --dirty --always --tags) PFLAGS+= -DGITVERSION=\"$(GIT_VERSION)\" +FOAM_VERSION_MAJOR := $(word 1,$(subst ., ,$(WM_PROJECT_VERSION))) +PFLAGS+= -DOPENFOAM_VERSION_MAJOR=$(FOAM_VERSION_MAJOR) PFLAGS+= -Dcompre diff --git a/src/recurrence/Make/files b/src/recurrence/Make/files index 31c09b23..eabb090e 100644 --- a/src/recurrence/Make/files +++ b/src/recurrence/Make/files @@ -12,11 +12,10 @@ recNorm/readNorm/readNorm.C recNorm/sqrDiffNorm/sqrDiffNorm.C recNorm/noRecNorm/noRecNorm.C recPath/recPath/recPath.C -recPath/recPath/newRecPath.C recPath/simpleRandomPath/simpleRandomPath.C +recPath/recPath/newRecPath.C recPath/noPath/noPath.C recPath/MarkovPath/MarkovPath.C -recPath/multiIntervalPath/multiIntervalPath.C recPath/predefinedPath/predefinedPath.C recStatAnalysis/recStatAnalysis/recStatAnalysis.C recStatAnalysis/recStatAnalysis/newRecStatAnalysis.C diff --git a/src/recurrence/Make/options b/src/recurrence/Make/options index 36523655..511a2f52 100644 --- a/src/recurrence/Make/options +++ b/src/recurrence/Make/options @@ -1,6 +1,9 @@ GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always --tags) PFLAGS+= -DGITVERSION=\"$(GIT_VERSION)\" +FOAM_VERSION_MAJOR := $(word 1,$(subst ., ,$(WM_PROJECT_VERSION))) +PFLAGS+= -DOPENFOAM_VERSION_MAJOR=$(FOAM_VERSION_MAJOR) + include $(CFDEM_ADD_LIBS_DIR)/additionalLibs EXE_INC = \ diff --git a/src/recurrence/recBase/recBase.C b/src/recurrence/recBase/recBase.C index 53b3fdcb..0b030bc3 100644 --- a/src/recurrence/recBase/recBase.C +++ b/src/recurrence/recBase/recBase.C @@ -83,14 +83,20 @@ recBase::recBase ), couplingSubStep_(recProperties_.lookupOrDefault