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/src/lagrangian/cfdemParticle/subModels/forceModel/isotropicFluctuations/isotropicFluctuations.C b/src/lagrangian/cfdemParticle/subModels/forceModel/isotropicFluctuations/isotropicFluctuations.C index d67b1391..ea8ec320 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/isotropicFluctuations/isotropicFluctuations.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/isotropicFluctuations/isotropicFluctuations.C @@ -83,7 +83,7 @@ isotropicFluctuations::isotropicFluctuations dimensionedScalar("D0", dimensionSet(0,0,0,0,0,0,0), D0_) ), dtDEM_(particleCloud_.dataExchangeM().DEMts()), - ranGen_(0) + ranGen_(clock::getTime()+pid()) { if(ignoreCellsName_ != "none") { 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/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