Commit Graph

69 Commits

Author SHA1 Message Date
f6484736ec Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	src/input.cpp
	tools/msi2lmp/test/reference/crambin-class1.data~lammps-ro_master~2
	tools/msi2lmp/test/reference/nylon-class1.data~lammps-ro_master~2
	tools/restart2data.cpp
2013-07-24 13:33:50 +02:00
dda38788f7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10300 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-23 16:13:20 +00:00
fe0a67fb28 Merge remote branch 'lammps-ro/master' into lammps-icms 2013-06-14 12:22:53 +02:00
6ae2657ecc git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10071 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-13 15:24:28 +00:00
f68c9e8386 Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	src/lattice.cpp
2013-06-05 14:04:27 +02:00
c886f137b0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10011 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-04 15:10:14 +00: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
db8eda0253 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9913 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-24 18:55:24 +00:00
c1b6654dbc Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	src/MOLECULE/atom_vec_full.cpp
	src/REPLICA/prd.cpp
	src/atom_vec_charge.cpp
2013-05-10 10:03:21 +02:00
03aeb17625 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9807 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-07 21:09:57 +00:00
7578429fbd Merge remote branch 'lammps-ro/master' into lammps-icms 2013-05-03 19:49:11 +02:00
460d44523b Fixed problem with remap_near() for triclinic
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9804 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-05-02 02:10:05 +00:00
1d68769ded Merge branch 'master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	src/KSPACE/pair_buck_long_coul_long.cpp
	src/USER-OMP/angle_fourier_omp.cpp
	src/USER-OMP/angle_fourier_simple_omp.cpp
	src/USER-OMP/angle_quartic_omp.cpp
	src/USER-OMP/dihedral_fourier_omp.cpp
	src/USER-OMP/dihedral_nharmonic_omp.cpp
	src/USER-OMP/dihedral_quadratic_omp.cpp
	src/USER-OMP/domain_omp.cpp
	src/USER-OMP/fix_nh_asphere_omp.cpp
	src/USER-OMP/fix_nh_omp.cpp
	src/USER-OMP/fix_nh_sphere_omp.cpp
	src/USER-OMP/fix_nve_omp.cpp
	src/USER-OMP/fix_nvt_sllod_omp.cpp
	src/USER-OMP/pair_dipole_sf_omp.cpp
	src/USER-OMP/pair_hbond_dreiding_lj_omp.cpp
	src/USER-OMP/pair_hbond_dreiding_morse_omp.cpp
	src/math_special.h
	src/neigh_bond.cpp
	src/neighbor.h
2013-02-09 13:21:53 +01:00
a6cbf805dc git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9424 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-02-08 21:57:01 +00:00
7a286596d8 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9416 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-02-08 21:38:50 +00:00
21adc8e822 expand OpenMP support in time integration 2013-02-07 06:24:04 -05:00
cda07e598c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9308 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-01-22 19:09:19 +00:00
18c211af65 Updating MSM code to reflect changes allowing non-periodic boundaries.
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9247 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-01-08 17:48:28 +00:00
9316e35a98 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8803 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-09-20 15:51:16 +00:00
0d188f1df2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8697 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-08-21 14:14:27 +00:00
25a2d17537 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8696 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-08-21 14:13:53 +00:00
16114b3b95 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8552 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-08-07 17:47:45 +00:00
be1e06897b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8551 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-08-07 16:12:48 +00:00
912cfaca75 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8497 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-07-25 15:15:41 +00:00
0d1ef8e3be git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8489 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-07-16 16:22:16 +00:00
95e51c0cda Added DELTATILT to box skew check
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8484 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2012-07-10 20:32:47 +00:00
66c5617afb git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8395 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-06-25 22:03:31 +00:00
e8ff810ee7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8391 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-06-25 16:42:20 +00:00
bb48c5ccdc git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8312 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-06-18 23:49:36 +00:00
0f4be10d4a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8289 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-06-14 22:17:17 +00:00
ef9e700545 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-06-06 22:47:51 +00:00
8af0a6a14c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8188 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-05-25 22:14:42 +00:00
2e1b7a0f0e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8037 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-05-03 14:58:24 +00:00
e0198e0247 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8019 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-04-19 18:51:49 +00:00
fb1c3d6019 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8008 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-04-10 15:02:16 +00:00
d892afbf67 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7734 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-02-09 16:56:02 +00:00
c81b8c5d04 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7702 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-02-06 16:58:46 +00:00
7fb5f449e4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7686 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-02-03 20:03:29 +00:00
9224da83ab git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7303 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-12-08 00:32:34 +00:00
c6bbdcfbf2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7184 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-10-24 20:28:02 +00:00
19e8c92a90 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7003 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-09-23 18:06:55 +00:00
aedbb28b6c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6486 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-06-30 20:10:18 +00:00
f17f012bb8 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6475 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-06-28 15:05:12 +00:00
1c3275156a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6334 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-06-08 18:16:41 +00:00
f60d2adc33 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5754 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-03-07 22:47:03 +00:00
5696ba8f3d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5683 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-02-21 21:58:37 +00:00
39e30f3196 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5637 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-02-15 18:10:20 +00:00
5ff00cfd0f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4505 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-08-19 16:01:08 +00:00
ad1adc6474 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4504 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-08-19 15:16:31 +00:00
2c643b7dc5 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3655 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-01-12 01:37:48 +00:00