ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1637 from dsbolin/granular_bug_fixes

Browse Source 
Bug fix for fix/wall/gran
This commit is contained in:
Axel Kohlmeyer
2019-08-21 00:09:04 -04:00
committed by GitHub
parent c686df1aba 578bcf0fb0
commit 42b282fe36
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/GRANULAR/fix_wall_gran.cpp
View File

@ -1147,11 +1147,11 @@ void FixWallGran::granular(double rsq, double dx, double dy, double dz,
else{
knfac = E; //Hooke
a = sqrt(dR);
Fne = knfac*delta;
if (normal_model != HOOKE) {
Fne *= a;
knfac *= a;
}
Fne = knfac*delta;
if (normal_model == DMT)
Fne -= 4*MY_PI*normal_coeffs[3]*Reff;
}
@ -1292,10 +1292,12 @@ void FixWallGran::granular(double rsq, double dx, double dy, double dz,
// rolling resistance
//****************************************
if (roll_model != ROLL_NONE) {
if (roll_model != ROLL_NONE || twist_model != NONE) {
relrot1 = omega[0];
relrot2 = omega[1];
relrot3 = omega[2];
}
if (roll_model != ROLL_NONE){
// rolling velocity, see eq. 31 of Wang et al, Particuology v 23, p 49 (2015)
// This is different from the Marshall papers,