lijiext
/
lammps
mirror of https://github.com/lammps/lammps.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14748 f3b2605a-c512-4ea7-a41b-209d697bcdaa

This commit is contained in:
sjplimp 2016-03-14 19:06:38 +00:00
parent ec42f2530c
commit 93e451b594
6 changed files with 51 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
doc/Section_commands.html
View File

@ -1168,10 +1168,10 @@ KOKKOS, o = USER-OMP, t = OPT.</p>
if <a class="reference internal" href="Section_start.html#start-3"><span>LAMMPS is built with the appropriate package</span></a>.</p>
<table border="1" class="docutils">
<colgroup>
<col width="24%" />
<col width="23%" />
<col width="25%" />
<col width="30%" />
<col width="23%" />
<col width="23%" />
<col width="22%" />
</colgroup>
<tbody valign="top">
<tr class="row-odd"><td><a class="reference internal" href="pair_awpmd.html"><em>awpmd/cut</em></a></td>
@ -1197,42 +1197,42 @@ if <a class="reference internal" href="Section_start.html#start-3"><span>LAMMPS
<tr class="row-odd"><td><a class="reference internal" href="pair_lj_soft.html"><em>lj/cut/coul/long/soft (o)</em></a></td>
<td><a class="reference internal" href="pair_dipole.html"><em>lj/cut/dipole/sf (go)</em></a></td>
<td><a class="reference internal" href="pair_lj_soft.html"><em>lj/cut/soft (o)</em></a></td>
<td><a class="reference internal" href="pair_lj_soft.html"><em>lj/cut/tip4p/long/soft (o)</em></a></td>
<td><a class="reference internal" href="pair_thole.html"><em>lj/cut/thole/long (o)</em></a></td>
</tr>
<tr class="row-even"><td><a class="reference internal" href="pair_mdf.html"><em>lj/mdf</em></a></td>
<tr class="row-even"><td><a class="reference internal" href="pair_lj_soft.html"><em>lj/cut/tip4p/long/soft (o)</em></a></td>
<td><a class="reference internal" href="pair_mdf.html"><em>lj/mdf</em></a></td>
<td><a class="reference internal" href="pair_sdk.html"><em>lj/sdk (gko)</em></a></td>
<td><a class="reference internal" href="pair_sdk.html"><em>lj/sdk/coul/long (go)</em></a></td>
<td><a class="reference internal" href="pair_sdk.html"><em>lj/sdk/coul/msm (o)</em></a></td>
</tr>
<tr class="row-odd"><td><a class="reference internal" href="pair_lj_sf.html"><em>lj/sf (o)</em></a></td>
<tr class="row-odd"><td><a class="reference internal" href="pair_sdk.html"><em>lj/sdk/coul/msm (o)</em></a></td>
<td><a class="reference internal" href="pair_lj_sf.html"><em>lj/sf (o)</em></a></td>
<td><a class="reference internal" href="pair_meam_spline.html"><em>meam/spline</em></a></td>
<td><a class="reference internal" href="pair_meam_sw_spline.html"><em>meam/sw/spline</em></a></td>
<td><a class="reference internal" href="pair_mgpt.html"><em>mgpt</em></a></td>
</tr>
<tr class="row-even"><td><a class="reference internal" href="pair_morse.html"><em>morse/smooth/linear</em></a></td>
<tr class="row-even"><td><a class="reference internal" href="pair_mgpt.html"><em>mgpt</em></a></td>
<td><a class="reference internal" href="pair_morse.html"><em>morse/smooth/linear</em></a></td>
<td><a class="reference internal" href="pair_quip.html"><em>quip</em></a></td>
<td><a class="reference internal" href="pair_reax_c.html"><em>reax/c</em></a></td>
<td><a class="reference internal" href="pair_smd_hertz.html"><em>smd/hertz</em></a></td>
</tr>
<tr class="row-odd"><td><a class="reference internal" href="pair_smd_tlsph.html"><em>smd/tlsph</em></a></td>
<tr class="row-odd"><td><a class="reference internal" href="pair_smd_hertz.html"><em>smd/hertz</em></a></td>
<td><a class="reference internal" href="pair_smd_tlsph.html"><em>smd/tlsph</em></a></td>
<td><a class="reference internal" href="pair_smd_triangulated_surface.html"><em>smd/triangulated/surface</em></a></td>
<td><a class="reference internal" href="pair_smd_ulsph.html"><em>smd/ulsph</em></a></td>
<td><a class="reference internal" href="pair_smtbq.html"><em>smtbq</em></a></td>
</tr>
<tr class="row-even"><td><a class="reference internal" href="pair_sph_heatconduction.html"><em>sph/heatconduction</em></a></td>
<tr class="row-even"><td><a class="reference internal" href="pair_smtbq.html"><em>smtbq</em></a></td>
<td><a class="reference internal" href="pair_sph_heatconduction.html"><em>sph/heatconduction</em></a></td>
<td><a class="reference internal" href="pair_sph_idealgas.html"><em>sph/idealgas</em></a></td>
<td><a class="reference internal" href="pair_sph_lj.html"><em>sph/lj</em></a></td>
<td><a class="reference internal" href="pair_sph_rhosum.html"><em>sph/rhosum</em></a></td>
</tr>
<tr class="row-odd"><td><a class="reference internal" href="pair_sph_taitwater.html"><em>sph/taitwater</em></a></td>
<tr class="row-odd"><td><a class="reference internal" href="pair_sph_rhosum.html"><em>sph/rhosum</em></a></td>
<td><a class="reference internal" href="pair_sph_taitwater.html"><em>sph/taitwater</em></a></td>
<td><a class="reference internal" href="pair_sph_taitwater_morris.html"><em>sph/taitwater/morris</em></a></td>
<td><a class="reference internal" href="pair_srp.html"><em>srp</em></a></td>
<td><a class="reference internal" href="pair_tersoff.html"><em>tersoff/table (o)</em></a></td>
</tr>
<tr class="row-even"><td><a class="reference internal" href="pair_thole.html"><em>thole</em></a></td>
<tr class="row-even"><td><a class="reference internal" href="pair_tersoff.html"><em>tersoff/table (o)</em></a></td>
<td><a class="reference internal" href="pair_thole.html"><em>thole</em></a></td>
<td><a class="reference internal" href="pair_lj_soft.html"><em>tip4p/long/soft (o)</em></a></td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
</tbody>
</table>

