|
|
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 |
|
|
|
def6733a9a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9823 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-05-07 23:41:55 +00:00 |
|
|
|
b7da4d691c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9808 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-05-07 21:14:00 +00:00 |
|
|
|
03c092e07f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9702 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-21 17:36:19 +00:00 |
|
|
|
20ccbeb5c8
|
update version string for restart2data
|
2013-03-20 17:33:17 +01:00 |
|
|
|
98a9f740c1
|
fix typo in restart2data for lj/long/coul/long
|
2013-03-19 16:59:31 +01:00 |
|
|
|
a3603ca40f
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/USER-OMP/msm_omp.h
|
2013-03-16 10:18:47 +01:00 |
|
|
|
1bf81d24a4
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2013-03-14 08:39:35 +01:00 |
|
|
|
a200f0ae38
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9661 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-13 15:43:17 +00:00 |
|
|
|
8a912603a5
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
|
2013-03-12 18:44:52 +01:00 |
|
|
|
3a65e81417
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9651 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-12 15:38:21 +00:00 |
|
|
|
ae3e0a6678
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9650 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-12 15:38:15 +00:00 |
|
|
|
3ba07ca1e6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9641 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-11 21:37:15 +00:00 |
|
|
|
7bd090262d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9634 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-11 20:50:45 +00:00 |
|
|
|
bacce98d04
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9633 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-11 20:48:21 +00:00 |
|
|
|
c7f5f10c92
|
removed symlink
|
2013-02-20 12:54:51 +01:00 |
|
|
|
1466a253d1
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/USER-OMP/pair_lj_cut_tip4p_long_omp.cpp
src/USER-OMP/pair_lj_cut_tip4p_long_omp.h
src/modify.cpp
|
2013-02-15 13:43:13 +01:00 |
|
|
|
fa5eb19f26
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9500 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-02-14 23:13:33 +00:00 |
|
|
|
ac2ba958f8
|
include script for USER-OMP optmization of per atom data access.
|
2013-02-08 23:44:51 +01:00 |
|
|
|
af81896100
|
Merge branch 'master' into lammps-icms
|
2013-01-21 03:11:02 -05:00 |
|
|
|
43e422a683
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9294 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-18 16:04:11 +00:00 |
|
|
|
427161ef56
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/MAKE/Makefile.openmpi
src/min_linesearch.cpp
|
2013-01-09 07:09:35 -05:00 |
|
|
|
5b9c57e438
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9183 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-02 16:45:47 +00:00 |
|
|
|
b73919c94e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9180 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-02 16:40:03 +00:00 |
|
|
|
3aea32f946
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9179 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-02 16:39:52 +00:00 |
|
|
|
6bcf83444e
|
Merge branch 'master' into lammps-icms
|
2012-12-10 03:58:20 -05:00 |
|
|
|
212d8954dd
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9146 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-12-06 23:48:51 +00:00 |
|
|
|
4f948b9602
|
Merge branch 'make-purge' into lammps-icms
|
2012-11-27 14:35:18 -05:00 |
|
|
|
bf3e36ebd9
|
added make purge target
|
2012-11-27 14:33:50 -05:00 |
|
|
|
1af5a6d629
|
Merge branch 'master' into lammps-icms
|
2012-10-23 07:30:53 -04:00 |
|
|
|
d028daec92
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8988 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-22 14:32:18 +00:00 |
|
|
|
be1593f66e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8987 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-22 14:31:31 +00:00 |
|
|
|
ce7ea49079
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/USER-OMP/pair_lj_cut_tip4p_long_proxy_omp.cpp
|
2012-10-22 04:18:55 -04:00 |
|
|
|
0e28d227fe
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8981 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-19 15:50:04 +00:00 |
|
|
|
9a0e9670fb
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
doc/Eqs/pair_gauss.jpg
lib/cuda/Makefile.common
lib/cuda/Makefile.defaults
lib/cuda/Makefile.lammps
lib/cuda/cuda_wrapper_cu.h
lib/cuda/pair_cg_cmm_coul_cut_cuda.cu
lib/cuda/pair_cg_cmm_coul_cut_cuda_cu.h
lib/cuda/pair_cg_cmm_coul_debye_cuda.cu
lib/cuda/pair_cg_cmm_coul_debye_cuda_cu.h
lib/cuda/pair_cg_cmm_coul_long_cuda.cu
lib/cuda/pair_cg_cmm_coul_long_cuda_cu.h
lib/cuda/pair_cg_cmm_cuda.cu
lib/cuda/pair_cg_cmm_cuda_cu.h
lib/cuda/pair_cg_cmm_cuda_kernel_nc.cu
|
2012-10-12 08:46:39 -04:00 |
|
|
|
e909744928
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8910 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-05 15:24:56 +00:00 |
|
|
|
b912c81417
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8909 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-05 15:21:54 +00:00 |
|
|
|
7b5385eac6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8851 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-02 14:48:50 +00:00 |
|
|
|
86b3cbad71
|
Merge branch 'master' into lammps-icms
|
2012-08-09 08:30:27 -04:00 |
|
|
|
a897f70c43
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8582 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-08 17:17:42 +00:00 |
|
|
|
9769c4ae17
|
Merge branch 'master' into lammps-icms
|
2012-08-02 04:37:45 -04:00 |
|
|
|
311d2b0a0c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8514 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-07-30 13:59:32 +00:00 |
|
|
|
4441f9b5aa
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
doc/read_dump.txt
doc/rerun.txt
lib/molfile/README
src/MOLECULE/dihedral_helix.cpp
src/USER-MOLFILE/Install.sh
src/USER-MOLFILE/README
src/create_atoms.cpp
src/read_dump.cpp
src/reader.cpp
src/reader_xyz.cpp
src/rerun.cpp
|
2012-06-20 09:11:18 -04:00 |
|
|
|
5747c99cd8
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8330 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-19 15:32:37 +00:00 |
|
|
|
5c3adddd85
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8261 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-12 22:54:32 +00:00 |
|
|
|
7bd3c2a4c1
|
update information about LAMMPS vs. VMD.
|
2012-06-09 17:19:05 -04:00 |
|
|
|
96666c6712
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/change_box.cpp
src/pair_hybrid.cpp
src/read_data.cpp
tools/restart2data.cpp
|
2012-05-18 10:10:23 -04:00 |
|
|
|
69452129e4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8071 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-05-17 19:36:30 +00:00 |
|
|
|
d8a5a293e8
|
add support for handling disabled bonds/angles/...
|
2012-05-04 17:49:36 -04:00 |
|
|
|
0c73ba06a7
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
tools/restart2data.cpp
|
2012-03-30 09:56:17 -04:00 |
|
