From 32283e8ac3b31cca7e9ba6f7fe041c13041516ce Mon Sep 17 00:00:00 2001 From: Daniel <2929574+danielque@users.noreply.github.com> Date: Tue, 30 Nov 2021 10:22:11 +0100 Subject: [PATCH 1/6] add a pull request template file [ci skip] when creating a new pull request on GitHub, the pull request template file is used to provide default text for the pull request description; must be present in the default branch (e.g. master or main) of the repository to take effect; --- .github/pull_request_template.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 00000000..c2c2b0e0 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,24 @@ + + +## Description of proposed changes + + +## Types of changes + + +- [ ] Bugfix +- [ ] Feature +- [ ] Refactoring (no functional changes, no api changes) +- [ ] Build related changes +- [ ] Documentation updates +- [ ] Other (please describe): + +## Checklist + +- [ ] Code compiles correctly (mandatory for bugfixes / features / refactoring / build process) +- [ ] Tests for the changes have been added / updated (mandatory for bugfixes / features) +- [ ] Documentation has been added / updated (mandatory for bugfixes / features) + +## Further comments + From 62b22d191f884fcfeed8e68dd5d2e75df0219bbf Mon Sep 17 00:00:00 2001 From: danielque Date: Thu, 23 Dec 2021 17:44:34 +0100 Subject: [PATCH 2/6] bump version number to 21.11 [ci skip] --- etc/bashrc | 2 +- etc/cshrc | 2 +- src/lagrangian/cfdemParticle/cfdTools/versionInfo.H | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/bashrc b/etc/bashrc index 1a19a12d..ceb6c91a 100755 --- a/etc/bashrc +++ b/etc/bashrc @@ -17,7 +17,7 @@ #------------------------------------------------------------------------------ export CFDEM_PROJECT=CFDEM -export CFDEM_VERSION=21.03 +export CFDEM_VERSION=21.11 ################################################################################ # USER EDITABLE PART: Changes made here may be lost with the next upgrade diff --git a/etc/cshrc b/etc/cshrc index 2bbf265a..cb691cfd 100755 --- a/etc/cshrc +++ b/etc/cshrc @@ -15,7 +15,7 @@ #------------------------------------------------------------------------------ setenv CFDEM_PROJECT CFDEM -setenv CFDEM_VERSION 21.03 +setenv CFDEM_VERSION 21.11 ################################################################################ # 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 179e86a9..531daf3f 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 21.03"; -word compatibleLIGGGHTSversion="PFM 21.03"; +word CFDEMversion="PFM 21.11"; +word compatibleLIGGGHTSversion="PFM 21.11"; word OFversion="6"; Info << "\nCFDEMcoupling version: " << CFDEMversion << endl; From c378a736500b9e98e25b11098c52fb3656c0ccdd Mon Sep 17 00:00:00 2001 From: danielque Date: Mon, 10 Jan 2022 11:35:55 +0100 Subject: [PATCH 3/6] explicitly set initial old-time values of rhoeps --- .../solvers/cfdemSolverRhoPimple/cfdemSolverRhoPimple.C | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/applications/solvers/cfdemSolverRhoPimple/cfdemSolverRhoPimple.C b/applications/solvers/cfdemSolverRhoPimple/cfdemSolverRhoPimple.C index 45db4b84..19ad293f 100644 --- a/applications/solvers/cfdemSolverRhoPimple/cfdemSolverRhoPimple.C +++ b/applications/solvers/cfdemSolverRhoPimple/cfdemSolverRhoPimple.C @@ -79,6 +79,7 @@ int main(int argc, char *argv[]) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; + bool firstStep = true; while (runTime.run()) { @@ -135,6 +136,11 @@ int main(int argc, char *argv[]) if (pimple.firstIter()) { #include "rhoEqn.H" + if (firstStep) + { + rhoeps.oldTime() = rho.oldTime()*voidfraction.oldTime(); + firstStep = false; + } rhoeps = rho*voidfraction; } #endif From 6cd16223d10b5513ee651ffdd279461818372753 Mon Sep 17 00:00:00 2001 From: danielque Date: Mon, 10 Jan 2022 12:31:27 +0100 Subject: [PATCH 4/6] set log files for test case --- .../cfdemSolverRhoPimple/VortexShedding/DEM/in.liggghts_run | 3 +++ .../cfdemSolverRhoPimple/VortexShedding/DEM/post/.gitignore | 0 2 files changed, 3 insertions(+) create mode 100644 tutorials/cfdemSolverRhoPimple/VortexShedding/DEM/post/.gitignore diff --git a/tutorials/cfdemSolverRhoPimple/VortexShedding/DEM/in.liggghts_run b/tutorials/cfdemSolverRhoPimple/VortexShedding/DEM/in.liggghts_run index 65be938b..05c99d38 100644 --- a/tutorials/cfdemSolverRhoPimple/VortexShedding/DEM/in.liggghts_run +++ b/tutorials/cfdemSolverRhoPimple/VortexShedding/DEM/in.liggghts_run @@ -10,6 +10,9 @@ # copyright: 2021- JKU Linz # ################################################################################ +log ../DEM/log.liggghts +thermo_log ../DEM/post/thermo.txt + # define the attributes associated with the particles, # 'granular' (or 'sphere') style uses diameter, mass and angular velocity atom_style granular diff --git a/tutorials/cfdemSolverRhoPimple/VortexShedding/DEM/post/.gitignore b/tutorials/cfdemSolverRhoPimple/VortexShedding/DEM/post/.gitignore new file mode 100644 index 00000000..e69de29b From bc1dd9f5e835f7bf67104fe7557fde796947f68b Mon Sep 17 00:00:00 2001 From: danielque Date: Mon, 10 Jan 2022 16:26:49 +0100 Subject: [PATCH 5/6] fix run.config for vortex shedding test case --- .../cfdemSolverRhoPimple/VortexShedding/prerun.sh | 11 +++++++++++ .../cfdemSolverRhoPimple/VortexShedding/run.config | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100755 tutorials/cfdemSolverRhoPimple/VortexShedding/prerun.sh diff --git a/tutorials/cfdemSolverRhoPimple/VortexShedding/prerun.sh b/tutorials/cfdemSolverRhoPimple/VortexShedding/prerun.sh new file mode 100755 index 00000000..360e0c23 --- /dev/null +++ b/tutorials/cfdemSolverRhoPimple/VortexShedding/prerun.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +pushd CFD + +transformPoints -scale "(0.001 0.001 0.001)" +checkMesh +#- make the linear system more diagonal dominant to speed-up the linear solvers +renumberMesh -overwrite -noFunctionObjects + +popd + diff --git a/tutorials/cfdemSolverRhoPimple/VortexShedding/run.config b/tutorials/cfdemSolverRhoPimple/VortexShedding/run.config index 4f43baad..754adee7 100644 --- a/tutorials/cfdemSolverRhoPimple/VortexShedding/run.config +++ b/tutorials/cfdemSolverRhoPimple/VortexShedding/run.config @@ -5,7 +5,8 @@ "name" : "cfdemrun", "solver" : "cfdemSolverRhoPimple", "type" : "CFDEMcoupling/mpi", - "nprocs" : 4 + "nprocs" : 4, + "pre_scripts" : ["prerun.sh"] } ] } From 84842df79f1084d43032c07ca2aa31807e10033d Mon Sep 17 00:00:00 2001 From: danielque Date: Tue, 11 Jan 2022 09:52:58 +0100 Subject: [PATCH 6/6] fix whitespace --- .../cfdemSolverRhoPimple/VortexShedding/CFD/system/controlDict | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/cfdemSolverRhoPimple/VortexShedding/CFD/system/controlDict b/tutorials/cfdemSolverRhoPimple/VortexShedding/CFD/system/controlDict index 705df9fa..05ee32b2 100644 --- a/tutorials/cfdemSolverRhoPimple/VortexShedding/CFD/system/controlDict +++ b/tutorials/cfdemSolverRhoPimple/VortexShedding/CFD/system/controlDict @@ -77,7 +77,7 @@ functions (0.0210 0.00225 0) (0.0250 -0.00275 0) (0.0250 0.00275 0) - ); + ); // Fields to be probed fields (p U T rho);