ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,297 Commits 12 Branches 209 Tags
45ede15f1ee68d0f65e069d1a22c3c7ee37a98dd
Commit Graph

159 Commits

Author SHA1 Message Date
Axel Kohlmeyer
6553258ee9 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
	src/DIPOLE/pair_lj_cut_dipole_long.h
	src/MAKE/Makefile.openmpi-omp
 2013-06-30 12:41:18 +02:00
sjplimp
64a5e8313f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10204 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-29 21:33:54 +00:00
Axel Kohlmeyer
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
sjplimp
fe83b0a86b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10176 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-28 20:35:12 +00:00
sjplimp
31b1e0b4bf git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10156 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-28 17:21:48 +00:00
sjplimp
86cba5d3b2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10145 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-28 16:03:37 +00:00
Axel Kohlmeyer
2b1e3a30bd Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
	doc/fix_tune_kspace.txt
	doc/group2ndx.txt
	src/DIPOLE/atom_vec_dipole.cpp
	src/DIPOLE/pair_lj_long_dipole_long.cpp
	src/MOLECULE/atom_vec_angle.cpp
	src/MOLECULE/atom_vec_bond.cpp
	src/MOLECULE/atom_vec_full.cpp
	src/MOLECULE/atom_vec_molecular.cpp
	src/PERI/atom_vec_peri.cpp
	src/USER-AWPMD/atom_vec_wavepacket.cpp
	src/USER-COLVARS/README
	src/USER-EFF/atom_vec_electron.cpp
	src/USER-SPH/atom_vec_meso.cpp
	src/atom.h
	src/atom_vec_atomic.cpp
	src/atom_vec_body.cpp
	src/atom_vec_charge.cpp
	src/atom_vec_ellipsoid.cpp
	src/atom_vec_line.cpp
	src/atom_vec_sphere.cpp
	src/atom_vec_tri.cpp
	src/fix_restrain.cpp
	src/force.cpp
	tools/restart2data.cpp
 2013-06-28 13:09:52 +02:00
sjplimp
a92e8c271b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10140 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-28 00:00:58 +00:00
sjplimp
07c9a7f6a6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10124 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-27 23:07:29 +00:00
sjplimp
3c0e5bf25c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10109 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-27 21:29:36 +00:00
Axel Kohlmeyer
7dff116588 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
 2013-06-18 13:15:56 +02:00
sjplimp
bb5c918345 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10086 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-17 19:16:03 +00:00
Axel Kohlmeyer
dd1b0ebbc5 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
 2013-06-15 16:03:01 +02:00
sjplimp
61a1847026 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10076 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-14 14:28:01 +00:00
Axel Kohlmeyer
e240e15c4d Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
	src/USER-MISC/dihedral_nharmonic.cpp
	src/USER-MISC/pair_lj_sf_dipole_sf.h
 2013-06-09 14:35:36 +02:00
sjplimp
65a19bf52b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10056 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-08 21:50:21 +00:00
Axel Kohlmeyer
c9710e0c20 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
	src/DIPOLE/pair_lj_cut_dipole_cut.cpp
	src/USER-MISC/pair_lj_sf_dipole_sf.cpp
	src/USER-MISC/pair_lj_sf_dipole_sf.h
 2013-06-07 14:49:08 +02:00
sjplimp
ca981d4e9b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10039 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-06 15:22:24 +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
34185a80b1 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10020 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-04 20:25:16 +00:00
sjplimp
4b8e84a2d6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10013 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-04 15:15:31 +00:00
Axel Kohlmeyer
ce2b853e4a Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Eqs/pair_gauss.jpg
	doc/Manual.txt
	doc/pair_list.html
	doc/pair_list.txt
	lib/atc/Makefile.lammps.linalg
	lib/awpmd/Makefile.lammps.linalg
	lib/gpu/Makefile.lincoln
	lib/linalg/Makefile.gfortran
	lib/linalg/Makefile.mingw_cross
	lib/linalg/README
	lib/reax/Makefile.lammps
	src/USER-CG-CMM/Install.sh
	src/USER-COLVARS/Install.sh
	src/USER-CUDA/Install.sh
	src/USER-MISC/Install.sh
	src/USER-MISC/pair_list.cpp
	src/USER-OMP/Install.sh
	src/USER-PHONON/Install.sh
 2013-06-01 13:53:34 +02:00
sjplimp
8d0a4ee15d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10004 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-31 16:54:41 +00:00
sjplimp
0e9dc07889 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9985 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-30 21:09:28 +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
1ccf84c21c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9926 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-24 22:30:00 +00:00
sjplimp
43dd96f698 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9920 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-24 20:28:54 +00:00
Axel Kohlmeyer
5680a3f9bb Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
	src/comm.cpp
 2013-05-24 15:24:12 +02:00
sjplimp
c9247a0f40 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9904 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-23 22:52:29 +00:00
Axel Kohlmeyer
3d7ee1825d Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
 2013-05-13 09:13:23 +02:00
sjplimp
70feaba97d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9869 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-10 18:32:31 +00:00
sjplimp
fdf13648e2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9863 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-10 17:33:59 +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
a698f27d85 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9851 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-08 21:17:11 +00:00
sjplimp
071e06b830 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9839 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-08 16:09:22 +00:00
sjplimp
55b4f3efb8 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9829 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-08 14:51:27 +00:00
sjplimp
b1c03442af git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9825 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-07 23:44:01 +00:00
sjplimp
9710ebfa4a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9810 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-07 21:20:41 +00:00
Axel Kohlmeyer
5b9200edc9 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
	doc/fix_colvars.txt
	lib/colvars/colvarmodule.h
	src/USER-COLVARS/fix_colvars.cpp
 2013-04-24 13:23:01 +02:00
sjplimp
553d0cf03c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9797 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-04-23 22:55:06 +00:00
sjplimp
683d68c993 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9790 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-04-23 20:56:42 +00:00
Axel Kohlmeyer
4bcaac41a0 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
 2013-04-17 11:16:45 +02:00
sjplimp
d376a8a83b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9774 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-04-12 22:26:16 +00:00
Axel Kohlmeyer
81506fdb90 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
 2013-04-07 16:06:54 +02:00
sjplimp
c8346ac303 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9758 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-04-06 23:13:38 +00:00
Axel Kohlmeyer
81a2ac57dc Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
 2013-04-04 17:20:27 +02:00
sjplimp
17acdd4096 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9746 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-04-03 18:01:08 +00:00
Axel Kohlmeyer
1543cc0d46 Merge remote branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
 2013-04-03 13:31:40 +02:00
sjplimp
a17cc3587d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9732 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-04-02 15:34:45 +00:00
Axel Kohlmeyer
3a639d964b Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Resolved Conflicts:
	doc/Manual.txt
 2013-03-23 18:08:19 +01:00