ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,629 Commits 12 Branches 209 Tags
950f06cff47174dec00f32cdcc4e3597bdbdcc9a
Commit Graph

3039 Commits

Author SHA1 Message Date
Axel Kohlmeyer
950f06cff4 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-05-28 08:18:20 -04:00
sjplimp
21141894f7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12035 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-27 19:22:07 +00:00
sjplimp
58a7b4748e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12031 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-27 17:04:19 +00:00
sjplimp
e09f40c9d0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12028 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-27 14:02:43 +00:00
Axel Kohlmeyer
a30a91c46e Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-05-24 15:36:20 -04:00
sjplimp
e5e877dd3f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12025 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-23 22:53:15 +00:00
Axel Kohlmeyer
122cdf2c39 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	doc/Section_errors.txt
	doc/Section_start.txt
	src/USER-FEP/Install.sh
	src/USER-OMP/pair_lj_charmm_coul_long_soft_omp.cpp

Signed-off-by: Axel Kohlmeyer <akohlmey@gmail.com>
 2014-05-23 06:37:33 -04:00
sjplimp
e9652224bf git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12019 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-22 14:43:36 +00:00
sjplimp
d45d192091 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12016 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-22 14:20:18 +00:00
sjplimp
051dfb0706 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12015 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-22 14:08:24 +00:00
sjplimp
eeb19e88b8 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12014 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-22 14:01:37 +00:00
sjplimp
afabef3465 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12013 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-22 13:59:35 +00:00
Axel Kohlmeyer
3bd25198e9 undo unintentional changes in upstream 2014-05-21 11:04:24 -04:00
Axel Kohlmeyer
716d62503a Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2014-05-21 11:01:21 -04:00
sjplimp
07c88a1f42 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12007 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-20 16:28:10 +00:00
Axel Kohlmeyer
6225a86370 improved documentation for errors and windows packages 2014-05-19 16:59:05 -04:00
Axel Kohlmeyer
0fc4a50dc0 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2014-05-17 07:24:09 -04:00
sjplimp
ca0c3cbe3e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12001 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-16 22:06:33 +00:00
Axel Kohlmeyer
21c6f77ac1 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2014-05-16 10:38:35 -04:00
sjplimp
6af467aadb git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11999 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-15 23:16:58 +00:00
sjplimp
bc3cd87496 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11998 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-15 21:20:05 +00:00
sjplimp
65e0020948 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11997 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-15 21:05:40 +00:00
sjplimp
527b91492c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11994 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-15 13:18:56 +00:00
Axel Kohlmeyer
f9f7283fa5 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/accelerator_cuda.h
 2014-05-14 07:18:26 -04:00
sjplimp
c948a2bcb7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11987 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-13 17:16:10 +00:00
sjplimp
4d2e42e3ed git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11981 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-13 15:31:55 +00:00
sjplimp
d17e06c479 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11976 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-13 14:04:47 +00:00
Axel Kohlmeyer
24fb679e55 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
CResolved onflicts:
	doc/Manual.html
	doc/Manual.txt
	doc/Section_commands.txt
	doc/Section_packages.txt
	doc/compute_fep.html
	doc/compute_fep.txt
	doc/fix_adapt_fep.html
	doc/fix_adapt_fep.txt
	doc/pair_lj_soft.html
	doc/pair_lj_soft.txt
	src/USER-FEP/Install.sh
	src/USER-FEP/README
	src/USER-FEP/compute_fep.cpp
	src/USER-OMP/pair_coul_cut_soft_omp.cpp
	src/USER-OMP/pair_coul_long_soft_omp.cpp
	src/USER-OMP/pair_lj_cut_coul_cut_soft_omp.cpp
	src/USER-OMP/pair_lj_cut_coul_long_soft_omp.cpp
	src/USER-OMP/pair_lj_cut_soft_omp.cpp
	src/USER-OMP/pair_lj_cut_tip4p_long_soft_omp.cpp
	src/USER-OMP/pair_tip4p_long_soft_omp.cpp
 2014-05-10 17:15:55 -04:00
sjplimp
196f3c2841 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11966 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-09 16:45:13 +00:00
sjplimp
1ea4bc8d6f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11963 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-09 16:36:07 +00:00
sjplimp
e70a48dc85 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11962 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-09 16:33:05 +00:00
sjplimp
f4f7e8b1b5 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11961 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-09 16:23:11 +00:00
sjplimp
358568b55d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11960 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-09 16:21:08 +00:00
sjplimp
812dbd6514 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11959 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-09 16:16:18 +00:00
sjplimp
c21d8f9342 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11958 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-09 16:16:09 +00:00
sjplimp
e428c83f24 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11957 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-09 16:16:02 +00:00
sjplimp
1e871c456e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11951 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-09 15:12:05 +00:00
Axel Kohlmeyer
f449ea4eaa Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-05-09 07:22:56 -04:00
sjplimp
90f055351f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11948 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-08 23:15:30 +00:00
Axel Kohlmeyer
4acacd8e3b Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/MISC/fix_efield.cpp
	src/fix_addforce.cpp
	src/fix_move.cpp
	src/fix_setforce.cpp
 2014-05-08 08:49:17 -04:00
sjplimp
919d293a14 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11941 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-07 16:33:38 +00:00
Axel Kohlmeyer
fc62bdc5cb Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-05-07 06:50:32 -04:00
sjplimp
71699d5d89 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11933 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-06 23:00:54 +00:00
sjplimp
1a29057daf git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11930 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-06 22:49:52 +00:00
sjplimp
8bfceea16b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11926 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-06 21:37:03 +00:00
sjplimp
ed0c839eff git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11923 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-06 21:16:38 +00:00
sjplimp
eaab9700db git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11919 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-06 17:38:32 +00:00
Axel Kohlmeyer
4fbf7105d6 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	src/MAKE/Makefile.ubuntu
	src/USER-REAXC/pair_reax_c.cpp
	src/USER-REAXC/reaxc_allocate.cpp
	src/USER-REAXC/reaxc_init_md.cpp
	src/USER-REAXC/reaxc_list.cpp
	src/USER-REAXC/reaxc_multi_body.cpp
	src/USER-REAXC/reaxc_reset_tools.cpp
	src/USER-REAXC/reaxc_tool_box.cpp
	src/USER-REAXC/reaxc_traj.cpp
	src/USER-REAXC/reaxc_types.h
	src/USER-REAXC/reaxc_vector.cpp
	src/write_data.cpp
 2014-05-03 08:13:28 -04:00
sjplimp
3a046a66ad git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11910 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-02 22:26:08 +00:00
sjplimp
19267785f5 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11906 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-05-02 21:47:08 +00:00