diff --git a/applications/solvers/cfdemSolverIB/cfdemSolverIB.C b/applications/solvers/cfdemSolverIB/cfdemSolverIB.C index c6ec5e4..912cb6c 100755 --- a/applications/solvers/cfdemSolverIB/cfdemSolverIB.C +++ b/applications/solvers/cfdemSolverIB/cfdemSolverIB.C @@ -29,7 +29,7 @@ Application Description Transient solver for incompressible flow. - The code is an evolution of the solver pisoFoam in OpenFOAM 1.6, + The code is an evolution of the solver pisoFoam in OpenFOAM(R) 1.6, where additional functionality for CFD-DEM coupling using immersed body (fictitious domain) method is added. Contributions diff --git a/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C b/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C index 56f1cbd..84f8f72 100644 --- a/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C +++ b/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C @@ -30,7 +30,7 @@ Application Description Transient solver for incompressible flow. Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected. - The code is an evolution of the solver pisoFoam in OpenFOAM 1.6, + The code is an evolution of the solver pisoFoam in OpenFOAM(R) 1.6, where additional functionality for CFD-DEM coupling is added. \*---------------------------------------------------------------------------*/ diff --git a/applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C b/applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C index 17c846d..86656e0 100644 --- a/applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C +++ b/applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C @@ -30,7 +30,7 @@ Application Description Transient solver for incompressible flow. Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected. - The code is an evolution of the solver pisoFoam in OpenFOAM 1.6, + The code is an evolution of the solver pisoFoam in OpenFOAM(R) 1.6, where additional functionality for CFD-DEM coupling is added. \*---------------------------------------------------------------------------*/ diff --git a/doc/CFDEMcoupling_Manual.html b/doc/CFDEMcoupling_Manual.html index 8b23173..9ecb9f3 100644 --- a/doc/CFDEMcoupling_Manual.html +++ b/doc/CFDEMcoupling_Manual.html @@ -188,32 +188,17 @@ In order to get the latest code version, please use the git repository at http:/ listing below of styles within certain commands.

- - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + +
IOModelIOModel_basicIO
IOModel_noIOaveragingModel
averagingModel_dilutecfdemSolverIB
cfdemSolverPisocfdemSolverPisoScalar
clockModelclockModel_noClock
clockModel_standardClockdataExchangeModel
dataExchangeModel_noDataExchangedataExchangeModel_oneWayVTK
dataExchangeModel_twoWayFilesdataExchangeModel_twoWayMPI
forceModelforceModel_Archimedes
forceModel_ArchimedesIBforceModel_DiFeliceDrag
forceModel_GidaspowDragforceModel_KochHillDrag
forceModel_LaEuScalarTempforceModel_MeiLift
forceModel_SchillerNaumannDragforceModel_SchirgaonkarIB
forceModel_gradPForceforceModel_noDrag
forceModel_virtualMassForceforceModel_viscForce
liggghtsCommandModelliggghtsCommandModel_execute
liggghtsCommandModel_readLiggghtsDataliggghtsCommandModel_runLiggghts
liggghtsCommandModel_writeLiggghtslocateModel
locateModel_engineSearchlocateModel_engineSearchIB
locateModel_standardSearchmeshMotionModel
meshMotionModel_noMeshMotionmomCoupleModel
momCoupleModel_explicitCouplemomCoupleModel_implicitCouple
momCoupleModel_noCoupleregionModel
regionModel_allRegionvoidfractionModel
voidfractionModel_GaussVoidFractionvoidfractionModel_bigParticleVoidFraction
voidfractionModel_centreVoidFractionvoidfractionModel_dividedVoidFraction +
IOModelIOModel_basicIOIOModel_noIOaveragingModelaveragingModel_dilutecfdemSolverIB
cfdemSolverPisocfdemSolverPisoScalarclockModelclockModel_noClockclockModel_standardClockdataExchangeModel
dataExchangeModel_noDataExchangedataExchangeModel_oneWayVTKdataExchangeModel_twoWayFilesdataExchangeModel_twoWayMPIforceModelforceModelMS
forceModelMS_DiFeliceDragMSforceModel_ArchimedesforceModel_ArchimedesIBforceModel_DiFeliceDragforceModel_GidaspowDragforceModel_KochHillDrag
forceModel_LaEuScalarDustforceModel_LaEuScalarTempforceModel_MeiLiftforceModel_SchillerNaumannDragforceModel_SchirgaonkarIBforceModel_fieldTimeAverage
forceModel_gradPForceforceModel_interfaceforceModel_noDragforceModel_totalMomentumExchangeforceModel_virtualMassForceforceModel_viscForce
forceModel_volWeightedAverageliggghtsCommandModelliggghtsCommandModel_executeliggghtsCommandModel_readLiggghtsDataliggghtsCommandModel_runLiggghtsliggghtsCommandModel_writeLiggghts
locateModellocateModel_engineSearchlocateModel_engineSearchIBlocateModel_standardSearchlocateModel_turboEngineSearchmeshMotionModel
meshMotionModel_DEMdrivenMeshMotionmeshMotionModel_noMeshMotionmomCoupleModelmomCoupleModel_explicitCouplemomCoupleModel_implicitCouplemomCoupleModel_noCouple
regionModelregionModel_allRegionregionModel_differentialRegionvoidfractionModelvoidfractionModel_GaussVoidFractionvoidfractionModel_bigParticleVoidFraction
voidfractionModel_centreVoidFractionvoidfractionModel_dividedMSVoidFractionMSvoidfractionModel_dividedVoidFraction
diff --git a/doc/CFDEMcoupling_Manual.pdf b/doc/CFDEMcoupling_Manual.pdf index 50cf1bc..cdfc4f6 100644 Binary files a/doc/CFDEMcoupling_Manual.pdf and b/doc/CFDEMcoupling_Manual.pdf differ diff --git a/doc/CFDEMcoupling_Manual.txt b/doc/CFDEMcoupling_Manual.txt index 89567ff..fd21fd2 100644 --- a/doc/CFDEMcoupling_Manual.txt +++ b/doc/CFDEMcoupling_Manual.txt @@ -310,8 +310,6 @@ Reasonable example settings for the "liggghtsCommands" dictionary are given in t - - @@ -338,19 +336,26 @@ listing below of styles within certain commands. "dataExchangeModel_twoWayFiles"_dataExchangeModel_twoWayFiles.html, "dataExchangeModel_twoWayMPI"_dataExchangeModel_twoWayMPI.html, "forceModel"_forceModel.html, +"forceModelMS"_forceModelMS.html, +"forceModelMS_DiFeliceDragMS"_forceModelMS_DiFeliceDragMS.html, "forceModel_Archimedes"_forceModel_Archimedes.html, "forceModel_ArchimedesIB"_forceModel_ArchimedesIB.html, "forceModel_DiFeliceDrag"_forceModel_DiFeliceDrag.html, "forceModel_GidaspowDrag"_forceModel_GidaspowDrag.html, "forceModel_KochHillDrag"_forceModel_KochHillDrag.html, +"forceModel_LaEuScalarDust"_forceModel_LaEuScalarDust.html, "forceModel_LaEuScalarTemp"_forceModel_LaEuScalarTemp.html, "forceModel_MeiLift"_forceModel_MeiLift.html, "forceModel_SchillerNaumannDrag"_forceModel_SchillerNaumannDrag.html, "forceModel_SchirgaonkarIB"_forceModel_ShirgaonkarIB.html, +"forceModel_fieldTimeAverage"_forceModel_fieldTimeAverage.html, "forceModel_gradPForce"_forceModel_gradPForce.html, +"forceModel_interface"_forceModel_interface.html, "forceModel_noDrag"_forceModel_noDrag.html, +"forceModel_totalMomentumExchange"_forceModel_totalMomentumExchange.html, "forceModel_virtualMassForce"_forceModel_virtualMassForce.html, "forceModel_viscForce"_forceModel_viscForce.html, +"forceModel_volWeightedAverage"_forceModel_volWeightedAverage.html, "liggghtsCommandModel"_liggghtsCommandModel.html, "liggghtsCommandModel_execute"_liggghtsCommandModel_execute.html, "liggghtsCommandModel_readLiggghtsData"_liggghtsCommandModel_readLiggghtsData.html, @@ -360,7 +365,9 @@ listing below of styles within certain commands. "locateModel_engineSearch"_locateModel_engineSearch.html, "locateModel_engineSearchIB"_locateModel_engineSearchIB.html, "locateModel_standardSearch"_locateModel_standardSearch.html, +"locateModel_turboEngineSearch"_locateModel_turboEngineSearch.html, "meshMotionModel"_meshMotionModel.html, +"meshMotionModel_DEMdrivenMeshMotion"_meshMotionModel_DEMdrivenMeshMotion.html, "meshMotionModel_noMeshMotion"_meshMotionModel_noMeshMotion.html, "momCoupleModel"_momCoupleModel.html, "momCoupleModel_explicitCouple"_momCoupleModel_explicitCouple.html, @@ -368,8 +375,10 @@ listing below of styles within certain commands. "momCoupleModel_noCouple"_momCoupleModel_noCouple.html, "regionModel"_regionModel.html, "regionModel_allRegion"_regionModel_allRegion.html, +"regionModel_differentialRegion"_regionModel_differentialRegion.html, "voidfractionModel"_voidFractionModel.html, "voidfractionModel_GaussVoidFraction"_voidFractionModel_GaussVoidFraction.html, "voidfractionModel_bigParticleVoidFraction"_voidFractionModel_bigParticleVoidFraction.html, "voidfractionModel_centreVoidFraction"_voidFractionModel_centreVoidFraction.html, -"voidfractionModel_dividedVoidFraction"_voidFractionModel_dividedVoidFraction.html :tb(c=2,ea=c) \ No newline at end of file +"voidfractionModel_dividedMSVoidFractionMS"_voidFractionModel_dividedVoidFractionMS.html, +"voidfractionModel_dividedVoidFraction"_voidFractionModel_dividedVoidFraction.html :tb(c=6,ea=c) diff --git a/doc/averagingModel.txt b/doc/averagingModel.txt index 6ec694a..047b8be 100644 --- a/doc/averagingModel.txt +++ b/doc/averagingModel.txt @@ -17,6 +17,7 @@ model = name of averaging model to be applied :ul [Examples:] +test averagingModel dense; averagingModel dilute; :pre diff --git a/doc/githubAccess_public.pdf b/doc/githubAccess_public.pdf index 48ed08c..24a72ef 100644 Binary files a/doc/githubAccess_public.pdf and b/doc/githubAccess_public.pdf differ diff --git a/src/lagrangian/cfdemParticle/Make/files b/src/lagrangian/cfdemParticle/Make/files index d97f478..d986c7a 100644 --- a/src/lagrangian/cfdemParticle/Make/files +++ b/src/lagrangian/cfdemParticle/Make/files @@ -30,6 +30,9 @@ $(forceModels)/virtualMassForce/virtualMassForce.C $(forceModels)/gradPForce/gradPForce.C $(forceModels)/viscForce/viscForce.C $(forceModels)/MeiLift/MeiLift.C +$(forceModels)/DiFeliceDragNLift/DiFeliceDragNLift.C +$(forceModels)/gradULiftForce/gradULiftForce.C +$(forceModels)/KochHillDragNLift/KochHillDragNLift.C $(IOModels)/IOModel/IOModel.C $(IOModels)/IOModel/newIOModel.C diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillDrag/KochHillDrag.H b/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillDrag/KochHillDrag.H index 8c75138..2c74729 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillDrag/KochHillDrag.H +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/KochHillDrag/KochHillDrag.H @@ -29,7 +29,8 @@ Description and OpenFOAM(R). Note: this code is not part of OpenFOAM(R) (see DISCLAIMER). Koch, Hill drag law - based on Koch Hill 2001,"Inertial effects in suspensions and porous-media flows", Annual Review of fluid mechanics. + based on Koch Hill 2001,"Inertial effects in suspensions and porous-media + flows", Annual Review of fluid mechanics. including interpolation of the velocity to the exact position Class diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/DEM/post/dummy b/tutorials/cfdemSolverPiso/ErgunTestMPI/DEM/post/dummy index 9ca241b..bd18d4f 100644 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI/DEM/post/dummy +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/DEM/post/dummy @@ -1,3 +1,4 @@ dummyfile dummyfile dummyfile +dummyfile diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/DEM/post/dummy b/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/DEM/post/dummy index e69de29..ebf63df 100644 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/DEM/post/dummy +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/DEM/post/dummy @@ -0,0 +1 @@ +dummyfile