Commit 0be11eb8 authored by Julien Guénolé's avatar Julien Guénolé
Browse files

Merge branch 'master' of https://github.com/lammps/lammps

parents a624ed90 06c15142
Loading
Loading
Loading
Loading
+10.4 KiB (20.7 KiB)
Loading image diff...
+3 −2
Changes for doc/src/Eqs/pair_meam_spline.tex: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
\documentclass[12pt]{article}
\usepackage{amsmath}

\begin{document}

$$
   E=\sum_{ij}\phi(r_{ij})+\sum_{i}U(\rho_{i}),
   E=\sum_{i<j}\phi(r_{ij})+\sum_{i}U(n_{i}),
$$

$$
   \rho_{i}=\sum_{j}\rho(r_{ij})+\sum_{jk}f(r_{ij})f(r_{ik})g[\cos(\theta_{jik})]
   n_{i}=\sum_{j}\rho(r_{ij})+\sum_{\substack{j<k,\\j,k\neq i}}f(r_{ij})f(r_{ik})g[\cos(\theta_{jik})]
$$

\end{document}
+22.4 KiB
Loading image diff...
+14 −0
Changes for doc/src/Eqs/pair_meam_spline_multicomponent.tex: 14 added lines, 0 removed lines.
Original line number Diff line number Diff line
\documentclass[12pt]{article}
\usepackage{amsmath}

\begin{document}

$$
   E=\sum_{i<j}\phi_{ij}(r_{ij})+\sum_{i}U_i(n_{i}),
$$

$$
   n_{i}=\sum_{j\ne i}\rho_j(r_{ij})+\sum_{\substack{j<k,\\j,k\neq i}}f_{j}(r_{ij})f_{k}(r_{ik})g_{jk}[\cos(\theta_{jik})]
$$

\end{document}
+3 −3
Changes for doc/src/Section_commands.txt: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -527,9 +527,9 @@ These are additional commands in USER packages, which can be used if
"LAMMPS is built with the appropriate
package"_Section_start.html#start_3.

"dump custom/vtk"_dump_custom_vtk.html,
"dump nc"_dump_nc.html,
"dump nc/mpiio"_dump_nc.html,
"dump netcdf"_dump_netcdf.html,
"dump netcdf/mpiio"_dump_netcdf.html,
"dump vtk"_dump_vtk.html,
"group2ndx"_group2ndx.html,
"ndx2group"_group2ndx.html,
"temper/grem"_temper_grem.html :tb(c=3,ea=c)
Loading