From 1b4a41a3192955da2330bb6d28292ccd1267e706 Mon Sep 17 00:00:00 2001
From: Paul Kieckhefen <paul.kieckhefen@tuhh.de>
Date: Mon, 6 Aug 2018 15:46:38 +0200
Subject: [PATCH 1/2] make fvOptions work in cfdemSolverPiso.

---
 applications/solvers/cfdemSolverPiso/Make/options | 1 +
 applications/solvers/cfdemSolverPiso/UEqn.H       | 1 +
 2 files changed, 2 insertions(+)

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)
 );
 

From 1c44a3a09f4de562b0f13004b755fafa6361117e Mon Sep 17 00:00:00 2001
From: Paul Kieckhefen <paul.kieckhefen@tuhh.de>
Date: Sat, 13 Oct 2018 13:35:35 +0200
Subject: [PATCH 2/2] remove bottleneck in locating particles by using
 appropriate container for cell ids.

---
 .../subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.C  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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<label> cellIds;
+    cellIds.setCapacity(lig2foam_->ncollected_);
     label n_located(0);
     label roundedCelli(-1);
     const label nCells(particleCloud_.mesh().cells().size());