Commit Graph

375 Commits

Author SHA1 Message Date
b46ddebe3e Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
2013-09-05 14:02:35 +02:00
5302074b3f ATC version 2.0, date: Sep1
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10709 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-09-01 08:07:54 +00:00
2c30d74d8d Merge remote branch 'lammps-ro/master' into lammps-icms 2013-08-29 16:14:12 +02:00
07e3b8c7d7 ATC version 2.0, date: Aug28
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10696 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-08-28 22:16:56 +00:00
1ca6fb0f81 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	lib/atc/CbEam.h
	src/USER-ATC/Install.sh
2013-08-23 13:31:30 +02:00
31b31f0a6a ATC version 2.0, date: Aug22
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10659 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-08-23 00:14:37 +00:00
eacdc7e58c not for release
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10656 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-08-22 23:54:35 +00:00
a04f267b54 ATC version 2.0, date: Aug22
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10655 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-08-22 23:31:13 +00:00
6297a32d9b Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Respolved Conflicts:
	doc/Manual.txt
	lib/atc/CbEam.h
	lib/atc/LammpsInterface.cpp
	lib/atc/LammpsInterface.h
2013-08-22 13:04:27 +02:00
2b9951bf56 Including info on cauchy_born examples.
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10642 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-08-22 00:22:23 +00:00
b22a8a7b61 ATC version 2.0, date: Aug21
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10639 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-08-21 23:06:11 +00:00
7d0fe14fdb Updated to current set of examples.
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10636 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-08-21 22:57:26 +00:00
2d63313b24 obsolete
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10635 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-08-21 22:49:06 +00:00
3b06646a18 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
2013-08-21 05:10:12 +02:00
417d9c5756 Changed broken dimension command
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10590 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-08-15 21:52:09 +00:00
546d3c4e61 remove log file
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10580 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-08-14 01:55:53 +00:00
467ede33fe skip C++ io interface 2013-08-13 06:27:40 +02:00
8bbf508fb0 remove unwanted file 2013-08-13 06:27:16 +02:00
c931a450c0 Merge remote-tracking branch 'lammps-ro/master' into atc-merge
Resolved Conflicts:
	doc/Manual.txt
	src/USER-ATC/Install.sh
	tools/msi2lmp/biosym_frc_files/README
2013-08-08 14:02:03 +02:00
2629a8389d ATC version 2.0, date: Aug7
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10562 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-08-07 21:34:59 +00:00
666de878ad ATC version 2.0, date: Aug7
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10558 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-08-07 21:29:05 +00:00
6420945660 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10535 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-08-05 14:13:12 +00:00
b6012ff420 Merge remote branch 'lammps-ro/master' into lammps-icms 2013-08-02 13:21:49 +02:00
f839dbf2c5 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10510 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-08-01 16:25:10 +00:00
77f06b1dfe Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	doc/Section_start.txt
	src/citeme.cpp
	src/citeme.h
	src/lammps.cpp
	src/neighbor.cpp
2013-07-31 14:39:31 +02:00
13b38d09e5 test if I can commit
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10498 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-07-30 21:52:03 +00:00
c6a0482023 Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	src/USER-OMP/pair_tip4p_cut_omp.cpp
	src/USER-OMP/pair_tip4p_long_omp.cpp
2013-07-30 17:57:22 +02:00
dedb247fcd anticipate patches from upstream to 12 Aug 2013 version 2013-07-30 10:12:29 +02:00
137702f471 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10459 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-29 15:10:40 +00:00
9550535392 Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	lib/cuda/Makefile.lammps
	src/GPU/fix_gpu.cpp
2013-07-27 12:34:08 +02:00
9e639c529d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10458 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 21:54:21 +00:00
b12b9fced9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10409 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-26 15:38:06 +00:00
60e58c44cf Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
2013-07-26 13:15:49 +02:00
7d3d8b5b9d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10395 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 23:59:16 +00:00
38305bf20c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10387 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 23:17:16 +00:00
da8124b43b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10386 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-25 23:17:11 +00:00
d7e0099571 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10265 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-18 13:58:43 +00:00
2eee5bf13f update for change in style names 2013-07-18 11:04:00 +02:00
7a2f87e326 add docs for new pair style 2013-07-01 10:29:12 +02:00
c7183e199a Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	lib/cuda/Makefile.lammps
	src/MOLECULE/dihedral_charmm.cpp
	src/pair.h
2013-06-29 13:25:29 +02:00
05f12d0a82 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10187 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-28 22:23:17 +00:00
97ca2c81ce Merge branch 'lammps-icms' into colvars-update 2013-05-26 12:39:24 +02:00
34c103e2c9 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	src/Depend.sh
2013-05-26 11:57:22 +02:00
859db8d77b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9915 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-24 20:07:56 +00:00
b4a109bfe8 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9908 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-24 14:11:43 +00:00
2e722ce5df improvements to serialization/deserialization feature 2013-05-24 15:14:38 +02:00
92b0626589 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	src/Depend.sh
2013-05-15 14:56:30 +02:00
d46b65f17c Added remap keyword to change_box command
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9882 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-05-14 18:02:10 +00:00
8a912603a5 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
2013-03-12 18:44:52 +01:00
3ba07ca1e6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9641 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-03-11 21:37:15 +00:00