Merge branch 'small' into integration

dd34feb2 · Steve Plimpton · b866e066 · 2524c5b5 · dd34feb2 · dd34feb2
Commit dd34feb2 authored 8 years ago by Steve Plimpton
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1010,6 +1010,6 @@
 /pair_morse_smooth_linear.h
 /pair_smtbq.cpp
 /pair_smtbq.h
-/pair_vashishta.cpp
-/pair_vashishta.h
+/pair_vashishta*.cpp
+/pair_vashishta*.h

--- a/src/ASPHERE/compute_temp_asphere.cpp
+++ b/src/ASPHERE/compute_temp_asphere.cpp
--- a/src/ASPHERE/compute_temp_asphere.h
+++ b/src/ASPHERE/compute_temp_asphere.h
--- a/src/ASPHERE/fix_npt_asphere.cpp
+++ b/src/ASPHERE/fix_npt_asphere.cpp
--- a/src/ASPHERE/fix_npt_asphere.h
+++ b/src/ASPHERE/fix_npt_asphere.h
--- a/src/ASPHERE/fix_nve_asphere.cpp
+++ b/src/ASPHERE/fix_nve_asphere.cpp
--- a/src/ASPHERE/fix_nve_asphere.h
+++ b/src/ASPHERE/fix_nve_asphere.h
--- a/src/ASPHERE/fix_nve_asphere_noforce.h
+++ b/src/ASPHERE/fix_nve_asphere_noforce.h
--- a/src/ASPHERE/fix_nvt_asphere.cpp
+++ b/src/ASPHERE/fix_nvt_asphere.cpp
--- a/src/ASPHERE/fix_nvt_asphere.h
+++ b/src/ASPHERE/fix_nvt_asphere.h
--- a/src/ASPHERE/pair_gayberne.cpp
+++ b/src/ASPHERE/pair_gayberne.cpp
--- a/src/ASPHERE/pair_gayberne.h
+++ b/src/ASPHERE/pair_gayberne.h
--- a/src/ASPHERE/pair_resquared.cpp
+++ b/src/ASPHERE/pair_resquared.cpp
--- a/src/ASPHERE/pair_resquared.h
+++ b/src/ASPHERE/pair_resquared.h
--- a/src/BODY/compute_temp_body.cpp
+++ b/src/BODY/compute_temp_body.cpp
--- a/src/BODY/compute_temp_body.h
+++ b/src/BODY/compute_temp_body.h
--- a/src/BODY/fix_npt_body.cpp
+++ b/src/BODY/fix_npt_body.cpp
--- a/src/BODY/fix_npt_body.h
+++ b/src/BODY/fix_npt_body.h
--- a/src/BODY/fix_nvt_body.cpp
+++ b/src/BODY/fix_nvt_body.cpp
--- a/src/BODY/fix_nvt_body.h
+++ b/src/BODY/fix_nvt_body.h