zhyang-dev/CFDEMcoupling-PFM
1
0
Fork 0
mirror of https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git synced 2025-12-08 06:37:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #103 from ParticulateFlow/master

Browse Source 
Update from release 20.05
This commit is contained in:
Daniel
2020-06-22 09:52:21 +02:00
committed by GitHub
parent fa584672ab bba5d13264
commit f3c46fd09f
8 changed files with 38 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
doc/CFDEMcoupling_install.txt
View File

@ -20,7 +20,7 @@ In the CFDEMcoupling repository take a look at the file
src/lagrangian/cfdemParticle/cfdTools/versionInfo.H :pre src/lagrangian/cfdemParticle/cfdTools/versionInfo.H :pre
to find out the latest tested version of LIGGGHTS and OpenFOAM that work with to find out the latest tested version of LIGGGHTS and OpenFOAM that work with
CFDEMcoupling. As of this writing the version of OpenFOAM to be used is 4.x. CFDEMcoupling. As of this writing the version of OpenFOAM to be used is 6.
You can then basically follow the instructions at You can then basically follow the instructions at
"openfoam.org"_https://openfoam.org/download/source/, cloning OpenFOAM from the "openfoam.org"_https://openfoam.org/download/source/, cloning OpenFOAM from the
@ -29,11 +29,11 @@ git repository.
cd $HOME cd $HOME
mkdir OpenFOAM mkdir OpenFOAM
cd OpenFOAM cd OpenFOAM
git clone https://github.com/OpenFOAM/OpenFOAM-4.x.git :pre git clone https://github.com/OpenFOAM/OpenFOAM-6.git :pre
Clone the corresponding third party packages to the OpenFOAM folder. Clone the corresponding third party packages to the OpenFOAM folder.
git clone https://github.com/OpenFOAM/ThirdParty-4.x.git :pre git clone https://github.com/OpenFOAM/ThirdParty-6.git :pre
Switch to root user with sudo Switch to root user with sudo
@ -42,9 +42,8 @@ sudo su - :pre
Install dependent packages required for OpenFOAM on Ubuntu by executing the Install dependent packages required for OpenFOAM on Ubuntu by executing the
following commands: following commands:
apt-get install build-essential flex bison cmake zlib1g-dev libboost-system-dev libboost-thread-dev libopenmpi-dev openmpi-bin gnuplot libreadline-dev libncurses-dev libxt-dev apt-get install build-essential flex bison git-core cmake zlib1g-dev libboost-system-dev libboost-thread-dev libopenmpi-dev openmpi-bin gnuplot libreadline-dev libncurses-dev libxt-dev
apt-get install qt4-dev-tools libqt4-dev libqt4-opengl-dev freeglut3-dev libqtwebkit-dev apt-get install libqt5x11extras5-dev libxt-dev qt5-default qttools5-dev curl :pre
apt-get install libcgal-dev :pre
2.1.2 Setup the environment :h5 2.1.2 Setup the environment :h5
@ -56,7 +55,7 @@ gedit ~/.bashrc :pre
and add the following lines: and add the following lines:
source $HOME/OpenFOAM/OpenFOAM-4.x/etc/bashrc source $HOME/OpenFOAM/OpenFOAM-6/etc/bashrc
export WM_NCOMPPROCS=4 :pre export WM_NCOMPPROCS=4 :pre
Save the file and reload it: Save the file and reload it:
@ -67,7 +66,7 @@ source ~/.bashrc :pre
[Additional check] [Additional check]
Open ~/OpenFOAM/OpenFOAM-4.x/etc/bashrc and make sure that {WM_MPLIB} is set Open ~/OpenFOAM/OpenFOAM-6/etc/bashrc and make sure that {WM_MPLIB} is set
correctly: correctly:
export WM_MPLIB=SYSTEMOPENMPI :pre export WM_MPLIB=SYSTEMOPENMPI :pre
@ -89,7 +88,7 @@ cd $WM_THIRD_PARTY_DIR
Paraview is a third-party software provided for graphical post-processing in Paraview is a third-party software provided for graphical post-processing in
OpenFOAM. Its compilation is automated using a script called makeParaView in the OpenFOAM. Its compilation is automated using a script called makeParaView in the
ThirdParty-4.x directory. ThirdParty-6 directory.
Before installing Paraview, check the version of cmake that is installed on the Before installing Paraview, check the version of cmake that is installed on the
system. This can be done by typing system. This can be done by typing

19
doc/CFDEMcoupling_models.txt
View File

