|
|
7e9bb11c75
|
Merge branch 'master' into lammps-icms
|
2012-12-19 05:19:46 -05:00 |
|
|
|
5a7e5b3cab
|
Removed invalid arg count check
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9154 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-12-12 22:40:03 +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 |
|
|
|
c22237f395
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8916 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-08 14:52:40 +00:00 |
|
|
|
2a099bfedb
|
Merge branch 'master' into lammps-icms
Resolve Conflicts:
src/region.cpp
|
2012-06-30 11:23:32 -04:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
7de917cf80
|
resynchronize the code in change_box and read_data
|
2012-05-18 10:16:43 -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 |
|
|
|
a930905787
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8084 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-05-17 23:47:57 +00:00 |
|
|
|
2eac45a18d
|
fix bugs in volume preservation code.
|
2012-04-26 14:06:44 -04: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 |
|
|
|
d892afbf67
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7734 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-02-09 16:56:02 +00:00 |
|
|
|
ebebc70142
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7723 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-02-07 23:27:34 +00:00 |
|
|
|
75990ce095
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7712 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-02-06 18:44:03 +00:00 |
|
|
|
c81b8c5d04
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7702 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-02-06 16:58:46 +00:00 |
|
|
|
19e8c92a90
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7003 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-09-23 18:06:55 +00:00 |
|
|
|
9600268de9
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4320 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-06-18 19:49:12 +00:00 |
|
|
|
12da1e9350
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1905 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-06-23 15:26:03 +00:00 |
|
|
|
6627332568
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@690 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-06-27 20:57:28 +00:00 |
|
