Merge pull request #429 from akohlmey/updates-for-stable (f5a85d68) · Commits · 郑智淋 / lammps

doc/Makefile

+4 −3

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ BUILDDIR = /tmp/lammps-docs-$(SHA1)
		RSTDIR = $(BUILDDIR)/rst
		VENV = $(BUILDDIR)/docenv
		TXT2RST = $(VENV)/bin/txt2rst
		ANCHORCHECK = $(VENV)/bin/doc_anchor_check

		PYTHON = $(shell which python3)
		HAS_PYTHON3 = NO
		@@ -50,7 +51,7 @@ clean:
		clean-spelling:
		rm -rf spelling

		html: $(OBJECTS)
		html: $(OBJECTS) $(ANCHORCHECK)
		@(\
		. $(VENV)/bin/activate ;\
		cp -r src/* $(RSTDIR)/ ;\
		@@ -131,7 +132,7 @@ fetch:

		txt2html: utils/txt2html/txt2html.exe

		anchor_check : $(TXT2RST)
		anchor_check : $(ANCHORCHECK)
		@(\
		. $(VENV)/bin/activate ;\
		doc_anchor_check src/*.txt ;\
		@@ -162,7 +163,7 @@ $(VENV):
		deactivate;\
		)

		$(TXT2RST): $(VENV)
		$(TXT2RST) $(ANCHORCHECK): $(VENV)
		@( \
		. $(VENV)/bin/activate; \
		(cd utils/converters;\

+1 −3

Original line number	Diff line number	Diff line
		@@ -25,9 +25,7 @@ files and image files.

		If you uncomment the "dump"_dump.html command in the input script, a
		text dump file will be produced, which can be animated by various
		"visualization programs"_http://lammps.sandia.gov/viz.html. It can
		also be animated using the xmovie tool described in the "Additional
		Tools"_Section_tools.html section of the LAMMPS documentation.
		"visualization programs"_http://lammps.sandia.gov/viz.html.

		If you uncomment the "dump image"_dump.html command in the input
		script, and assuming you have built LAMMPS with a JPG library, JPG

+2 −2

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ own sub-directories with their own Makefiles and/or README files.
		"ch2lmp"_#charmm
		"chain"_#chain
		"colvars"_#colvars
		"createatoms"_#createtools
		"createatoms"_#createatoms
		"drude"_#drude
		"eam database"_#eamdb
		"eam generate"_#eamgn
		@@ -159,7 +159,7 @@ gmail.com) at ICTP, Italy.

		:line

		createatoms tool :h4,link(create)
		createatoms tool :h4,link(createatoms)

		The tools/createatoms directory contains a Fortran program called
		createAtoms.f which can generate a variety of interesting crystal

+1 −4

Original line number	Diff line number	Diff line
		@@ -34,10 +34,7 @@ to one or more files every N timesteps in one of several formats.
		Only information for atoms in the specified group is dumped. This
		specific dump style uses molfile plugins that are bundled with the
		"VMD"_http://www.ks.uiuc.edu/Research/vmd molecular visualization and
		analysis program. See "Section 9"_Section_tools.html#vmd of the
		manual and the tools/lmp2vmd/README.txt file for more information
		about support in VMD for reading and visualizing native LAMMPS dump
		files.
		analysis program.

		Unless the filename contains a * character, the output will be written
		to one single file with the specified format. Otherwise there will be

+2331 −2325

File changed.

Preview size limit exceeded, changes collapsed.

+2 −2

File changed.

Contains only whitespace changes.