1
doc/Section_commands.txt
View File

@ -933,6 +933,7 @@ package"_Section_start.html#start_3.
"lj/cut/coul/long/soft (o)"_pair_lj_soft.html,
"lj/cut/dipole/sf (go)"_pair_dipole.html,
"lj/cut/soft (o)"_pair_lj_soft.html,
"lj/cut/thole/long (o)"_pair_thole.html,
"lj/cut/tip4p/long/soft (o)"_pair_lj_soft.html,
"lj/mdf"_pair_mdf.html,
"lj/sdk (gko)"_pair_sdk.html,

50
doc/_sources/Section_commands.txt
View File

@ -644,31 +644,31 @@ KOKKOS, o = USER-OMP, t = OPT.
These are additional pair styles in USER packages, which can be used
if :ref:`LAMMPS is built with the appropriate package <start_3>`.
+-----------------------------------------------------+-----------------------------------------------------------------+---------------------------------------------------+--------------------------------------------------+
| :doc:`awpmd/cut <pair_awpmd>` | :doc:`buck/mdf <pair_mdf>` | :doc:`coul/cut/soft (o) <pair_lj_soft>` | :doc:`coul/diel (o) <pair_coul_diel>` |
+-----------------------------------------------------+-----------------------------------------------------------------+---------------------------------------------------+--------------------------------------------------+
| :doc:`coul/long/soft (o) <pair_lj_soft>` | :doc:`dpd/conservative <pair_dpd_conservative>` | :doc:`dpd/fdt <pair_dpd_fdt>` | :doc:`dpd/fdt/energy <pair_dpd_fdt>` |
+-----------------------------------------------------+-----------------------------------------------------------------+---------------------------------------------------+--------------------------------------------------+
| :doc:`eam/cd (o) <pair_eam>` | :doc:`edip (o) <pair_edip>` | :doc:`eff/cut <pair_eff>` | :doc:`gauss/cut <pair_gauss>` |
+-----------------------------------------------------+-----------------------------------------------------------------+---------------------------------------------------+--------------------------------------------------+
| :doc:`lennard/mdf <pair_mdf>` | :doc:`list <pair_list>` | :doc:`lj/charmm/coul/long/soft (o) <pair_charmm>` | :doc:`lj/cut/coul/cut/soft (o) <pair_lj_soft>` |
+-----------------------------------------------------+-----------------------------------------------------------------+---------------------------------------------------+--------------------------------------------------+
| :doc:`lj/cut/coul/long/soft (o) <pair_lj_soft>` | :doc:`lj/cut/dipole/sf (go) <pair_dipole>` | :doc:`lj/cut/soft (o) <pair_lj_soft>` | :doc:`lj/cut/tip4p/long/soft (o) <pair_lj_soft>` |
+-----------------------------------------------------+-----------------------------------------------------------------+---------------------------------------------------+--------------------------------------------------+
| :doc:`lj/mdf <pair_mdf>` | :doc:`lj/sdk (gko) <pair_sdk>` | :doc:`lj/sdk/coul/long (go) <pair_sdk>` | :doc:`lj/sdk/coul/msm (o) <pair_sdk>` |
+-----------------------------------------------------+-----------------------------------------------------------------+---------------------------------------------------+--------------------------------------------------+
| :doc:`lj/sf (o) <pair_lj_sf>` | :doc:`meam/spline <pair_meam_spline>` | :doc:`meam/sw/spline <pair_meam_sw_spline>` | :doc:`mgpt <pair_mgpt>` |
+-----------------------------------------------------+-----------------------------------------------------------------+---------------------------------------------------+--------------------------------------------------+
| :doc:`morse/smooth/linear <pair_morse>` | :doc:`quip <pair_quip>` | :doc:`reax/c <pair_reax_c>` | :doc:`smd/hertz <pair_smd_hertz>` |
+-----------------------------------------------------+-----------------------------------------------------------------+---------------------------------------------------+--------------------------------------------------+
| :doc:`smd/tlsph <pair_smd_tlsph>` | :doc:`smd/triangulated/surface <pair_smd_triangulated_surface>` | :doc:`smd/ulsph <pair_smd_ulsph>` | :doc:`smtbq <pair_smtbq>` |
+-----------------------------------------------------+-----------------------------------------------------------------+---------------------------------------------------+--------------------------------------------------+
| :doc:`sph/heatconduction <pair_sph_heatconduction>` | :doc:`sph/idealgas <pair_sph_idealgas>` | :doc:`sph/lj <pair_sph_lj>` | :doc:`sph/rhosum <pair_sph_rhosum>` |
+-----------------------------------------------------+-----------------------------------------------------------------+---------------------------------------------------+--------------------------------------------------+
| :doc:`sph/taitwater <pair_sph_taitwater>` | :doc:`sph/taitwater/morris <pair_sph_taitwater_morris>` | :doc:`srp <pair_srp>` | :doc:`tersoff/table (o) <pair_tersoff>` |
+-----------------------------------------------------+-----------------------------------------------------------------+---------------------------------------------------+--------------------------------------------------+
| :doc:`thole <pair_thole>` | :doc:`tip4p/long/soft (o) <pair_lj_soft>` | | |
+-----------------------------------------------------+-----------------------------------------------------------------+---------------------------------------------------+--------------------------------------------------+
+--------------------------------------------------+-----------------------------------------------------+-----------------------------------------------------------------+------------------------------------------------+
| :doc:`awpmd/cut <pair_awpmd>` | :doc:`buck/mdf <pair_mdf>` | :doc:`coul/cut/soft (o) <pair_lj_soft>` | :doc:`coul/diel (o) <pair_coul_diel>` |
+--------------------------------------------------+-----------------------------------------------------+-----------------------------------------------------------------+------------------------------------------------+
| :doc:`coul/long/soft (o) <pair_lj_soft>` | :doc:`dpd/conservative <pair_dpd_conservative>` | :doc:`dpd/fdt <pair_dpd_fdt>` | :doc:`dpd/fdt/energy <pair_dpd_fdt>` |
+--------------------------------------------------+-----------------------------------------------------+-----------------------------------------------------------------+------------------------------------------------+
| :doc:`eam/cd (o) <pair_eam>` | :doc:`edip (o) <pair_edip>` | :doc:`eff/cut <pair_eff>` | :doc:`gauss/cut <pair_gauss>` |
+--------------------------------------------------+-----------------------------------------------------+-----------------------------------------------------------------+------------------------------------------------+
| :doc:`lennard/mdf <pair_mdf>` | :doc:`list <pair_list>` | :doc:`lj/charmm/coul/long/soft (o) <pair_charmm>` | :doc:`lj/cut/coul/cut/soft (o) <pair_lj_soft>` |
+--------------------------------------------------+-----------------------------------------------------+-----------------------------------------------------------------+------------------------------------------------+
| :doc:`lj/cut/coul/long/soft (o) <pair_lj_soft>` | :doc:`lj/cut/dipole/sf (go) <pair_dipole>` | :doc:`lj/cut/soft (o) <pair_lj_soft>` | :doc:`lj/cut/thole/long (o) <pair_thole>` |
+--------------------------------------------------+-----------------------------------------------------+-----------------------------------------------------------------+------------------------------------------------+
| :doc:`lj/cut/tip4p/long/soft (o) <pair_lj_soft>` | :doc:`lj/mdf <pair_mdf>` | :doc:`lj/sdk (gko) <pair_sdk>` | :doc:`lj/sdk/coul/long (go) <pair_sdk>` |
+--------------------------------------------------+-----------------------------------------------------+-----------------------------------------------------------------+------------------------------------------------+
| :doc:`lj/sdk/coul/msm (o) <pair_sdk>` | :doc:`lj/sf (o) <pair_lj_sf>` | :doc:`meam/spline <pair_meam_spline>` | :doc:`meam/sw/spline <pair_meam_sw_spline>` |
+--------------------------------------------------+-----------------------------------------------------+-----------------------------------------------------------------+------------------------------------------------+
| :doc:`mgpt <pair_mgpt>` | :doc:`morse/smooth/linear <pair_morse>` | :doc:`quip <pair_quip>` | :doc:`reax/c <pair_reax_c>` |
+--------------------------------------------------+-----------------------------------------------------+-----------------------------------------------------------------+------------------------------------------------+
| :doc:`smd/hertz <pair_smd_hertz>` | :doc:`smd/tlsph <pair_smd_tlsph>` | :doc:`smd/triangulated/surface <pair_smd_triangulated_surface>` | :doc:`smd/ulsph <pair_smd_ulsph>` |
+--------------------------------------------------+-----------------------------------------------------+-----------------------------------------------------------------+------------------------------------------------+
| :doc:`smtbq <pair_smtbq>` | :doc:`sph/heatconduction <pair_sph_heatconduction>` | :doc:`sph/idealgas <pair_sph_idealgas>` | :doc:`sph/lj <pair_sph_lj>` |
+--------------------------------------------------+-----------------------------------------------------+-----------------------------------------------------------------+------------------------------------------------+
| :doc:`sph/rhosum <pair_sph_rhosum>` | :doc:`sph/taitwater <pair_sph_taitwater>` | :doc:`sph/taitwater/morris <pair_sph_taitwater_morris>` | :doc:`srp <pair_srp>` |
+--------------------------------------------------+-----------------------------------------------------+-----------------------------------------------------------------+------------------------------------------------+
| :doc:`tersoff/table (o) <pair_tersoff>` | :doc:`thole <pair_thole>` | :doc:`tip4p/long/soft (o) <pair_lj_soft>` | |
+--------------------------------------------------+-----------------------------------------------------+-----------------------------------------------------------------+------------------------------------------------+
----------

