Revert "fix issue with local variable shadowing a global variable" (16749566) · Commits · 郑智淋 / lammps

src/KSPACE/msm.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -1028,7 +1028,6 @@ void MSM::set_grid_global()

		int flag = 0;
		int xlevels,ylevels,zlevels;
		xlevels = ylevels = zlevels = 1;

		while (!factorable(nx_max,flag,xlevels)) {
		double k = log(nx_max)/log(2.0);
		@@ -1433,15 +1432,16 @@ void MSM::setup_grid()
		return 1 if yes, 0 if no
		------------------------------------------------------------------------- */

		int MSM::factorable(int n, int &flag, int &nlevels)
		int MSM::factorable(int n, int &flag, int &levels)
		{
		int i;
		levels = 1;

		while (n > 1) {
		for (i = 0; i < nfactors; i++) {
		if (n % factors[i] == 0) {
		n /= factors[i];
		nlevels++;
		levels++;
		break;
		}
		}