Commit Graph

745 Commits

Author SHA1 Message Date
4c611fb1d0 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2016-06-08 06:29:08 -04:00
ab7e896a76 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15150 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-06-07 18:18:53 +00:00
0129ff9696 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15149 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-06-07 18:17:05 +00:00
b5abf9342b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15148 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-06-07 18:16:44 +00:00
f3d5260813 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15145 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-06-07 18:00:54 +00:00
a5fef35ebd git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15144 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-06-07 18:00:49 +00:00
b107958e80 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15143 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-06-07 17:57:47 +00:00
9c5655db7c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15130 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-06-07 15:51:43 +00:00
02aa4478dc Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2016-06-02 06:13:45 -04:00
5c19a0d788 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15094 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-06-01 15:07:48 +00:00
7b8a96ee8c Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2016-06-01 06:35:25 -04:00
4c107f450c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15085 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-05-31 16:39:57 +00:00
ac14f5bc36 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15084 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-05-31 16:38:36 +00:00
4610f8e471 set files to ignore in COUPLE tree 2016-05-16 18:41:49 -04:00
3f4c511bca update COUPLE example library to be portable across MPI libraries 2016-05-16 18:39:18 -04:00
6c80e2cc59 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2016-05-13 06:15:59 -04:00
87e06310cb git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15051 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-05-12 16:29:09 +00:00
62b95b6b34 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15050 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-05-12 16:28:22 +00:00
9efcf1359e Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2016-05-12 06:13:49 -04:00
b0eea89503 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15034 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-05-11 20:38:08 +00:00
df5fe6d5de Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2016-05-11 06:44:32 -04:00
1463cb2598 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15020 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2016-05-10 22:39:37 +00:00
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