|
|
60e58c44cf
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
|
2013-07-26 13:15:49 +02:00 |
|
|
|
971b4e98df
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10346 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-25 15:49:50 +00:00 |
|
|
|
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 |
|
|
|
d694b0dee0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10196 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-29 21:20:42 +00:00 |
|
|
|
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 |
|
|
|
8492c4149e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9787 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-04-23 20:35:26 +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 |
|
|
|
a5c6bfb1c5
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9566 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-03-04 23:09:29 +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 |
|
|
|
79410e394f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9509 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-02-15 17:32:15 +00:00 |
|
|
|
bdd81705cc
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
|
2013-02-01 08:29:23 -05:00 |
|
|
|
0c6b84987c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9346 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-31 16:31:03 +00:00 |
|
|
|
2a099bfedb
|
Merge branch 'master' into lammps-icms
Resolve Conflicts:
src/region.cpp
|
2012-06-30 11:23:32 -04:00 |
|
|
|
06d12cd6ec
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8438 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-29 21:10:03 +00:00 |
|
|
|
48aa45f7f0
|
Merge branch 'master' into lammps-icms
Resolved Conflicts (i hope):
src/REPLICA/neb.cpp
src/REPLICA/prd.cpp
src/REPLICA/tad.cpp
src/REPLICA/verlet_split.cpp
src/USER-CUDA/atom_vec_angle_cuda.h
src/USER-CUDA/atom_vec_atomic_cuda.h
src/USER-CUDA/atom_vec_charge_cuda.h
src/USER-CUDA/atom_vec_full_cuda.h
src/USER-CUDA/compute_pe_cuda.h
src/USER-CUDA/compute_pressure_cuda.h
src/USER-CUDA/compute_temp_cuda.h
src/USER-CUDA/compute_temp_partial_cuda.h
src/USER-CUDA/cuda.cpp
src/USER-CUDA/cuda.h
src/USER-CUDA/cuda_data.h
src/USER-CUDA/cuda_neigh_list.h
src/USER-CUDA/fft3d_cuda.h
src/USER-CUDA/fft3d_wrap_cuda.h
src/USER-CUDA/fix_addforce_cuda.h
src/USER-CUDA/fix_aveforce_cuda.h
src/USER-CUDA/fix_enforce2d_cuda.h
src/USER-CUDA/fix_freeze_cuda.h
src/USER-CUDA/fix_gravity_cuda.h
src/USER-CUDA/fix_nve_cuda.h
src/USER-CUDA/fix_set_force_cuda.h
src/USER-CUDA/fix_temp_berendsen_cuda.h
src/USER-CUDA/fix_temp_rescale_cuda.h
src/USER-CUDA/fix_temp_rescale_limit_cuda.h
src/USER-CUDA/fix_viscous_cuda.h
src/USER-CUDA/pair_born_coul_long_cuda.h
src/USER-CUDA/pair_buck_coul_cut_cuda.h
src/USER-CUDA/pair_buck_coul_long_cuda.h
src/USER-CUDA/pair_buck_cuda.h
src/USER-CUDA/pair_cg_cmm_coul_cut_cuda.cpp
src/USER-CUDA/pair_cg_cmm_coul_cut_cuda.h
src/USER-CUDA/pair_cg_cmm_coul_debye_cuda.cpp
src/USER-CUDA/pair_cg_cmm_coul_debye_cuda.h
src/USER-CUDA/pair_cg_cmm_coul_long_cuda.cpp
src/USER-CUDA/pair_cg_cmm_coul_long_cuda.h
src/USER-CUDA/pair_cg_cmm_cuda.cpp
src/USER-CUDA/pair_cg_cmm_cuda.h
src/USER-CUDA/pair_eam_cuda.h
src/USER-CUDA/pair_gran_hooke_cuda.h
src/USER-CUDA/pair_lj96_cut_cuda.h
src/USER-CUDA/pair_lj_charmm_coul_charmm_cuda.h
src/USER-CUDA/pair_lj_charmm_coul_charmm_implicit_cuda.h
src/USER-CUDA/pair_lj_charmm_coul_long_cuda.h
src/USER-CUDA/pair_lj_class2_coul_cut_cuda.h
src/USER-CUDA/pair_lj_class2_coul_long_cuda.h
src/USER-CUDA/pair_lj_class2_cuda.h
src/USER-CUDA/pair_lj_cut_coul_cut_cuda.h
src/USER-CUDA/pair_lj_cut_coul_debye_cuda.h
src/USER-CUDA/pair_lj_cut_coul_long_cuda.h
src/USER-CUDA/pair_lj_cut_cuda.h
src/USER-CUDA/pair_lj_cut_experimental_cuda.h
src/USER-CUDA/pair_lj_expand_cuda.h
src/USER-CUDA/pair_lj_gromacs_coul_gromacs_cuda.h
src/USER-CUDA/pair_lj_gromacs_cuda.h
src/USER-CUDA/pair_lj_sdk_coul_long_cuda.cpp
src/USER-CUDA/pair_lj_sdk_coul_long_cuda.h
src/USER-CUDA/pair_lj_sdk_cuda.h
src/USER-CUDA/pair_lj_smooth_cuda.h
src/USER-CUDA/pair_morse_cuda.h
src/USER-CUDA/pair_sw_cuda.h
src/USER-CUDA/pair_tersoff_cuda.h
src/USER-CUDA/pair_tersoff_zbl_cuda.h
src/USER-CUDA/pppm_cuda.h
src/USER-CUDA/verlet_cuda.cpp
src/USER-CUDA/verlet_cuda.h
src/comm.cpp
src/finish.cpp
src/fix_rigid_nvt.h
src/respa.cpp
src/run.cpp
|
2012-06-07 16:42:38 -04: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 |
|
|
|
5a0145c72e
|
Merge branch 'master' into lammps-icms
|
2012-05-22 10:25:15 -04:00 |
|
|
|
caabcf6db4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8106 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-05-21 14:37:50 +00:00 |
|
|
|
5df5488c8c
|
Merge branch 'master' into lammps-icms
|
2012-05-20 13:01:54 -04:00 |
|
|
|
ce8f089859
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8105 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-05-19 00:34:04 +00:00 |
|
|
|
ca533c10bd
|
rearrange for better alignment
|
2012-05-16 14:12:05 -04:00 |
|
|
|
9bdacec22f
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/GPU/pppm_gpu.h
|
2012-02-14 09:42:03 -05:00 |
|
|
|
1217612ab6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7761 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-02-13 15:33:29 +00:00 |
|
|
|
0f4a27ad8b
|
add c++ emacs cookies into all SCM managed headers
|
2011-12-23 18:27:40 -05:00 |
|
|
|
4f48544d41
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7379 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-16 21:15:49 +00:00 |
|
|
|
891740f4a2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7374 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-16 01:37:13 +00:00 |
|
|
|
ca8dfd3d7c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7146 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-10-20 14:56:49 +00:00 |
|
|
|
8ff0659bae
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5947 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-04-15 22:25:19 +00:00 |
|
|
|
819524ebd6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5932 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-04-13 21:40:14 +00:00 |
|
|
|
460379ce20
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5250 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-11-17 18:25:24 +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 |
|
|
|
3092a34191
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2930 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-06-30 19:31:16 +00:00 |
|
|
|
0cc1d090f4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2330 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-01-05 22:26:08 +00:00 |
|
|
|
aaed6ebc33
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@622 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-06-20 13:17:59 +00:00 |
|
|
|
209f169cbc
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@254 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-01-30 00:22:05 +00:00 |
|
|
|
222c95507e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@26 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2006-09-27 19:51:33 +00:00 |
|
