diff --git a/etc/bashrc b/etc/bashrc index 9c425502..8b688347 100755 --- a/etc/bashrc +++ b/etc/bashrc @@ -17,7 +17,7 @@ #------------------------------------------------------------------------------ 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 diff --git a/etc/cshrc b/etc/cshrc index e6d73425..35a8bae0 100755 --- a/etc/cshrc +++ b/etc/cshrc @@ -15,7 +15,7 @@ #------------------------------------------------------------------------------ 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 diff --git a/src/lagrangian/cfdemParticle/cfdTools/versionInfo.H b/src/lagrangian/cfdemParticle/cfdTools/versionInfo.H index 64c92d4e..f47b6142 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 20.05"; -word compatibleLIGGGHTSversion="PFM 20.05"; +word CFDEMversion="PFM 20.09"; +word compatibleLIGGGHTSversion="PFM 20.09"; word OFversion="6"; Info << "\nCFDEMcoupling version: " << CFDEMversion << endl; diff --git a/tutorials/cfdemSolverPiso/voidfractionTest/DEM/post/.gitignore b/tutorials/cfdemSolverPiso/voidfractionTest/DEM/post/.gitignore new file mode 100644 index 00000000..e69de29b diff --git a/tutorials/cfdemSolverPiso/voidfractionTest/postrun.sh b/tutorials/cfdemSolverPiso/voidfractionTest/postrun.sh new file mode 100755 index 00000000..2a474cc3 --- /dev/null +++ b/tutorials/cfdemSolverPiso/voidfractionTest/postrun.sh @@ -0,0 +1,2 @@ +#!/bin/bash +# nothing to see here \ No newline at end of file diff --git a/tutorials/cfdemSolverPiso/voidfractionTest/prerun.sh b/tutorials/cfdemSolverPiso/voidfractionTest/prerun.sh new file mode 100755 index 00000000..7b370ae7 --- /dev/null +++ b/tutorials/cfdemSolverPiso/voidfractionTest/prerun.sh @@ -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 \ No newline at end of file diff --git a/tutorials/cfdemSolverPiso/voidfractionTest/run.config b/tutorials/cfdemSolverPiso/voidfractionTest/run.config new file mode 100644 index 00000000..793ad222 --- /dev/null +++ b/tutorials/cfdemSolverPiso/voidfractionTest/run.config @@ -0,0 +1,13 @@ +{ + "type" : "CFDEMcoupling", + "runs" : [ + { + "name" : "cfdemrun", + "solver" : "cfdemSolverPiso", + "type" : "CFDEMcoupling/mpi", + "nprocs" : 2, + "pre_scripts" : ["prerun.sh"], + "post_scripts" : ["postrun.sh"] + } + ] +}