Commit Graph

678 Commits

Author SHA1 Message Date
5e8d04a07f Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
#	doc/Manual.txt
2015-12-24 07:44:16 -05: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
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
2cf6305dc1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14351 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-12-10 17:40:52 +00:00
07554c8efe Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	lib/colvars/colvarmodule.h
#	src/Makefile
#	src/min_cg.cpp
#	src/min_fire.cpp
#	src/min_quickmin.cpp
#	src/min_sd.cpp
#	src/respa.cpp
#	src/version.h
2015-10-23 07:08:37 -04:00
336aa4093e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14181 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-10-23 00:06:46 +00:00
f8d13ac853 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14174 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-10-22 23:36:53 +00:00
823cc16bdf Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	doc/Section_start.txt
#	doc/pair_hybrid.txt
#	doc/pair_reax.html
#	src/CORESHELL/pair_lj_cut_coul_long_cs.cpp
#	src/KSPACE/pair_lj_cut_coul_long.cpp
#	src/KSPACE/pair_lj_cut_coul_msm.cpp
#	src/MC/fix_bond_break.cpp
#	src/MC/fix_bond_break.h
#	src/MC/fix_bond_create.cpp
#	src/MC/fix_bond_create.h
#	src/USER-FEP/pair_lj_cut_soft.cpp
#	src/USER-MISC/README
#	src/USER-MISC/fix_ti_spring.cpp
#	src/output.cpp
2015-10-22 08:17:31 -04:00
ddfb996d8e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14127 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-10-21 18:16:47 +00:00
47c2913862 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2015-10-16 06:21:14 -04:00
c7170a4296 Added Vashishta potential
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14117 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2015-10-15 17:39:43 +00:00
bfb019efa9 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	src/compute_rdf.cpp
#	src/compute_rdf.h
#	src/info.cpp
2015-10-06 07:35:24 -04:00
da1e4e4f25 Added elastic constant example at finite temperature
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14105 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2015-10-05 21:02:38 +00:00
233eaea97d Added elastic constant example at finite temperature
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14104 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2015-10-05 18:54:37 +00:00
ae2a7e2ebd Made output prettier
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14103 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2015-10-05 18:54:02 +00:00
a1149efbfa Added elastic constant example at finite temperature
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14102 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2015-10-05 18:52:13 +00:00
8a024fa64b Added elastic constant example at finite temperature
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14101 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2015-10-05 18:49:23 +00:00
db4d01260b Added elastic constant example at finite temperature
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14100 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2015-10-05 18:41:56 +00:00
46545bb308 Added elastic constant example at finite temperature
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14099 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2015-10-05 18:30:11 +00:00
f343a9f4a0 Added elastic constant example at finite temperature
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14097 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2015-10-05 18:22:14 +00:00
8ccb8bfd66 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	doc/variable.txt
#	src/reader_xyz.cpp
2015-09-25 09:52:07 -04:00
663551ee9f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14073 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-09-24 22:48:45 +00:00
d2a2124b56 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14072 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-09-24 22:48:28 +00:00
70128bfb92 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14054 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-09-24 20:01:39 +00:00
3af181ab6c Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2015-09-23 09:55:15 -04:00
06bb2fb761 Modifed ZBL to accomodate mixing
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14049 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2015-09-23 00:31:07 +00:00
5e861837d8 update input for current code 2015-09-09 20:31:43 -04:00
2fcc163353 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2015-09-05 06:54:46 -04:00
40382cbda9 Added atom jiggle to initial structure
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14000 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2015-09-04 23:23:47 +00:00
7b30c20b66 Addings xy, xz, and yz strains for axial strain
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13999 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2015-09-04 23:17:02 +00:00
c9188c0095 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13956 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-08-28 23:50:01 +00:00
3591af9f33 add compute tally test and usage reference examples 2015-08-25 17:37:26 -04:00
4bf254972b add old inpu examples for user-tally. need to rework for release 2015-08-20 20:39:53 -04:00
5107280519 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
2015-08-06 00:51:11 -04:00
7e1de6da04 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13834 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-08-04 20:57:54 +00:00
6c8830b828 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
2015-07-28 13:26:45 -04:00
9ed741e904 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13738 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-07-27 18:12:18 +00:00
3dfb446590 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13729 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-07-27 14:57:19 +00:00
997cd33ea5 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2015-07-24 06:53:03 -04:00
96e3b7be55 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13697 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-07-23 15:51:18 +00:00
7af18596a1 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	src/fix_ave_histo.cpp
2015-07-23 06:26:52 -04:00
6864dfa2d1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13682 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-07-22 15:52:49 +00:00
63802b7688 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13674 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-07-22 15:26:43 +00:00
e552ffbb5a Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	potentials/AlCu.bop.table
#	potentials/CCu_v1.bop.table
#	potentials/CuH.bop.table
#	src/atom.cpp
2015-07-09 06:45:53 -04:00
1ec5dd602d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13559 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-07-08 22:23:13 +00:00
42ff3a7aba Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
2015-07-07 07:39:44 -04:00
e60ccb6f9a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13533 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-07-06 16:45:58 +00:00