replace unsafe code (c9c66ca0) · Commits · 郑智淋 / lammps

src/region_cone.cpp

+9 −12

Original line number	Diff line number	Diff line
		@@ -174,34 +174,31 @@ int RegCone::inside(double x, double y, double z)
		{
		double del1,del2,dist;
		double currentradius;
		int inside;

		if (axis == 'x') {
		del1 = y - c1;
		del2 = z - c2;
		dist = sqrt(del1del1 + del2del2);
		currentradius = radiuslo + (x-lo)*(radiushi-radiuslo)/(hi-lo);
		if (dist <= currentradius && x >= lo && x <= hi) inside = 1;
		else inside = 0;
		}
		if (axis == 'y') {
		if (dist <= currentradius && x >= lo && x <= hi) return 1;
		else return 0;
		} else if (axis == 'y') {
		del1 = x - c1;
		del2 = z - c2;
		dist = sqrt(del1del1 + del2del2);
		currentradius = radiuslo + (y-lo)*(radiushi-radiuslo)/(hi-lo);
		if (dist <= currentradius && y >= lo && y <= hi) inside = 1;
		else inside = 0;
		}
		if (axis == 'z') {
		if (dist <= currentradius && y >= lo && y <= hi) return 1;
		else return 0;
		} else if (axis == 'z') {
		del1 = x - c1;
		del2 = y - c2;
		dist = sqrt(del1del1 + del2del2);
		currentradius = radiuslo + (z-lo)*(radiushi-radiuslo)/(hi-lo);
		if (dist <= currentradius && z >= lo && z <= hi) inside = 1;
		else inside = 0;
		if (dist <= currentradius && z >= lo && z <= hi) return 1;
		else return 0;
		}

		return inside;
		return 0;
		}

		/* ----------------------------------------------------------------------