|
|
92b0626589
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/Depend.sh
|
2013-05-15 14:56:30 +02:00 |
|
|
|
d46b65f17c
|
Added remap keyword to change_box command
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9882 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-05-14 18:02:10 +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 |
|
|
|
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 |
|
|
|
a920f23204
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9632 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-11 20:47:14 +00:00 |
|
|
|
115df8a116
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/KSPACE/pair_lj_long_coul_long.cpp
src/KSPACE/pair_lj_long_coul_long.h
src/pair.h
|
2013-03-05 13:25:28 +01:00 |
|
|
|
9659cf6739
|
Updated fix reax/c/bonds command to remove time averaging. Update the pair_coeff command to use chemical symbols instead of integers
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9561 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-04 19:42:18 +00:00 |
|
|
|
3ae5083560
|
Updated fix reax/c/bonds command to remove time averaging. Update the pair_coeff command to use chemical symbols instead of integers
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9560 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-04 19:19:54 +00:00 |
|
|
|
7b25847ee5
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
|
2013-02-16 12:25:40 +01:00 |
|
|
|
edc95d9a42
|
Added fix_species
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9517 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-02-15 21:29:41 +00:00 |
|
|
|
7ebdff8bbd
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9514 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-02-15 21:00:56 +00:00 |
|
|
|
2654f62891
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9513 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-02-15 20:19:33 +00:00 |
|
|
|
1fa419fa85
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/USER-MISC/dihedral_table.h
src/comm.cpp
|
2013-02-03 08:23:39 -05:00 |
|
|
|
3f839cf8f0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9381 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-02-01 16:59:27 +00:00 |
|
|
|
bdd81705cc
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
|
2013-02-01 08:29:23 -05:00 |
|
|
|
3d334d0a4c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9365 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-02-01 00:06:14 +00:00 |
|
|
|
e729c74316
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9361 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-31 20:15:10 +00:00 |
|
|
|
f8ac8768d0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9358 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-31 19:32:24 +00:00 |
|
|
|
222322ed1b
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2013-01-26 08:26:51 -05:00 |
|
|
|
19a0bc490e
|
Updated ReaxFF ZnO citation
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9331 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-25 20:01:07 +00:00 |
|
|
|
c8086bffe6
|
Updated ReaxFF ZnO citation
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9330 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-25 19:39:24 +00:00 |
|
|
|
e1709a4489
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/USER-OMP/msm_omp.cpp
src/USER-OMP/msm_omp.h
src/USER-OMP/pair_born_coul_msm_omp.cpp
src/USER-OMP/pair_born_coul_msm_omp.h
src/USER-OMP/pair_buck_coul_msm_omp.cpp
src/USER-OMP/pair_buck_coul_msm_omp.h
src/USER-OMP/pair_coul_msm_omp.cpp
src/USER-OMP/pair_coul_msm_omp.h
src/USER-OMP/pair_lj_charmm_coul_msm_omp.cpp
src/USER-OMP/pair_lj_charmm_coul_msm_omp.h
src/USER-OMP/pair_lj_cut_coul_msm_omp.cpp
src/USER-OMP/pair_lj_cut_coul_msm_omp.h
|
2013-01-18 07:50:51 -05:00 |
|
|
|
87f2415519
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9278 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-17 15:52:46 +00:00 |
|
|
|
f51ad982f6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9277 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-17 15:51:57 +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 |
|
|
|
9b87f88124
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9227 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-04 17:58:46 +00:00 |
|
|
|
772e83406d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9204 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-03 16:22:36 +00:00 |
|
|
|
a69bbed0b7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9184 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-02 16:48:13 +00:00 |
|
|
|
6bcf83444e
|
Merge branch 'master' into lammps-icms
|
2012-12-10 03:58:20 -05:00 |
|
|
|
755e63c0bd
|
Added alternate displace mods
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9147 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-12-07 16:07:10 +00:00 |
|
|
|
399871b63a
|
Merge branch 'master' into lammps-icms
|
2012-10-27 15:30:19 -04:00 |
|
|
|
fbc3f58a05
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9027 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-26 23:31:09 +00:00 |
|
|
|
5a75a6c827
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/REPLICA/verlet_split.cpp
src/USER-OMP/fix_omp.cpp
|
2012-10-26 09:50:01 -04:00 |
|
|
|
ccbe10ff39
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9003 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-25 15:42:25 +00:00 |
|
|
|
6dcb5fb23d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9002 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-25 15:35:14 +00:00 |
|
|
|
1af5a6d629
|
Merge branch 'master' into lammps-icms
|
2012-10-23 07:30:53 -04:00 |
|
|
|
5f377d2d45
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8989 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-22 14:37:08 +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 |
|
|
|
25f111feaa
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8985 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-19 16:11:21 +00:00 |
|
|
|
2aef58a801
|
Merge branch 'master' into lammps-icms
|
2012-09-12 07:18:26 -04:00 |
|
|
|
f74ab7aee2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8768 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-09-11 14:27:02 +00:00 |
|
|
|
17a4a224a6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8767 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-09-11 14:26:34 +00:00 |
|
|
|
d018338c60
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/fix_rigid_nve.h
|
2012-08-22 06:01:58 -04:00 |
|
|
|
487d2437bf
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8684 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-18 22:59:24 +00:00 |
|
|
|
788b01cd71
|
Merge branch 'master' into lammps-icms
|
2012-08-18 17:17:35 -04:00 |
|
|
|
127f12e6fa
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8669 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-15 14:18:34 +00:00 |
|
|
|
ffc41c52c5
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
lib/meam/Makefile.gfortran
lib/poems/Makefile.g++
lib/reax/Makefile.gfortran
python/lammps.py
src/USER-CUDA/cuda.cpp
|
2012-08-15 08:38:04 -04:00 |
|
|
|
39818495c5
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8658 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-14 20:19:44 +00:00 |
|
|
|
01830d476b
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
python/lammps.py
src/MAKE/Makefile.mingw
src/MAKE/Makefile.openmpi
src/MAKE/Makefile.serial
src/MAKE/Makefile.serial_debug
src/USER-CUDA/verlet_cuda.cpp
|
2012-08-14 03:35:29 -04:00 |
|
|
|
5a74d4f88b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8637 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-13 23:53:55 +00:00 |
|
