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

formatting and reduce compiler warnings

Browse Source
This commit is contained in:
Axel Kohlmeyer
2019-10-18 07:14:35 -04:00
parent f0a3628a00
commit 5b47b0b098
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/GRANULAR/fix_wall_gran.cpp
View File

@ -1143,8 +1143,7 @@ void FixWallGran::granular(double rsq, double dx, double dy, double dz,
a2 = a*a; a2 = a*a;
knfac = normal_coeffs[0]*a; knfac = normal_coeffs[0]*a;
Fne = knfac*a2/Reff - TWOPI*a2*sqrt(4*coh*E/(M_PI*a)); Fne = knfac*a2/Reff - TWOPI*a2*sqrt(4*coh*E/(M_PI*a));
} } else {
else{
knfac = E; //Hooke knfac = E; //Hooke
a = sqrt(dR); a = sqrt(dR);
Fne = knfac*delta; Fne = knfac*delta;
@ -1158,16 +1157,13 @@ void FixWallGran::granular(double rsq, double dx, double dy, double dz,
if (damping_model == VELOCITY) { if (damping_model == VELOCITY) {
damp_normal = 1; damp_normal = 1;
} } else if (damping_model == MASS_VELOCITY) {
else if (damping_model == MASS_VELOCITY) {
damp_normal = meff; damp_normal = meff;
} } else if (damping_model == VISCOELASTIC) {
else if (damping_model == VISCOELASTIC) {
damp_normal = a*meff; damp_normal = a*meff;
} } else if (damping_model == TSUJI) {
else if (damping_model == TSUJI) {
damp_normal = sqrt(meff*knfac); damp_normal = sqrt(meff*knfac);
} } else damp_normal = 0.0;
damp_normal_prefactor = normal_coeffs[1]*damp_normal; damp_normal_prefactor = normal_coeffs[1]*damp_normal;
Fdamp = -damp_normal_prefactor*vnnr; Fdamp = -damp_normal_prefactor*vnnr;