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

Browse Source 
updates from release 20.09
This commit is contained in:
Daniel
2020-10-02 12:40:25 +02:00
committed by GitHub
parent c13aece161 71a78be4c9
commit 80c8d29114
7 changed files with 32 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_PROJECT=CFDEM
export CFDEM_VERSION=20.05 export CFDEM_VERSION=20.09
################################################################################ ################################################################################
# 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 20.05 setenv CFDEM_VERSION 20.09
################################################################################ ################################################################################
# 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 20.05"; word CFDEMversion="PFM 20.09";
word compatibleLIGGGHTSversion="PFM 20.05"; word compatibleLIGGGHTSversion="PFM 20.09";
word OFversion="6"; word OFversion="6";
Info << "\nCFDEMcoupling version: " << CFDEMversion << endl; Info << "\nCFDEMcoupling version: " << CFDEMversion << endl;

0
tutorials/cfdemSolverPiso/voidfractionTest/DEM/post/.gitignore vendored Normal file
View File

2
tutorials/cfdemSolverPiso/voidfractionTest/postrun.sh Executable file
View File

@ -0,0 +1,2 @@
#!/bin/bash
# nothing to see here

13
tutorials/cfdemSolverPiso/voidfractionTest/prerun.sh Executable file
View File

@ -0,0 +1,13 @@
#!/bin/bash
#- define variables
casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")"
# check if mesh was built
if [ -f "$casePath/CFD/constant/polyMesh/boundary" ]; then
echo "mesh was built before - using old mesh"
else
echo "mesh needs to be built"
cd $casePath/CFD
blockMesh
fi

13
tutorials/cfdemSolverPiso/voidfractionTest/run.config Normal file
View File

@ -0,0 +1,13 @@
{
"type" : "CFDEMcoupling",
"runs" : [
{
"name" : "cfdemrun",
"solver" : "cfdemSolverPiso",
"type" : "CFDEMcoupling/mpi",
"nprocs" : 2,
"pre_scripts" : ["prerun.sh"],
"post_scripts" : ["postrun.sh"]
}
]
}