5
doc/_sources/pair_morse.txt
View File

@ -18,6 +18,9 @@ pair_style morse/opt command
pair_style morse/smooth/linear command
======================================
pair_style morse/smooth/linear/omp command
==========================================
Syntax
""""""
@ -75,8 +78,6 @@ the potential energy and force go to zero at the cut-off:
The syntax of the pair_style and pair_coeff commands are the same for
the *morse* and *morse/smooth/linear* styles.
same
----------

4
doc/pair_morse.html
View File

@ -141,6 +141,9 @@
</div>
<div class="section" id="pair-style-morse-smooth-linear-command">
<h1>pair_style morse/smooth/linear command<a class="headerlink" href="#pair-style-morse-smooth-linear-command" title="Permalink to this headline"></a></h1>
</div>
<div class="section" id="pair-style-morse-smooth-linear-omp-command">
<h1>pair_style morse/smooth/linear/omp command<a class="headerlink" href="#pair-style-morse-smooth-linear-omp-command" title="Permalink to this headline"></a></h1>
<div class="section" id="syntax">
<h2>Syntax<a class="headerlink" href="#syntax" title="Permalink to this headline"></a></h2>
<div class="highlight-python"><div class="highlight"><pre>pair_style morse cutoff
@ -184,7 +187,6 @@ the potential energy and force go to zero at the cut-off:</p>
<img alt="_images/pair_morse_smooth_linear.jpg" class="align-center" src="_images/pair_morse_smooth_linear.jpg" />
<p>The syntax of the pair_style and pair_coeff commands are the same for
the <em>morse</em> and <em>morse/smooth/linear</em> styles.</p>
<p>same</p>
<hr class="docutils" />
<p>Styles with a <em>cuda</em>, <em>gpu</em>, <em>intel</em>, <em>kk</em>, <em>omp</em>, or <em>opt</em> suffix are
functionally the same as the corresponding style without the suffix.

3
doc/pair_morse.txt
View File

@ -12,6 +12,7 @@ pair_style morse/gpu command :h3
pair_style morse/omp command :h3
pair_style morse/opt command :h3
pair_style morse/smooth/linear command :h3
pair_style morse/smooth/linear/omp command :h3
[Syntax:]
@ -59,8 +60,6 @@ the potential energy and force go to zero at the cut-off:
The syntax of the pair_style and pair_coeff commands are the same for
the {morse} and {morse/smooth/linear} styles.
same
:line
Styles with a {cuda}, {gpu}, {intel}, {kk}, {omp}, or {opt} suffix are