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 branch 'master' into develop

Browse Source
This commit is contained in:
Daniel Queteschiner
2017-09-07 13:26:37 +02:00
parent 2e14d14a60 b8921ec6ca
commit 3ab97478a7
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etc/bashrc
View File

@ -17,7 +17,7 @@
#------------------------------------------------------------------------------
export CFDEM_PROJECT=CFDEM
export CFDEM_VERSION=17.02
export CFDEM_VERSION=17.08
################################################################################
# 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_VERSION 17.02
setenv CFDEM_VERSION 17.08
################################################################################
# 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
#define versionInfo_H
word CFDEMversion="PFM 17.02";
word compatibleLIGGGHTSversion="PFM 17.02";
word CFDEMversion="PFM 17.08";
word compatibleLIGGGHTSversion="PFM 17.08";
word OFversion="4.x";
Info << "\nCFDEMcoupling version: " << CFDEMversion << endl;