ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,047 Commits 12 Branches 209 Tags
2702d94cfd5ed0397f0835a055b78256eb2bee17
Commit Graph

497 Commits

Author SHA1 Message Date
Axel Kohlmeyer
2702d94cfd Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
# Resolved Conflicts:
#	doc/Manual.txt
 2016-02-26 06:35:21 -05:00
sjplimp
4351bad69f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14681 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-25 23:58:54 +00:00
Axel Kohlmeyer
dee858771a Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
# Resolved Conflicts:
#	doc/Manual.txt
 2016-02-23 08:47:52 -05:00
sjplimp
43158e38f6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14667 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-22 23:27:56 +00:00
Axel Kohlmeyer
3e6aa31611 Merge remote branch 'lammps-ro/master' into lammps-icms 2016-02-18 13:21:49 +01:00
sjplimp
718c87f915 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14653 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-17 15:40:36 +00:00
Axel Kohlmeyer
685ae65b02 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/JPG/improper_distance.jpg
	doc/Section_packages.txt
 2016-02-17 13:14:45 +01:00
sjplimp
eee65e309e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14651 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-17 00:18:50 +00:00
Axel Kohlmeyer
1d9d6f9241 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Eqs/improper_dist-1.jpg
	doc/Eqs/pair_mdf-1.jpg
	doc/Eqs/pair_mdf-2.jpg
	doc/Eqs/pair_mdf-3.jpg
	doc/Eqs/pair_mdf-4.jpg
	doc/Eqs/pair_mdf-5.jpg
	doc/Eqs/pair_mdf-6.jpg
	doc/Manual.html
	doc/Manual.txt
	doc/Section_commands.txt
	doc/dump_custom_vtk.txt
	doc/fix.txt
	lib/vtk/Makefile.lammps
	python/lammps.py
	src/Makefile
	src/USER-COLVARS/ndx_group.cpp
	src/USER-VTK/dump_custom_vtk.h
 2016-02-16 12:44:25 +01:00
sjplimp
3311380801 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14639 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-15 23:16:16 +00:00
sjplimp
0be549d08f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14622 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-15 18:38:15 +00:00
sjplimp
de853a373b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14605 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-15 16:20:47 +00:00
Axel Kohlmeyer
15822b0927 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2016-02-04 14:11:07 +01:00
sjplimp
ddb83e1b72 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14548 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-03 21:58:23 +00:00
sjplimp
b25125e529 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14543 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-03 21:37:16 +00:00
Axel Kohlmeyer
057bc649d9 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
	src/fix_store.cpp
 2016-01-30 16:44:57 +01:00
sjplimp
7ae6db5a98 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14523 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-29 17:14:30 +00:00
Axel Kohlmeyer
833f597b81 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
 2016-01-27 13:57:00 +01:00
Axel Kohlmeyer
445807e1f3 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
 2016-01-26 18:18:44 +01:00
sjplimp
b5c90fac9c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14501 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-26 15:13:45 +00:00
sjplimp
e18635c518 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14496 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-26 00:42:04 +00:00
Axel Kohlmeyer
2aaf9f3d59 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
# Resolved Conflicts:
#	doc/Manual.txt
 2016-01-23 06:32:13 -05:00
sjplimp
aca24423f4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14485 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-23 01:00:50 +00:00
Axel Kohlmeyer
b9913826d9 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
# Resolved Conflicts:
#	doc/Manual.txt
#	doc/fix_nh.txt
#	src/create_atoms.cpp
 2016-01-16 08:09:15 -05:00
sjplimp
0d79f78f73 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14453 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-15 16:06:39 +00:00
Axel Kohlmeyer
a066cbb210 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
# Resolved Conflicts:
#	doc/Manual.txt
 2016-01-15 08:18:31 -05:00
sjplimp
ba87515112 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14444 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-15 00:35:21 +00:00
Axel Kohlmeyer
4be9cd4bee Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
# Resolved Conflicts:
#	doc/Manual.txt
 2016-01-13 06:17:50 -05:00
sjplimp
cd1f4ae7f0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14438 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-12 22:29:26 +00:00
sjplimp
a34b9f17da git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14433 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-12 16:48:49 +00:00
Axel Kohlmeyer
607c4aa2a3 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
# Resolved Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	src/USER-SMTBQ/pair_smtbq.cpp
 2016-01-12 07:02:29 -05:00
sjplimp
9e4140c954 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14413 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-11 18:57:20 +00:00
Axel Kohlmeyer
5e8d04a07f Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
# Resolved Conflicts:
#	doc/Manual.txt
 2015-12-24 07:44:16 -05:00
sjplimp
06e04df4e3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14406 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-24 00:03:25 +00:00
sjplimp
ce72ce4e13 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14404 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-24 00:00:27 +00:00
Axel Kohlmeyer
81f9f74d8e Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
# Resolved Conflicts:
#	doc/Manual.txt
#	doc/pair_reax.html
 2015-12-22 07:49:35 -05:00
sjplimp
6f10e999c9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14394 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-21 15:20:41 +00:00
Axel Kohlmeyer
490401bd6a Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
# Resolved Conflicts:
#	doc/Manual.txt
#	doc/pair_reax.html
 2015-12-20 20:06:45 -05:00
sjplimp
e2ec56c171 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14391 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-19 18:42:24 +00:00
Axel Kohlmeyer
1aeecfb0cf Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
# Resolved Conflicts:
#	doc/Manual.txt
#	doc/pair_reax.html
#	src/USER-PHONON/fix_phonon.cpp
 2015-12-16 07:31:09 -05:00
sjplimp
f3af23a41b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14375 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-15 23:31:16 +00:00
sjplimp
75de12f26a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14365 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-15 15:49:29 +00:00
Axel Kohlmeyer
5affb6c013 Merge branch 'master' into lammps-icms 
# Resolved Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	doc/pair_hybrid.txt
#	doc/pair_reax.html
#	doc/pair_reax.txt
#	doc/pair_reax_c.txt
#	src/MANYBODY/pair_polymorphic.cpp
 2015-12-11 07:33:14 -05:00
sjplimp
3b6a3f4e55 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14357 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-10 22:38:44 +00:00
sjplimp
4c1ad17581 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14354 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-10 17:44:45 +00:00
sjplimp
28bf73fbf7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14349 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-10 17:23:56 +00:00
Axel Kohlmeyer
e7d896a459 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
# Resolved Conflicts:
#	doc/Manual.txt
#	doc/improper_distance.txt
#	doc/pair_mdf.txt
#	python/lammps.py
#	src/MANYBODY/pair_polymorphic.cpp
#	src/MANYBODY/pair_polymorphic.h
 2015-12-10 06:29:32 -05:00
sjplimp
c00aabe736 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14329 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-09 21:24:31 +00:00
sjplimp
7920c13b04 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14323 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-09 18:17:05 +00:00
sjplimp
549ea8787b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14320 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-09 17:45:54 +00:00