Diffusion lammps 416f6c25e56d

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
416f6c25e56d
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 18 2014, 16:26.

Description

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Nov 18 2014, 16:26

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS980ef3753512: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12716 f3b2605a-c512-4ea7…
rLAMMPS8b4ce4d893fa: update the colvars module to the version 2014-11-13

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS416f6c25e56d: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Nov 18 2014, 16:26

Merged Changes

Commit	Author	Details	Committed
980ef3753512	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12716 f3b2605a-c512-4ea7…	Nov 18 2014
21ac09ad9c9c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12715 f3b2605a-c512-4ea7…	Nov 18 2014
f14e5cdce67b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12714 f3b2605a-c512-4ea7…	Nov 18 2014
351a98482d47	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12712 f3b2605a-c512-4ea7…	Nov 18 2014
87cdaaa1239c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12711 f3b2605a-c512-4ea7…	Nov 18 2014
5e1af15a1003	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12710 f3b2605a-c512-4ea7…	Nov 18 2014
32699b098348	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12709 f3b2605a-c512-4ea7…	Nov 18 2014
2e4c2f9c470f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12708 f3b2605a-c512-4ea7…	Nov 17 2014
dbdde74aab16	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12707 f3b2605a-c512-4ea7…	Nov 17 2014
c404148cb9ac	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12706 f3b2605a-c512-4ea7…	Nov 17 2014
5118f5674601	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12705 f3b2605a-c512-4ea7…	Nov 17 2014
3c59b58794a8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12704 f3b2605a-c512-4ea7…	Nov 17 2014
2dae59316d14	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12703 f3b2605a-c512-4ea7…	Nov 17 2014
45f40ad29909	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12701 f3b2605a-c512-4ea7…	Nov 17 2014
f39815a416a3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12700 f3b2605a-c512-4ea7…	Nov 17 2014
48b2274786f3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12699 f3b2605a-c512-4ea7…	Nov 17 2014
9f94910670ea	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12698 f3b2605a-c512-4ea7…	Nov 17 2014
b6889dfc6a95	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12696 f3b2605a-c512-4ea7…	Nov 17 2014
f58e7cd6cc9a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12695 f3b2605a-c512-4ea7…	Nov 17 2014
a05ec19a372d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12694 f3b2605a-c512-4ea7…	Nov 17 2014
b7ece0fb5183	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12693 f3b2605a-c512-4ea7…	Nov 17 2014

Changes (106)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/change_box.html
	M			doc/change_box.txt
	M			doc/compute_property_atom.html
	M			doc/compute_property_atom.txt
	M			doc/fix_deposit.html
	M			doc/fix_deposit.txt
	M			doc/fix_nh.html
	M			doc/fix_nh.txt
	M			doc/fix_temp_berendsen.html
	M			doc/fix_temp_berendsen.txt
	M			doc/group.html
	M			doc/group.txt
	M			doc/neb.html
	M			doc/neb.txt
	M			src/ASPHERE/compute_temp_asphere.cpp
	M			src/GPU/pair_beck_gpu.cpp
	M			src/GPU/pair_born_coul_long_gpu.cpp
	M			src/GPU/pair_born_coul_wolf_gpu.cpp
	M			src/GPU/pair_born_gpu.cpp
	M			src/GPU/pair_colloid_gpu.cpp
	M			src/GPU/pair_coul_debye_gpu.cpp
	M			src/GPU/pair_gauss_gpu.cpp
	M			src/GPU/pair_lj_cut_coul_debye_gpu.cpp
	M			src/GPU/pair_lj_cut_coul_msm_gpu.cpp
	M			src/GPU/pair_lj_cut_dipole_cut_gpu.cpp
	M			src/GPU/pair_lj_gromacs_gpu.cpp
	M			src/GPU/pair_lj_sf_dipole_sf_gpu.cpp
	M			src/GPU/pair_mie_cut_gpu.cpp
	M			src/GPU/pair_soft_gpu.cpp
	M			src/GPU/pair_yukawa_colloid_gpu.cpp
	M			src/GPU/pppm_gpu.cpp
	M			src/GRANULAR/pair_gran_hertz_history.cpp
	M			src/GRANULAR/pair_gran_hooke_history.cpp
	M			src/KSPACE/msm.cpp
	M			src/KSPACE/msm_cg.cpp
	M			src/KSPACE/pppm.cpp
	M			src/KSPACE/pppm_cg.cpp
	M			src/KSPACE/pppm_disp.cpp
	M			src/KSPACE/pppm_stagger.cpp
	M			src/MANYBODY/fix_qeq_comb.cpp
	M			src/MISC/fix_ttm.cpp
	M			src/MOLECULE/dihedral_charmm.cpp
	M			src/MOLECULE/dihedral_harmonic.cpp
	M			src/MOLECULE/dihedral_helix.cpp
	M			src/MOLECULE/improper_cvff.cpp
	M			src/MOLECULE/improper_harmonic.cpp
	M			src/REPLICA/neb.cpp
	M			src/REPLICA/prd.cpp
	M			src/REPLICA/tad.cpp
	M			src/RIGID/fix_shake.cpp
	M			src/USER-CUDA/compute_temp_cuda.cpp
	M			src/USER-CUDA/compute_temp_partial_cuda.cpp
	M			src/USER-CUDA/pppm_old.cpp
	M			src/USER-EFF/compute_temp_deform_eff.cpp
	M			src/USER-EFF/compute_temp_deform_eff.h
	M			src/USER-EFF/compute_temp_eff.cpp
	M			src/USER-EFF/compute_temp_region_eff.cpp
	M			src/USER-MISC/compute_temp_rotate.cpp
	M			src/USER-MISC/dihedral_cosine_shift_exp.cpp
	M			src/USER-MISC/dihedral_fourier.cpp
	M			src/USER-MISC/dihedral_nharmonic.cpp
	M			src/USER-MISC/dihedral_quadratic.cpp
	M			src/USER-MISC/improper_cossq.cpp
	M			src/USER-MISC/improper_ring.cpp
	M			src/USER-OMP/dihedral_charmm_omp.cpp
	M			src/USER-OMP/fix_qeq_comb_omp.cpp
	M			src/USER-OMP/msm_cg_omp.cpp
	M			src/USER-REAXC/fix_reaxc_bonds.cpp
	M			src/USER-REAXC/fix_reaxc_species.cpp
	M			src/balance.cpp
	M			src/change_box.cpp
	M			src/comm_brick.cpp
	M			src/comm_tiled.cpp
	M			src/compute.cpp
	M			src/compute.h
	M			src/compute_temp.cpp
	M			src/compute_temp_com.cpp
	M			src/compute_temp_deform.cpp
	M			src/compute_temp_partial.cpp
	M			src/compute_temp_profile.cpp
	M			src/compute_temp_ramp.cpp
	M			src/compute_temp_region.cpp
	M			src/compute_temp_sphere.cpp
	M			src/displace_atoms.cpp
	M			src/dump.cpp
	M			src/fix_langevin.cpp
	M			src/fix_nh.cpp
	M			src/fix_temp_berendsen.cpp
	M			src/fix_tmd.cpp
	M			src/irregular.cpp
	M			src/library.cpp
	M			src/min_cg.cpp
	M			src/min_quickmin.cpp
	M			src/modify.cpp
	M			src/neighbor.cpp
	M			src/read_data.cpp
	M			src/read_dump.cpp
	M			src/read_restart.cpp
	M			src/rerun.cpp
	M			src/thermo.cpp
	M			src/velocity.cpp
	M			src/version.h
	M			src/write_data.cpp
	M			src/write_restart.cpp