Unverified Commit b61fb736 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

Merge branch 'master' into collected-small-fixes

# Conflicts:
#	doc/README
parents 125b29a6 2e6b19ea
Loading
Loading
Loading
Loading
+12 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ Options:

make html         # generate HTML in html dir using Sphinx
make pdf          # generate 2 PDF files (Manual.pdf,Developer.pdf)
                  #   in this dir via htmldoc and pdflatex
                  #   in this dir via Sphinx and PDFLaTeX
make fetch        # fetch HTML doc pages and 2 PDF files from web site
                  #   as a tarball and unpack into html dir and 2 PDFs
make epub         # generate LAMMPS.epub in ePUB format using Sphinx
@@ -88,8 +88,17 @@ This will install virtualenv from the Python Package Index.

Installing prerequisites for PDF build

[TBA]

Same as for HTML plus a compatible LaTeX installation with
support for PDFLaTeX. Also the following LaTeX packages need
to be installed (e.g. from texlive):
- amsmath
- babel
- cmap
- fncychap
- geometry
- hyperref
- hypcap
- times
----------------

Installing prerequisites for epub build

doc/src/Eqs/angle_charmm.jpg

deleted100644 → 0
−3.84 KiB
Loading image diff...

doc/src/Eqs/angle_charmm.tex

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line
\documentclass[12pt]{article}

\begin{document}

$$ 
  E = K (\theta - \theta_0)^2 + K_{UB} (r - r_{UB})^2 
$$

\end{document}
 No newline at end of file

doc/src/Eqs/angle_class2.jpg

deleted100644 → 0
−15.8 KiB
Loading image diff...

doc/src/Eqs/angle_class2.tex

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line
\documentclass[12pt]{article}

\begin{document}

\begin{eqnarray*}
  E & = & E_a + E_{bb} + E_{ba} \\
  E_a & = & K_2 (\theta - \theta_0)^2 + K_3 (\theta - \theta_0)^3 + K_4 (\theta - \theta_0)^4 \\
  E_{bb} & = & M (r_{ij} - r_1) (r_{jk} - r_2) \\
  E_{ba} & = & N_1 (r_{ij} - r_1) (\theta - \theta_0) + N_2 (r_{jk} - r_2) (\theta - \theta_0)
\end{eqnarray*}

\end{document}
 No newline at end of file
Loading