|
|
8c56f954bc
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.txt
# src/USER-INTEL/verlet_intel.cpp
# src/domain.cpp
|
2016-03-22 06:26:33 -04:00 |
|
|
|
13ae93dbdd
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14769 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-22 00:20:07 +00:00 |
|
|
|
a568a8741b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14761 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-21 16:15:41 +00:00 |
|
|
|
847090cd89
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14759 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-21 16:14:31 +00:00 |
|
|
|
cea9e516a8
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14757 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-21 16:06:09 +00:00 |
|
|
|
000da89b8c
|
correct URL to voro++
|
2016-03-21 06:43:05 -04:00 |
|
|
|
f659311ab9
|
added a compute pe/mol/tally tallying evdwl/ecoul for inter/intra molecular pairs separately
|
2016-03-15 22:39:32 -04:00 |
|
|
|
037e91f77f
|
updated documentation for inclusion of airebo/morse
|
2016-03-15 17:27:37 -04:00 |
|
|
|
c874ec86df
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.txt
|
2016-03-15 06:33:59 -04:00 |
|
|
|
b760ca8038
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14750 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-14 19:11:28 +00:00 |
|
|
|
93e451b594
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14748 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-14 19:06:38 +00:00 |
|
|
|
ec42f2530c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14747 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-14 18:46:42 +00:00 |
|
|
|
92ef1cb060
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14743 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-14 18:44:13 +00:00 |
|
|
|
2e3032723c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14742 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-14 18:41:57 +00:00 |
|
|
|
66b282b36d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14741 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-14 18:41:39 +00:00 |
|
|
|
b154a21d50
|
add a compute bond that allows accessing per sub-style bond energies.
|
2016-03-12 20:25:32 -05:00 |
|
|
|
c80fb4b8ea
|
Merge branch 'pair-morse-smooth-linear-omp' of https://github.com/Pakketeretet2/lammps into merge-pull-38
|
2016-03-11 16:54:43 -05:00 |
|
|
|
b6355a0772
|
Done making changes.
|
2016-03-11 16:39:50 -05:00 |
|
|
|
d654d83686
|
also mention the OpenMP version
|
2016-03-11 11:09:04 -05:00 |
|
|
|
3d506cf5b3
|
restore unchanged doc/pair_thole.html file. will be updated upstream.
|
2016-03-11 11:05:22 -05:00 |
|
|
|
b17f6a1590
|
Docs on lj/cut/thole/long
|
2016-03-11 15:29:19 +01:00 |
|
|
|
1cf0e40793
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
#Resolved Conflicts:
# doc/Manual.txt
# src/MAKE/MACHINES/Makefile.mingw32-cross
# src/MAKE/MACHINES/Makefile.mingw32-cross-mpi
# src/MAKE/MACHINES/Makefile.mingw64-cross
# src/MAKE/MACHINES/Makefile.mingw64-cross-mpi
# src/MAKE/MINE/Makefile.g++
# src/MAKE/Makefile.mpi
# src/MAKE/Makefile.serial
# src/Make.py
# src/Makefile
|
2016-03-11 06:45:09 -05:00 |
|
|
|
a946de0b03
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14738 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-10 16:57:36 +00:00 |
|
|
|
047c55383a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14732 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-10 16:13:43 +00:00 |
|
|
|
b3890e80cb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14731 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-10 16:10:53 +00:00 |
|
|
|
8412d4a96c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14730 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-10 16:09:52 +00:00 |
|
|
|
52f20bbbd5
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14729 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-10 16:09:11 +00:00 |
|
|
|
247bf33d63
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14728 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-10 16:04:18 +00:00 |
|
|
|
fc2b793f13
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2016-03-09 06:16:17 -05:00 |
|
|
|
791f18b03d
|
Corrected error in Liouville factorization
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14727 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-08 19:56:06 +00:00 |
|
|
|
c2f76aa16a
|
small update to USER-MANIFOLD documentation
|
2016-03-08 14:23:38 -05:00 |
|
|
|
978d5786ce
|
Merge branch 'merge-pull-35' into lammps-icms
|
2016-03-08 10:53:13 -05:00 |
|
|
|
2762a07efd
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
#Resolved Conflicts:
# src/Makefile
|
2016-03-08 07:41:05 -05:00 |
|
|
|
0e5c36676f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14724 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-07 17:29:34 +00:00 |
|
|
|
518a5fe7c1
|
Merge branch 'add-user-manifold' of https://github.com/Pakketeretet2/lammps into merge-pull-35
|
2016-03-03 13:42:50 -05:00 |
|
|
|
0d630f1675
|
Merge branch 'lammps-icms' of https://github.com/lammps/lammps into add-user-manifold
|
2016-03-03 11:36:16 -05:00 |
|
|
|
dfb87d6220
|
fix typo
|
2016-03-03 07:47:39 -05:00 |
|
|
|
889fda57fe
|
Added user-manifold package.
|
2016-03-02 18:04:11 -05:00 |
|
|
|
375c1cc721
|
remove stray "same" from morse pair style docs
|
2016-03-02 17:38:30 -05:00 |
|
|
|
6e327ee1b3
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
# doc/Eqs/pair_morse_smooth_linear.jpg
# doc/Manual.html
# doc/Manual.txt
# doc/pair_morse.txt
|
2016-03-02 17:38:06 -05:00 |
|
|
|
9b33b04183
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14720 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-02 00:28:45 +00:00 |
|
|
|
e97ec23ed3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14718 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-01 22:57:38 +00:00 |
|
|
|
9e22165357
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14714 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-01 22:52:13 +00:00 |
|
|
|
223defd6ee
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14713 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-01 22:49:42 +00:00 |
|
|
|
dd73c4c4c3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14712 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-01 22:38:04 +00:00 |
|
|
|
c67331a3bc
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14711 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-01 22:30:28 +00:00 |
|
|
|
9dec6db569
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14708 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-01 20:45:46 +00:00 |
|
|
|
29215e8116
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14707 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-01 20:45:31 +00:00 |
|
|
|
800c546e19
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14706 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-01 20:45:12 +00:00 |
|
|
|
d0646402bc
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14700 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-01 20:39:34 +00:00 |
|
