diff --git a/applications/solvers/cfdemSolverPiso/Make/options b/applications/solvers/cfdemSolverPiso/Make/options index 22cdcc2b..6c0806b0 100644 --- a/applications/solvers/cfdemSolverPiso/Make/options +++ b/applications/solvers/cfdemSolverPiso/Make/options @@ -18,6 +18,7 @@ EXE_LIBS = \ -lincompressibleTransportModels \ -lfiniteVolume \ -lmeshTools \ + -lfvOptions \ -l$(CFDEM_LIB_NAME) \ $(CFDEM_ADD_LIB_PATHS) \ $(CFDEM_ADD_LIBS) diff --git a/applications/solvers/cfdemSolverPiso/UEqn.H b/applications/solvers/cfdemSolverPiso/UEqn.H index ad5699aa..bfc3121d 100644 --- a/applications/solvers/cfdemSolverPiso/UEqn.H +++ b/applications/solvers/cfdemSolverPiso/UEqn.H @@ -4,6 +4,7 @@ fvVectorMatrix UEqn + fvm::div(phi,U) - fvm::Sp(fvc::div(phi),U) + particleCloud.divVoidfractionTau(U, voidfraction) == + fvOptions(U) - fvm::Sp(Ksl/rho,U) ); diff --git a/doc/CFDEMcoupling_Manual.html b/doc/CFDEMcoupling_Manual.html index 6255c48f..47c7331a 100644 --- a/doc/CFDEMcoupling_Manual.html +++ b/doc/CFDEMcoupling_Manual.html @@ -214,6 +214,7 @@ listing below of styles within certain commands. dataExchangeModel_oneWayVTKdataExchangeModel_twoWayFiles dataExchangeModel_twoWayMPIdataExchangeModel_twoWayMany2Many dataExchangeModel_twoWayOne2OneforceModel +<<<<<<< HEAD forceModel_ArchimedesforceModel_ArchimedesIB forceModel_DiFeliceDragforceModel_dSauter forceModel_GidaspowDragforceModel_KochHillDrag diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C index b9e29785..d520a627 100644 --- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C +++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C @@ -744,7 +744,8 @@ void twoWayOne2One::locateParticles() const } lig2foam_mask_ = new bool[lig2foam_->ncollected_]; - labelList cellIds(0); + DynamicList