@ -27,7 +27,8 @@ The "averagingModel"_averagingModel.html keyword entry defines the model used to
map the Lagrangian data to Eulerian values. map the Lagrangian data to Eulerian values.
"dense"_averagingModel_dense.html, "dense"_averagingModel_dense.html,
"dilute"_averagingModel_dilute.html :tb(c=2,ea=c) "dilute"_averagingModel_dilute.html,
off :tb(c=2,ea=c)
6.3 Chemistry models :h4 6.3 Chemistry models :h4
@ -69,8 +70,9 @@ that performs the data exchange between the DEM code and the CFD code.
The {energyModels} keyword specifies a list of energy models used for e.g. The {energyModels} keyword specifies a list of energy models used for e.g.
compressible, reacting flows. compressible, reacting flows.
heatTransferGranConduction,
heatTransferGunn, heatTransferGunn,
heatTransferGunnPartField, heatTransferRanzMarshall,
reactionHeat :tb(c=2,ea=c) reactionHeat :tb(c=2,ea=c)
@ -92,15 +94,23 @@ Fines,
"MeiLift"_forceModel_MeiLift.html, "MeiLift"_forceModel_MeiLift.html,
"SchillerNaumannDrag"_forceModel_SchillerNaumannDrag.html, "SchillerNaumannDrag"_forceModel_SchillerNaumannDrag.html,
"ShirgaonkarIB"_forceModel_ShirgaonkarIB.html, "ShirgaonkarIB"_forceModel_ShirgaonkarIB.html,
dSauter,
deactivateForce,
directedDiffusiveRelaxation,
evaluateFluctuations,
"fieldStore"_forceModel_fieldStore.html, "fieldStore"_forceModel_fieldStore.html,
"fieldTimeAverage"_forceModel_fieldTimeAverage.html, "fieldTimeAverage"_forceModel_fieldTimeAverage.html,
freeStreaming,
"gradPForce"_forceModel_gradPForce.html, "gradPForce"_forceModel_gradPForce.html,
"gradPForceSmooth"_forceModel_gradPForceSmooth.html, "gradPForceSmooth"_forceModel_gradPForceSmooth.html,
granKineticEnergy, granKineticEnergy,
"interface"_forceModel_interface.html, "interface"_forceModel_interface.html,
isotropicFluctuations,
"noDrag"_forceModel_noDrag.html, "noDrag"_forceModel_noDrag.html,
"particleCellVolume"_forceModel_particleCellVolume.html, "particleCellVolume"_forceModel_particleCellVolume.html,
particleDeformation,
"pdCorrelation"_forceModel_pdCorrelation.html, "pdCorrelation"_forceModel_pdCorrelation.html,
potentialRelaxation,
"surfaceTensionForce"_forceModel_surfaceTensionForce.html, "surfaceTensionForce"_forceModel_surfaceTensionForce.html,
"virtualMassForce"_forceModel_virtualMassForce.html, "virtualMassForce"_forceModel_virtualMassForce.html,
"viscForce"_forceModel_viscForce.html, "viscForce"_forceModel_viscForce.html,
@ -153,6 +163,7 @@ used to manipulate the CFD mesh according to the DEM mesh motion.
The "momCoupleModels"_momCoupleModel.html keyword specifies a list of models The "momCoupleModels"_momCoupleModel.html keyword specifies a list of models
used for momentum exchange between DEM and CFD simulation used for momentum exchange between DEM and CFD simulation
deactivateCouple,
"explicitCouple"_momCoupleModel_explicitCouple.html, "explicitCouple"_momCoupleModel_explicitCouple.html,
"implicitCouple"_momCoupleModel_implicitCouple.html, "implicitCouple"_momCoupleModel_implicitCouple.html,
"off"_momCoupleModel_noCouple.html :tb(c=2,ea=c) "off"_momCoupleModel_noCouple.html :tb(c=2,ea=c)
@ -214,5 +225,7 @@ accounting for the volume of the particles in the CFD domain.
"IB"_voidFractionModel_IBVoidFraction.html, "IB"_voidFractionModel_IBVoidFraction.html,
"bigParticle"_voidFractionModel_bigParticleVoidFraction.html, "bigParticle"_voidFractionModel_bigParticleVoidFraction.html,
"centre"_voidFractionModel_centreVoidFraction.html, "centre"_voidFractionModel_centreVoidFraction.html,
"divided"_voidFractionModel_dividedVoidFraction.html :tb(c=2,ea=c) "divided"_voidFractionModel_dividedVoidFraction.html,
off,
trilinear :tb(c=2,ea=c)

9
doc/CFDEMcoupling_solvers.txt
View File

