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 #81 from ParticulateFlow/master

Browse Source 
Merge changes from release 19.02
This commit is contained in:
Daniel
2019-02-22 17:19:11 +01:00
committed by GitHub
parent c441753ff9 8625396bea
commit 8dd994c4a0
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=18.10
export CFDEM_VERSION=19.02
################################################################################
# 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 18.10
setenv CFDEM_VERSION 19.02
################################################################################
# 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 18.10";
word compatibleLIGGGHTSversion="PFM 18.10";
word CFDEMversion="PFM 19.02";
word compatibleLIGGGHTSversion="PFM 19.02";
word OFversion="4.x";
Info << "\nCFDEMcoupling version: " << CFDEMversion << endl;