Commit 6ab93b52 authored by Ryan S. Elliott's avatar Ryan S. Elliott
Browse files

Merge remote-tracking branch 'lammps/master' into kim-v2-update

parents c0a7cabc 5c21d2af
Loading
Loading
Loading
Loading
+5 −5
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
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
+144 KiB
Loading image diff...
+13 −0
Original line number Diff line number Diff line
\documentstyle[12pt]{article}

\begin{document}

\begin{eqnarray*}
 F_n &=& k_n \delta_n - c_n v_n, \qquad \delta_n \le 0 \\
     &=& -k_{na} \delta_n - c_n v_n, \qquad 0 < \delta_n \le r_c \\
     &=& 0 \qquad \qquad \qquad \qquad \delta_n > r_c \\
 F_t &=& \mu k_n \delta_n - c_t v_t, \qquad \delta_n \le 0 \\
     &=& 0 \qquad \qquad \qquad \qquad \delta_n > 0
\end{eqnarray*}

\end{document}
+34.8 KiB
Loading image diff...
Loading