@ -15,5 +15,12 @@ This section lists all CFDEMcoupling solvers alphabetically.
"cfdemSolverPisoScalar"_cfdemSolverPisoScalar.html, "cfdemSolverPisoScalar"_cfdemSolverPisoScalar.html,
"cfdemSolverRhoPimple"_cfdemSolverRhoPimple.html, "cfdemSolverRhoPimple"_cfdemSolverRhoPimple.html,
"cfdemSolverRhoPimpleChem"_cfdemSolverRhoPimpleChem.html, "cfdemSolverRhoPimpleChem"_cfdemSolverRhoPimpleChem.html,
"cfdemSolverRhoSimple"_cfdemSolverRhoSimple.html :tb(c=2,ea=c) rStatAnalysis,
rcfdemSolverBase,
rcfdemSolverCoupledHeattransfer,
rcfdemSolverHeattransfer,
rcfdemSolverRhoSteadyPimple,
recSolverTurbTransport,
rtfmSolverSpecies,
testTwoFluidRecurrenceTurbulence :tb(c=2,ea=c)

2
doc/cfdemSolverMultiphase.txt
View File

@ -29,6 +29,8 @@ END_RST -->
For more details, see "Vångö et al. (2018)"_#Vångö2018. For more details, see "Vångö et al. (2018)"_#Vångö2018.
IMPORTANT NOTE: This solver requires OpenFOAM 4.x or 5.x to work properly.
:line :line
:link(Vångö2018) :link(Vångö2018)

59
doc/cfdemSolverRhoSimple.txt
View File

@ -1,59 +0,0 @@
<!-- HTML_ONLY -->
<HEAD>
<META CHARSET="utf-8">
</HEAD>
<!-- END_HTML_ONLY -->
"CFDEMproject Website"_lws - "Main Page"_main :c
:link(lws,http://www.cfdem.com)
:link(main,CFDEMcoupling_Manual.html)
:line
cfdemSolverRhoSimple command :h3
[Description:]
<!-- HTML_ONLY -->
"cfdemSolverRhoSimple" is a coupled CFD-DEM solver using the CFDEMcoupling
framework. Based on the OpenFOAM&reg;(*) solver rhoSimpleFoam, this is a
steady-state solver for turbulent flow of compressible fluids coupled with the
DEM code LIGGGHTS for solid particles.
<!-- END_HTML_ONLY -->
<!-- RST
"cfdemSolverRhoSimple" is a coupled CFD-DEM solver using the CFDEMcoupling
framework. Based on the OpenFOAM\ |reg|\ (*) solver rhoSimpleFoam, this is a
steady-state solver for turbulent flow of compressible fluids coupled with the
DEM code LIGGGHTS for solid particles.
.. |reg| unicode:: U+000AE .. REGISTERED SIGN
END_RST -->
:line
<!-- HTML_ONLY -->
NOTE:
(*) This offering is not approved or endorsed by OpenCFD Limited, producer and
distributor of the OpenFOAM software via www.openfoam.com, and owner of the
OPENFOAM&reg; and OpenCFD&reg; trade marks.
OPENFOAM&reg; is a registered trade mark of OpenCFD Limited, producer and
distributor of the OpenFOAM software via www.openfoam.com.
<!-- END_HTML_ONLY -->
<!-- RST
.. note::
(*) This offering is not approved or endorsed by OpenCFD Limited, producer
and distributor of the OpenFOAM software via www.openfoam.com, and owner of
the OPENFOAM\ |reg| and OpenCFD\ |reg| trade marks.
OPENFOAM\ |reg| is a registered trade mark of OpenCFD Limited, producer and
distributor of the OpenFOAM software via www.openfoam.com.
.. |reg| unicode:: U+000AE .. REGISTERED SIGN
END_RST -->

2
etc/bashrc
View File

@ -17,7 +17,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
export CFDEM_PROJECT=CFDEM export CFDEM_PROJECT=CFDEM
export CFDEM_VERSION=19.09 export CFDEM_VERSION=20.05
################################################################################ ################################################################################
# USER EDITABLE PART: Changes made here may be lost with the next upgrade # USER EDITABLE PART: Changes made here may be lost with the next upgrade

2
etc/cshrc
View File

@ -15,7 +15,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
setenv CFDEM_PROJECT CFDEM setenv CFDEM_PROJECT CFDEM
setenv CFDEM_VERSION 19.09 setenv CFDEM_VERSION 20.05
################################################################################ ################################################################################
# USER EDITABLE PART: Changes made here may be lost with the next upgrade # USER EDITABLE PART: Changes made here may be lost with the next upgrade

4
src/lagrangian/cfdemParticle/cfdTools/versionInfo.H
View File

@ -34,8 +34,8 @@ Description
#ifndef versionInfo_H #ifndef versionInfo_H
#define versionInfo_H #define versionInfo_H
word CFDEMversion="PFM 19.09"; word CFDEMversion="PFM 20.05";
word compatibleLIGGGHTSversion="PFM 19.09"; word compatibleLIGGGHTSversion="PFM 20.05";
word OFversion="6"; word OFversion="6";
Info << "\nCFDEMcoupling version: " << CFDEMversion << endl; Info << "\nCFDEMcoupling version: " << CFDEMversion << endl;