Merge pull request #1637 from dsbolin/granular_bug_fixes (42b282fe) · Commits · 郑智淋 / lammps

src/GRANULAR/fix_wall_gran.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -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 -= 4MY_PInormal_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,