Merge with o2o.

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)

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

doc/CFDEMcoupling_Manual.html

@@ -214,6 +214,7 @@ listing below of styles within certain commands.
 <TR ALIGN="center"><TD ><A HREF = "dataExchangeModel_oneWayVTK.html">dataExchangeModel_oneWayVTK</A></TD><TD ><A HREF = "dataExchangeModel_twoWayFiles.html">dataExchangeModel_twoWayFiles</A></TD></TR>
 <TR ALIGN="center"><TD ><A HREF = "dataExchangeModel_twoWayMPI.html">dataExchangeModel_twoWayMPI</A></TD><TD ><A HREF = "dataExchangeModel_twoWayMany2Many.html">dataExchangeModel_twoWayMany2Many</A></TD></TR>
 <TR ALIGN="center"><TD ><A HREF = "dataExchangeModel_twoWayOne2One.html">dataExchangeModel_twoWayOne2One</A></TD><TD ><A HREF = "forceModel.html">forceModel</A></TD></TR>
+<<<<<<< HEAD
 <TR ALIGN="center"><TD ><A HREF = "forceModel_Archimedes.html">forceModel_Archimedes</A></TD><TD ><A HREF = "forceModel_ArchimedesIB.html">forceModel_ArchimedesIB</A></TD></TR>
 <TR ALIGN="center"><TD ><A HREF = "forceModel_DiFeliceDrag.html">forceModel_DiFeliceDrag</A></TD><TD ><A HREF = "forceModel_dSauter.html">forceModel_dSauter</A></TD></TR>
 <TR ALIGN="center"><TD ><A HREF = "forceModel_GidaspowDrag.html">forceModel_GidaspowDrag</A></TD><TD ><A HREF = "forceModel_KochHillDrag.html">forceModel_KochHillDrag</A></TD></TR>

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