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

91 Commits

Author SHA1 Message Date
Axel Kohlmeyer
909a9ff697 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-07-29 15:13:15 -04:00
sjplimp
4455b66003 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12207 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-07-28 19:58:51 +00:00
Axel Kohlmeyer
9d731bbb10 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
 2014-06-12 08:46:27 -04:00
sjplimp
d560473a6b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12118 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-06-11 15:20:11 +00:00
sjplimp
5e1d34a23d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11617 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-03-10 15:56:49 +00:00
Axel Kohlmeyer
d181769e88 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	src/MAKE/Makefile.mingw32-cross
	src/MAKE/Makefile.mingw32-cross-mpi
	src/MAKE/Makefile.mingw64-cross
	src/MAKE/Makefile.mingw64-cross-mpi
 2014-01-30 07:54:10 -05:00
sjplimp
fffe7f95b7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11379 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-29 18:40:05 +00:00
Axel Kohlmeyer
39b1597778 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
	src/RIGID/fix_shake.cpp
	src/variable.cpp
	src/write_data.cpp
 2014-01-26 21:35:32 -05:00
sjplimp
0ce16af78b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11328 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-25 22:46:08 +00:00
Axel Kohlmeyer
46e8e6c120 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
	src/MAKE/Makefile.openmpi
	src/MANYBODY/fix_qeq_comb.cpp
	src/MANYBODY/pair_nb3b_harmonic.cpp
	src/RIGID/fix_rigid_small.cpp
	src/RIGID/fix_shake.cpp
	src/USER-REAXC/fix_qeq_reax.cpp
	src/USER-REAXC/fix_reaxc_bonds.cpp
	src/read_data.cpp
	src/special.h
 2014-01-18 11:52:59 -05:00
sjplimp
bad19033d0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11250 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-17 18:43:09 +00:00
Axel Kohlmeyer
a6ca3cab54 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	src/RIGID/fix_rigid_small.cpp
 2014-01-16 20:53:36 -05:00
sjplimp
a1ef01fc1a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11243 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-14 16:17:20 +00:00
Axel Kohlmeyer
cdbf26c64b Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
	lib/gpu/lal_sw.cu
 2014-01-14 07:06:10 -05:00
sjplimp
59a0c577db git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11236 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-13 16:01:32 +00:00
sjplimp
427e90c151 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11229 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-01-13 15:30:19 +00:00
Axel Kohlmeyer
3606e3c3a9 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
 2013-12-19 15:00:16 +01:00
sjplimp
bd1de99a42 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11132 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-12-18 18:25:15 +00:00
Axel Kohlmeyer
20eb2af2f6 Merge remote branch 'lammps-ro/master' into lammps-icms 2013-12-18 14:31:43 +01:00
sjplimp
01abb902f1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11121 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-12-17 14:13:09 +00:00
Axel Kohlmeyer
506ade0e87 Merge remote branch 'lammps-ro/master' into lammps-icms 2013-11-19 18:00:56 +01:00
sjplimp
010c9953c3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11017 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-11-15 18:53:33 +00:00
Axel Kohlmeyer
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
sjplimp
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
Axel Kohlmeyer
fe0a67fb28 Merge remote branch 'lammps-ro/master' into lammps-icms 2013-06-14 12:22:53 +02:00
sjplimp
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
Axel Kohlmeyer
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
sjplimp
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
Axel Kohlmeyer
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
sjplimp
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
Axel Kohlmeyer
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
sjplimp
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
Axel Kohlmeyer
7578429fbd Merge remote branch 'lammps-ro/master' into lammps-icms 2013-05-03 19:49:11 +02:00
athomps
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
Axel Kohlmeyer
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
sjplimp
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
sjplimp
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
Axel Kohlmeyer
21adc8e822 expand OpenMP support in time integration 2013-02-07 06:24:04 -05:00
sjplimp
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
pscrozi
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
sjplimp
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
sjplimp
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
sjplimp
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
sjplimp
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
sjplimp
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
sjplimp
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
sjplimp
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
athomps
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
sjplimp
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
sjplimp
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