Commit 5c927ca8 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

Merge remote-tracking branch 'lammps-rw/integration' into vashishta-tabulation

parents 4bb42be3 dd34feb2

src/.gitignore

+2 −2
Original line number Diff line number Diff line
@@ -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

src/ASPHERE/compute_temp_asphere.cpp

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

src/ASPHERE/compute_temp_asphere.h

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

src/ASPHERE/fix_npt_asphere.cpp

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

src/ASPHERE/fix_npt_asphere.h

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

CRA Git | Maintained and supported by SUSTech CRA and CCSE