Merge https://github.com/lammps/lammps (dbd0d218) · Commits · 郑智淋 / lammps

cmake/README.md

+5 −5

Changes for cmake/README.md: 5 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -1421,11 +1421,11 @@ target API.
		<td>CUDA SM architecture targeted by GPU package</td>
		<td>
		<dl>
		<dt><code>sm20</code> (Fermi)</dt>
		<dt><code>sm30</code> (Kepler)</dt>
		<dt><code>sm50</code> (Maxwell)</dt>
		<dt><code>sm60</code> (Pascal)</dt>
		<dt><code>sm70</code> (Volta)</dt>
		<dt><code>sm_20</code> (Fermi)</dt>
		<dt><code>sm_30</code> (Kepler)</dt>
		<dt><code>sm_50</code> (Maxwell)</dt>
		<dt><code>sm_60</code> (Pascal)</dt>
		<dt><code>sm_70</code> (Volta)</dt>
		</dl>
		</td>
		</tr>

+1 −1

Changes for doc/src/Developer/developer.tex: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -476,7 +476,7 @@ is the name of the class. This code allows LAMMPS to find your fix
		when it parses input script. In addition, your fix header must be
		included in the file "style\_fix.h". In case if you use LAMMPS make,
		this file is generated automatically - all files starting with prefix
		fix\_ are included, so call your header the same way. Otherwise, donÕt
		fix\_ are included, so call your header the same way. Otherwise, don't
		forget to add your include into "style\_fix.h".

		Let's write a simple fix which will print average velocity at the end

+2 −2

Changes for doc/src/Manual.txt: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		<!-- HTML_ONLY -->
		<HEAD>
		<TITLE>LAMMPS Users Manual</TITLE>
		<META NAME="docnumber" CONTENT="29 Jun 2018 version">
		<META NAME="docnumber" CONTENT="16 Jul 2018 version">
		<META NAME="author" CONTENT="http://lammps.sandia.gov - Sandia National Laboratories">
		<META NAME="copyright" CONTENT="Copyright (2003) Sandia Corporation. This software and manual is distributed under the GNU General Public License.">
		</HEAD>
		@@ -19,7 +19,7 @@
		:line

		LAMMPS Documentation :c,h1
		29 Jun 2018 version :c,h2
		16 Jul 2018 version :c,h2

		Version info: :h3

+1 −1

Changes for doc/src/Section_commands.txt: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -582,7 +582,7 @@ USER-INTEL, k = KOKKOS, o = USER-OMP, t = OPT.
		"dt/reset"_fix_dt_reset.html,
		"efield"_fix_efield.html,
		"ehex"_fix_ehex.html,
		"enforce2d"_fix_enforce2d.html,
		"enforce2d (k)"_fix_enforce2d.html,
		"evaporate"_fix_evaporate.html,
		"external"_fix_external.html,
		"freeze"_fix_freeze.html,

+8 −6

Changes for doc/src/fix_enforce2d.txt: 8 added lines, 6 removed lines.
Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@
		:line

		fix enforce2d command :h3
		fix enforce2d/kk command :h3

		[Syntax:]

		@@ -27,12 +28,13 @@ not move from their initial z coordinate.

		:line

		Styles with a suffix are functionally the same as the corresponding
		style without the suffix. They have been optimized to run faster,
		depending on your available hardware, as discussed in
		"Section 5"_Section_accelerate.html of the manual. The
		accelerated styles take the same arguments and should produce the same
		results, except for round-off and precision issues.
		Styles with a {gpu}, {intel}, {kk}, {omp}, or {opt} suffix are
		functionally the same as the corresponding style without the suffix.
		They have been optimized to run faster, depending on your available
		hardware, as discussed in "Section 5"_Section_accelerate.html
		of the manual. The accelerated styles take the same arguments and
		should produce the same results, except for round-off and precision
		issues.

		These accelerated styles are part of the GPU, USER-INTEL, KOKKOS,
		USER-OMP and OPT packages, respectively. They are only enabled if