jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Steve Plimpton 2017-09-01 09:16:11 -06:00
parent f58088ae61 21893539cb
commit 2b9646097c
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/src/Eqs/fix_mvv_dpd.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 26 KiB

2
doc/src/Eqs/fix_mvv_dpd.tex
View File

@ -15,7 +15,7 @@ $$
$$
$$
v(t+\Delta t) = v(t+\frac{\Delta t}{2}) + \frac{\Delta t}{2}\cdot a(t++\Delta t),
v(t+\Delta t) = v(t+\frac{\Delta t}{2}) + \frac{\Delta t}{2}\cdot a(t+\Delta t)
$$
\end{document}

4
src/neighbor.cpp
View File

@ -22,6 +22,10 @@
#include "neighbor.h"
#include "neigh_list.h"
#include "neigh_request.h"
#include "nbin.h"
#include "nstencil.h"
#include "npair.h"
#include "ntopo.h"
#include "style_nbin.h"
#include "style_nstencil.h"
#include "style_npair.h"