diff --git a/doc/CFDEMcoupling_install.txt b/doc/CFDEMcoupling_install.txt index b4634e3e..8c599862 100644 --- a/doc/CFDEMcoupling_install.txt +++ b/doc/CFDEMcoupling_install.txt @@ -20,7 +20,7 @@ In the CFDEMcoupling repository take a look at the file src/lagrangian/cfdemParticle/cfdTools/versionInfo.H :pre 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 "openfoam.org"_https://openfoam.org/download/source/, cloning OpenFOAM from the @@ -29,11 +29,11 @@ git repository. cd $HOME mkdir 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. -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 @@ -42,9 +42,8 @@ sudo su - :pre Install dependent packages required for OpenFOAM on Ubuntu by executing the 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 qt4-dev-tools libqt4-dev libqt4-opengl-dev freeglut3-dev libqtwebkit-dev -apt-get install libcgal-dev :pre +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 libqt5x11extras5-dev libxt-dev qt5-default qttools5-dev curl :pre 2.1.2 Setup the environment :h5 @@ -56,7 +55,7 @@ gedit ~/.bashrc :pre 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 Save the file and reload it: @@ -67,7 +66,7 @@ source ~/.bashrc :pre [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: 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 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 system. This can be done by typing diff --git a/doc/CFDEMcoupling_models.txt b/doc/CFDEMcoupling_models.txt index 800e9eb4..2ce1c291 100644 --- a/doc/CFDEMcoupling_models.txt +++ b/doc/CFDEMcoupling_models.txt @@ -27,7 +27,8 @@ The "averagingModel"_averagingModel.html keyword entry defines the model used to map the Lagrangian data to Eulerian values. "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 @@ -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. compressible, reacting flows. +heatTransferGranConduction, heatTransferGunn, -heatTransferGunnPartField, +heatTransferRanzMarshall, reactionHeat :tb(c=2,ea=c) @@ -92,15 +94,23 @@ Fines, "MeiLift"_forceModel_MeiLift.html, "SchillerNaumannDrag"_forceModel_SchillerNaumannDrag.html, "ShirgaonkarIB"_forceModel_ShirgaonkarIB.html, +dSauter, +deactivateForce, +directedDiffusiveRelaxation, +evaluateFluctuations, "fieldStore"_forceModel_fieldStore.html, "fieldTimeAverage"_forceModel_fieldTimeAverage.html, +freeStreaming, "gradPForce"_forceModel_gradPForce.html, "gradPForceSmooth"_forceModel_gradPForceSmooth.html, granKineticEnergy, "interface"_forceModel_interface.html, +isotropicFluctuations, "noDrag"_forceModel_noDrag.html, "particleCellVolume"_forceModel_particleCellVolume.html, +particleDeformation, "pdCorrelation"_forceModel_pdCorrelation.html, +potentialRelaxation, "surfaceTensionForce"_forceModel_surfaceTensionForce.html, "virtualMassForce"_forceModel_virtualMassForce.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 used for momentum exchange between DEM and CFD simulation +deactivateCouple, "explicitCouple"_momCoupleModel_explicitCouple.html, "implicitCouple"_momCoupleModel_implicitCouple.html, "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, "bigParticle"_voidFractionModel_bigParticleVoidFraction.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) diff --git a/doc/CFDEMcoupling_solvers.txt b/doc/CFDEMcoupling_solvers.txt index acbca05a..0a24b6f4 100644 --- a/doc/CFDEMcoupling_solvers.txt +++ b/doc/CFDEMcoupling_solvers.txt @@ -15,5 +15,12 @@ This section lists all CFDEMcoupling solvers alphabetically. "cfdemSolverPisoScalar"_cfdemSolverPisoScalar.html, "cfdemSolverRhoPimple"_cfdemSolverRhoPimple.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) diff --git a/doc/cfdemSolverMultiphase.txt b/doc/cfdemSolverMultiphase.txt index 6f7a08a3..10be3bbf 100644 --- a/doc/cfdemSolverMultiphase.txt +++ b/doc/cfdemSolverMultiphase.txt @@ -29,6 +29,8 @@ END_RST --> 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 :link(Vångö2018) diff --git a/doc/cfdemSolverRhoSimple.txt b/doc/cfdemSolverRhoSimple.txt deleted file mode 100644 index d0ac3e00..00000000 --- a/doc/cfdemSolverRhoSimple.txt +++ /dev/null @@ -1,59 +0,0 @@ - - - - - -"CFDEMproject Website"_lws - "Main Page"_main :c - -:link(lws,http://www.cfdem.com) -:link(main,CFDEMcoupling_Manual.html) - -:line - -cfdemSolverRhoSimple command :h3 - -[Description:] - - -"cfdemSolverRhoSimple" is a coupled CFD-DEM solver using the CFDEMcoupling -framework. Based on the OpenFOAM®(*) solver rhoSimpleFoam, this is a -steady-state solver for turbulent flow of compressible fluids coupled with the -DEM code LIGGGHTS for solid particles. - - - - - -:line - - -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® and OpenCFD® trade marks. -OPENFOAM® is a registered trade mark of OpenCFD Limited, producer and -distributor of the OpenFOAM software via www.openfoam.com. - - - diff --git a/etc/bashrc b/etc/bashrc index d430a61d..9b9f7bc1 100755 --- a/etc/bashrc +++ b/etc/bashrc @@ -17,7 +17,7 @@ #------------------------------------------------------------------------------ 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 diff --git a/etc/cshrc b/etc/cshrc index 4c02a331..220d3828 100755 --- a/etc/cshrc +++ b/etc/cshrc @@ -15,7 +15,7 @@ #------------------------------------------------------------------------------ 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 diff --git a/src/lagrangian/cfdemParticle/cfdTools/versionInfo.H b/src/lagrangian/cfdemParticle/cfdTools/versionInfo.H index d8483ab8..64c92d4e 100755 --- a/src/lagrangian/cfdemParticle/cfdTools/versionInfo.H +++ b/src/lagrangian/cfdemParticle/cfdTools/versionInfo.H @@ -34,8 +34,8 @@ Description #ifndef versionInfo_H #define versionInfo_H -word CFDEMversion="PFM 19.09"; -word compatibleLIGGGHTSversion="PFM 19.09"; +word CFDEMversion="PFM 20.05"; +word compatibleLIGGGHTSversion="PFM 20.05"; word OFversion="6"; Info << "\nCFDEMcoupling version: " << CFDEMversion << endl;