|
|
909a9ff697
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2014-07-29 15:13:15 -04:00 |
|
|
|
33d9ff4bf4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12201 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-07-28 18:46:56 +00:00 |
|
|
|
21c6f77ac1
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2014-05-16 10:38:35 -04:00 |
|
|
|
db0cac35a2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11996 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-15 15:51:22 +00:00 |
|
|
|
4fbf7105d6
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/MAKE/Makefile.ubuntu
src/USER-REAXC/pair_reax_c.cpp
src/USER-REAXC/reaxc_allocate.cpp
src/USER-REAXC/reaxc_init_md.cpp
src/USER-REAXC/reaxc_list.cpp
src/USER-REAXC/reaxc_multi_body.cpp
src/USER-REAXC/reaxc_reset_tools.cpp
src/USER-REAXC/reaxc_tool_box.cpp
src/USER-REAXC/reaxc_traj.cpp
src/USER-REAXC/reaxc_types.h
src/USER-REAXC/reaxc_vector.cpp
src/write_data.cpp
|
2014-05-03 08:13:28 -04:00 |
|
|
|
45f7542271
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11892 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-05-02 16:36:53 +00:00 |
|
|
|
625b3d3bde
|
Merge branch 'merge-stable' into lammps-icms
Resolved Conflicts:
src/REPLICA/tad.cpp
src/USER-CG-CMM/pair_cmm_common.cpp
src/USER-CG-CMM/pair_cmm_common.h
|
2014-01-30 17:24:37 -05:00 |
|
|
|
5136d59713
|
anticipate 1 Feb 2014 patch from upstream
|
2014-01-30 17:21:25 -05:00 |
|
|
|
3f3e996939
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11389 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-30 17:42:09 +00:00 |
|
|
|
677b11428e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11387 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-30 16:09:37 +00:00 |
|
|
|
8a07871047
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/REPLICA/neb.h
src/USER-REAXC/fix_qeq_reax.cpp
src/read_data.h
|
2014-01-29 07:08:08 -05:00 |
|
|
|
7f81b2f2ff
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11371 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-29 01:37:09 +00:00 |
|
|
|
46e8e6c120
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/MAKE/Makefile.openmpi
src/MANYBODY/fix_qeq_comb.cpp
src/MANYBODY/pair_nb3b_harmonic.cpp
src/RIGID/fix_rigid_small.cpp
src/RIGID/fix_shake.cpp
src/USER-REAXC/fix_qeq_reax.cpp
src/USER-REAXC/fix_reaxc_bonds.cpp
src/read_data.cpp
src/special.h
|
2014-01-18 11:52:59 -05:00 |
|
|
|
bad19033d0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11250 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-01-17 18:43:09 +00:00 |
|
|
|
396883b6bb
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/lammps.cpp
|
2013-07-25 13:01:36 +02:00 |
|
|
|
b8208f582c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10326 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-24 20:10:57 +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 |
|
|
|
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 |
|
|
|
124bfc5ba7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9939 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-05-30 16:29:38 +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 |
|
|
|
9c141ded24
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
|
2013-02-19 13:17:37 +01:00 |
|
|
|
f24bd36fe5
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9524 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-02-18 17:00:25 +00: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 |
|
|
|
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 |
|
|
|
180c732619
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9480 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-02-14 15:57:17 +00:00 |
|
|
|
e5cc471307
|
Merge branch 'master' into lammps-icms
|
2012-11-26 08:47:57 -05:00 |
|
|
|
8cc9aa5698
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9050 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-11-10 01:18:09 +00:00 |
|
|
|
c622ccd693
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
lib/cuda/Makefile.lammps
|
2012-08-30 08:19:35 -04:00 |
|
|
|
dba019f3e4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8723 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-28 14:21:55 +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 |
|
|
|
0f4a27ad8b
|
add c++ emacs cookies into all SCM managed headers
|
2011-12-23 18:27:40 -05: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 |
|
|
|
15203cb792
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7039 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-10-06 17:55:48 +00:00 |
|
|
|
bdb3b9eb5e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6232 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-05-27 23:28:19 +00:00 |
|
|
|
89cbe1ceeb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5591 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-02-04 19:13:14 +00:00 |
|
|
|
7b842d7f45
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5264 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-11-18 18:22:03 +00:00 |
|
|
|
31e65b4e72
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5258 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-11-18 17:28:47 +00:00 |
|
|
|
4c3d42e040
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5035 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-10-13 15:24:17 +00:00 |
|
|
|
c57a5e2af1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5034 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-10-13 15:16:15 +00:00 |
|
|
|
45f5513e53
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5030 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-10-12 23:13:12 +00:00 |
|
|
|
544dde674b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5023 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-10-12 17:58:40 +00:00 |
|
|
|
e10badba42
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4982 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-10-06 18:08:42 +00:00 |
|
|
|
fdeead676d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4980 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-10-06 16:29:07 +00:00 |
|
|
|
4529d7187c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4494 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-08-17 21:58:16 +00:00 |
|
|
|
6173fcaaab
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4442 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-08-05 23:19:26 +00:00 |
|
|
|
b420f5df30
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4042 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-04-23 20:18:24 +00:00 |
|
|
|
b8f17bcf1d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4040 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-04-23 20:00:25 +00:00 |
|
