Merge pull request #1321 from akohlmey/collected-small-fixes (b871b4e1) · Commits · 郑智淋 / lammps

doc/.gitignore

+1 −0

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ Download an executable for Windows :h3
		Pre-compiled Windows installers which install LAMMPS executables on a
		Windows system can be downloaded from this site:

		"http://rpm.lammps.org/windows.html"_http://rpm.lammps.org/windows.html
		"http://packages.lammps.org/windows.html"_http://packages.lammps.org/windows.html

		Note that each installer package has a date in its name, which
		corresponds to the LAMMPS version of the same date. Installers for

+2 −8

Original line number	Diff line number	Diff line
		@@ -37,27 +37,21 @@ LAMMPS is an open-source code, distributed freely under the terms of
		the GNU Public License (GPL).

		The "LAMMPS website"_lws has a variety of information about the code.
		It includes links to an on-line version of this manual, a "mail
		It includes links to an on-line version of this manual, a "mailing
		list"_http://lammps.sandia.gov/mail.html where users can post
		questions, and a "GitHub site"https://github.com/lammps/lammps where
		questions, and a "GitHub site"_https://github.com/lammps/lammps where
		all LAMMPS development is coordinated.

		:line

		"PDF file"_Manual.pdf of the entire manual, generated by
		"htmldoc"_http://freecode.com/projects/htmldoc

		The content for this manual is part of the LAMMPS distribution. You
		can build a local copy of the Manual as HTML pages or a PDF file, by
		following the steps on the "Manual build"_Manual_build.html doc page.

		There is also a "Developer.pdf"_Developer.pdf document which gives
		a brief description of the basic code structure of LAMMPS.

		:line

		This manual is organized into the following sections.

		Once you are familiar with LAMMPS, you may want to bookmark "this
		page"_Commands.html since it gives quick access to a doc page for
		every LAMMPS command.

+1 −1

Original line number	Diff line number	Diff line
		@@ -219,7 +219,7 @@ latex_elements = {
		# author, documentclass [howto, manual, or own class]).
		latex_documents = [
		('Manual', 'LAMMPS.tex', 'LAMMPS Documentation',
		'Steve Plimpton', 'manual'),
		'The LAMMPS Developers', 'manual'),
		]

		# The name of an image file (relative to this directory) to place at the top of

+5 −7

Original line number	Diff line number	Diff line
		@@ -206,7 +206,7 @@ void FixWallBodyPolygon::setup(int vflag)

		void FixWallBodyPolygon::post_force(int /vflag/)
		{
		double vwall[3],dx,dy,dz,del1,del2,delxy,delr,rsq,eradi,rradi,wall_pos;
		double vwall[3],dx,dy,dz,del1,del2,delxy,delr,rsq,eradi,wall_pos;
		int i,ni,npi,ifirst,nei,iefirst,side;
		double facc[3];

		@@ -316,7 +316,6 @@ void FixWallBodyPolygon::post_force(int /vflag/)
		nei = ednum[i];
		iefirst = edfirst[i];
		eradi = enclosing_radius[i];
		rradi = rounded_radius[i];

		// reset vertex and edge forces

		@@ -332,13 +331,13 @@ void FixWallBodyPolygon::post_force(int /vflag/)
		edge[iefirst+ni][4] = 0;
		}

		int interact, num_contacts, done;
		int num_contacts, done;
		double delta_a, delta_ua, j_a;
		Contact contact_list[MAX_CONTACTS];

		num_contacts = 0;
		facc[0] = facc[1] = facc[2] = 0;
		interact = vertex_against_wall(i, wall_pos, x, f, torque, side,
		vertex_against_wall(i, wall_pos, x, f, torque, side,
		contact_list, num_contacts, facc);

		if (num_contacts >= 2) {
		@@ -475,12 +474,11 @@ int FixWallBodyPolygon::vertex_against_wall(int i, double wall_pos,
		Contact* contact_list, int &num_contacts, double* /facc/)
		{
		int ni, npi, ifirst, interact;
		double xpi[3], eradi, rradi;
		double xpi[3], rradi;
		double fx, fy, fz;

		npi = dnum[i];
		ifirst = dfirst[i];
		eradi = enclosing_radius[i];
		rradi = rounded_radius[i];

		interact = 0;