Merge branch 'develop' of https://github.com/ParticulateFlow/CFDEMcoupling into develop

.github/pull_request_template.md

@@ -0,0 +1,24 @@
+<!-- Please provide a general summary of your changes in the title above. -->
+
+## Description of proposed changes
+<!-- Describe your changes in detail. -->
+
+## Types of changes
+<!-- What types of changes does your code introduce? Put an `x` in all the boxes that apply. -->
+<!-- Please try to limit your pull request to one type, submit multiple pull requests if needed. -->
+- [ ] Bugfix
+- [ ] Feature
+- [ ] Refactoring (no functional changes, no api changes)
+- [ ] Build related changes
+- [ ] Documentation updates
+- [ ] Other (please describe): 
+
+## Checklist
+<!-- Go over all the following points, and put an `x` in all the boxes that apply. -->
+- [ ] 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
+<!-- If this is a relatively large or complex change, kick off the discussion by explaining
+why you chose the solution you did and what alternatives you considered, etc... -->

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

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

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

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;

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);

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

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
+

tutorials/cfdemSolverRhoPimple/VortexShedding/run.config

@@ -5,7 +5,8 @@
       "name" : "cfdemrun",
       "solver" : "cfdemSolverRhoPimple",
       "type" : "CFDEMcoupling/mpi",
-      "nprocs" : 4
+      "nprocs" : 4,
+      "pre_scripts" : ["prerun.sh"]
     }
   ]
 }