formatting and reduce compiler warnings (5b47b0b0) · Commits · 郑智淋 / lammps

src/GRANULAR/fix_wall_gran.cpp

+5 −9

Changes for src/GRANULAR/fix_wall_gran.cpp: 5 added lines, 9 removed lines.
Original line number	Diff line number	Diff line
		@@ -1143,8 +1143,7 @@ void FixWallGran::granular(double rsq, double dx, double dy, double dz,
		a2 = a*a;
		knfac = normal_coeffs[0]*a;
		Fne = knfaca2/Reff - TWOPIa2sqrt(4cohE/(M_PIa));
		}
		else{
		} else {
		knfac = E; //Hooke
		a = sqrt(dR);
		Fne = knfac*delta;
		@@ -1158,16 +1157,13 @@ void FixWallGran::granular(double rsq, double dx, double dy, double dz,

		if (damping_model == VELOCITY) {
		damp_normal = 1;
		}
		else if (damping_model == MASS_VELOCITY) {
		} else if (damping_model == MASS_VELOCITY) {
		damp_normal = meff;
		}
		else if (damping_model == VISCOELASTIC) {
		} else if (damping_model == VISCOELASTIC) {
		damp_normal = a*meff;
		}
		else if (damping_model == TSUJI) {
		} else if (damping_model == TSUJI) {
		damp_normal = sqrt(meff*knfac);
		}
		} else damp_normal = 0.0;

		damp_normal_prefactor = normal_coeffs[1]*damp_normal;
		Fdamp = -damp_normal_prefactor*vnnr;