Unverified Commit 528fc8f6 authored by Jacob Gissinger's avatar Jacob Gissinger Committed by GitHub
Browse files

Merge pull request #21 from lammps/master

rebase
parents 203f82ed ae0979e1
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ if(PKG_LATTE)
    include(ExternalProject)
    ExternalProject_Add(latte_build
      URL https://github.com/lanl/LATTE/archive/v1.2.1.tar.gz
      URL_MD5 bed76e7e76c545c36dd848a8f1fd35eb
      URL_MD5 85ac414fdada2d04619c8f936344df14
      SOURCE_SUBDIR cmake
      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
      )
+2 −2
Original line number Diff line number Diff line
@@ -49,11 +49,11 @@ help:

# ------------------------------------------

clean-all:
clean-all: clean
	rm -rf $(BUILDDIR)/* utils/txt2html/txt2html.exe

clean:
	rm -rf $(RSTDIR) html
	rm -rf $(RSTDIR) html old epub
	rm -rf spelling

clean-spelling:
+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}

doc/src/Errors.txt

0 → 100644
+37 −0
Original line number Diff line number Diff line
"Previous Section"_Python.html - "LAMMPS WWW Site"_lws -
"LAMMPS Documentation"_ld - "LAMMPS Commands"_lc - "Next
Section"_Section_history.html :c

:link(lws,http://lammps.sandia.gov)
:link(ld,Manual.html)
:link(lc,Section_commands.html#comm)

:line

Errors :h2

These doc pages describe the errors you can encounter when using
LAMMPS.  The common problems include conceptual issues.  The messages
and warnings doc pages give complete lists of all the messages the
code may generate (except those generated by USER packages), with
additional details for many of them.

<!-- RST

.. toctree::

   Errors_common
   Errors_bugs
   Errors_messages
   Errors_warnings

END_RST -->

<!-- HTML_ONLY -->

"Common problems"_Errors_common.html
"Reporting bugs"_Errors_bugs.html
"Error messages"_Errors_messages.html 
"Warning messages"_Errors_warnings.html :all(b)

<!-- END_HTML_ONLY -->
Loading