|
|
5b0c62a2a0
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
src/USER-MISC/bond_harmonic_shift.cpp
src/USER-MISC/bond_harmonic_shift_cut.cpp
|
2013-11-26 13:39:09 +01:00 |
|
|
|
95637841ec
|
sorting and buffering not allowed at the same time.
|
2013-11-25 18:20:20 +01:00 |
|
|
|
819b351f3f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11057 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-11-25 16:29:18 +00:00 |
|
|
|
b8c2731c4b
|
temporarily disable output buffering for cfg and xyz dumps
|
2013-11-24 11:26:27 +01:00 |
|
|
|
dc1278ee51
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
doc/Section_commands.txt
doc/Section_start.txt
doc/dump_image.txt
doc/dump_modify.txt
doc/write_dump.txt
src/USER-PHONON/fix_phonon.cpp
src/dump_movie.cpp
src/write_dump.cpp
|
2013-11-05 13:37:27 +01:00 |
|
|
|
5f9001a59d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10935 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-11-04 16:59:03 +00:00 |
|
|
|
4bcaac41a0
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
|
2013-04-17 11:16:45 +02:00 |
|
|
|
d8509b5842
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9772 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-04-12 22:24:18 +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 |
|
|
|
9259ae8699
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
doc/Eqs/pair_coul_diel.jpg
doc/Section_commands.html
doc/Section_commands.txt
doc/pair_coul_diel.html
doc/pair_coul_diel.txt
doc/processors.html
doc/processors.txt
examples/USER/imd/bucky_cnt_imd.vmd
examples/USER/imd/in.bucky-plus-cnt
examples/USER/imd/in.deca-ala-solv_imd
examples/USER/imd/in.deca-ala_imd
lib/gpu/Makefile.fermi
lib/gpu/Makefile.lincoln
lib/gpu/Makefile.longhorn
lib/gpu/Makefile.serial
lib/gpu/geryon/VERSION.txt
lib/gpu/pair_gpu_device.cpp
src/ASPHERE/atom_vec_ellipsoid.cpp
src/CLASS2/Install.sh
src/COLLOID/atom_vec_colloid.cpp
src/DIPOLE/atom_vec_dipole.cpp
src/GPU/fix_gpu.cpp
src/GRANULAR/atom_vec_granular.cpp
src/GRANULAR/fix_pour.h
src/KSPACE/Install.sh
src/KSPACE/fft3d.cpp
src/KSPACE/fft3d.h
src/KSPACE/kissfft.h
src/KSPACE/pppm.cpp
src/KSPACE/pppm.h
src/KSPACE/pppm_tip4p.cpp
src/MAKE/Makefile.openmpi
src/MAKE/Makefile.serial
src/MANYBODY/pair_airebo.cpp
src/MANYBODY/pair_comb.cpp
src/MANYBODY/pair_eam.cpp
src/MANYBODY/pair_eim.cpp
src/MANYBODY/pair_sw.cpp
src/MANYBODY/pair_tersoff.cpp
src/MANYBODY/pair_tersoff_zbl.cpp
src/MOLECULE/atom_vec_angle.cpp
src/MOLECULE/atom_vec_bond.cpp
src/MOLECULE/atom_vec_full.cpp
src/MOLECULE/atom_vec_molecular.cpp
src/Makefile
src/Makefile.lib
src/PERI/atom_vec_peri.cpp
src/USER-CG-CMM/Install.sh
src/USER-IMD/README
src/USER-IMD/fix_imd.cpp
src/USER-IMD/fix_imd.h
src/USER-SMD/Install.sh
src/atom_vec_atomic.cpp
src/atom_vec_charge.cpp
src/comm.cpp
src/finish.cpp
src/fix_box_relax.cpp
src/fix_deposit.cpp
src/fix_spring_self.cpp
src/fix_store_state.cpp
src/fix_wall.cpp
src/fix_wall_reflect.cpp
src/input.cpp
src/input.h
src/memory.cpp
src/memory.h
src/pair_lj_cut.cpp
tools/restart2data.cpp
|
2011-12-31 19:07:46 -05: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 |
|
|
|
1ba435ee18
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7000 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-09-23 13:58:33 +00:00 |
|
|
|
aedbb28b6c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6486 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-30 20:10:18 +00:00 |
|
|
|
d9824c7583
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6305 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-07 15:25:20 +00:00 |
|
|
|
bc7d4046f1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6253 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-05-31 16:34:45 +00:00 |
|
|
|
405d127522
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6251 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-05-30 15:46:44 +00:00 |
|
|
|
7c04f95ce0
|
Added xsu, ysu, zsu to dump custom and dump cfg
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6044 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-04-29 23:40:14 +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 |
|
|
|
fbb475b9cd
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5835 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-03-25 21:13:51 +00:00 |
|
|
|
2b168b0890
|
Merge branch 'master' into lammps-icms
|
2011-03-15 09:08:32 -04:00 |
|
|
|
22f987a208
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5778 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-03-11 15:37:52 +00:00 |
|
|
|
5309043b07
|
merge in 18Feb patch manually to do ahead of time.
|
2011-02-23 10:58:54 -05:00 |
|
|
|
3a720230d9
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5724 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-02-23 15:25:00 +00:00 |
|
|
|
a47e493dfd
|
Merge branch 'master' into lammps-icms
Conflicts resolved in:
doc/Section_commands.html
src/USER-IMD/fix_imd.cpp
src/finish.cpp
|
2011-01-10 10:06:21 -05:00 |
|
|
|
140cdf9485
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5504 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-01-07 21:42:19 +00:00 |
|
|
|
60a5ec92ac
|
remove executable file permissions where useless.
|
2010-11-04 18:17:44 -04:00 |
|
|
|
ded8b22c19
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4795 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-09-15 22:16:20 +00:00 |
|
|
|
ad1adc6474
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4504 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-08-19 15:16:31 +00:00 |
|
|
|
4663686781
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3685 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-01-14 21:11:58 +00:00 |
|
|
|
124af06d28
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3658 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-01-12 16:32:06 +00:00 |
|
|
|
4900c3d0c0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3598 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-12-21 21:21:22 +00:00 |
|
|
|
9647012ec7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3136 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-09-02 16:24:00 +00:00 |
|
