Commit Graph

723 Commits

Author SHA1 Message Date
891263b868 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2016-04-19 06:21:23 -04:00
00f3ccf3b0 Added Einstein version of Green-Kubo
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14846 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2016-04-18 23:59:16 +00:00
e1c3b1b5de Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2016-04-13 08:56:37 -04:00
cf26690feb Corrected formula for case lx != ly
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14820 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2016-04-12 14:56:22 +00:00
3bf167d051 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2016-04-12 08:22:39 -04:00
20f13bf13d Added a script to calculate elastic compliance tensor
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14819 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2016-04-12 01:28:58 +00:00
f513bf05ec removed some crap a file manager left behind. 2016-03-03 12:02:33 -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
889fda57fe Added user-manifold package. 2016-03-02 18:04:11 -05:00
ab005ce599 Updates to pair_kim to support hybrid and fix_adapt 2016-02-22 15:06:56 -06:00
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
7512821dd6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14628 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-15 21:20:17 +00:00
507bde5b5a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14627 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-15 21:19:55 +00:00
ed9e162025 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14626 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-15 21:18:29 +00:00
2d43f007d1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14617 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-15 18:32:58 +00:00
9ac8547feb git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14616 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-15 18:32:42 +00:00
e7eced3711 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14615 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-15 18:16:07 +00:00
9fc1ec8d30 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14614 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-15 18:15:02 +00:00
2ed1861320 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14613 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-15 18:14:03 +00:00
be035371f9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14612 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-15 18:12:57 +00:00
701b4a00a1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14611 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-15 18:11:41 +00:00
bee7ffaee5 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14610 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-15 18:06:11 +00:00
b1922ae7ca git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14609 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-15 18:04:59 +00:00
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
c1aebdd391 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14544 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-02-03 21:39:32 +00:00
d8c3c99f54 Merge remote-tracking branch 'upstream/lammps-icms' into user-vtk 2016-01-30 17:48:21 +01:00
6303826d29 Merge remote branch 'lammps-ro/master' into lammps-icms 2016-01-29 13:59:06 +01:00
7e67afad7b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14511 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-28 21:19:43 +00:00
d42ebe4e5e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14510 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-28 21:17:32 +00:00
2f8eae4d35 Merge remote-tracking branch 'upstream/lammps-icms' into user-vtk 2016-01-26 00:25:23 +01:00
2aaf9f3d59 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
#	doc/Manual.txt
2016-01-23 06:32:13 -05:00
67d5513df1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14483 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-23 00:59:04 +00:00
666d63d81c Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2016-01-22 08:14:42 -05:00
4da36d1c01 Added data output example
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14468 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2016-01-22 02:49:52 +00:00
b833b55933 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2016-01-21 08:25:46 -05:00
66a048bbb9 Added faces as local compute
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14464 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2016-01-21 01:59:48 +00:00
f3b15cd4d1 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2016-01-20 09:14:58 -05:00
81d55a7904 Changed behavior for non-periodic systems
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14460 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2016-01-20 00:01:34 +00:00
7c810d6198 Added 2d example
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14458 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2016-01-19 22:26:48 +00:00
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
fb0230aed2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14451 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-15 16:05:33 +00:00
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
eb063200bf git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14411 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-11 17:59:15 +00:00
e86cfe431a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14410 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-01-11 17:58:37 +00:00
5e8d04a07f Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
#	doc/Manual.txt
2015-12-24 07:44:16 -05:00
b24ec4a985 Added first test case 2015-12-24 00:33:33 +01:00
29b4d60141 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14398 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-23 17:04:56 +00:00
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
31f22919ab git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14369 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-15 16:03:53 +00:00
9f38620e13 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14368 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-15 16:01:54 +00:00