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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 20 2015, 13:09.

Description

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

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

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 20 2015, 13:09

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS38664b904fef: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12959 f3b2605a-c512-4ea7…
rLAMMPS75b69a0841a4: update colvars package from git repo

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS8d532d93e929: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 20 2015, 13:09

Merged Changes

Commit	Author	Details	Committed
38664b904fef	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12959 f3b2605a-c512-4ea7…	Jan 20 2015
b2e15707c8b8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12958 f3b2605a-c512-4ea7…	Jan 20 2015
4a975dd8cf07	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12957 f3b2605a-c512-4ea7…	Jan 20 2015
72ac6ea85400	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12956 f3b2605a-c512-4ea7…	Jan 20 2015
e72afc5488aa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12955 f3b2605a-c512-4ea7…	Jan 20 2015
a0803161876a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12953 f3b2605a-c512-4ea7…	Jan 19 2015
799eb59edcdf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12952 f3b2605a-c512-4ea7…	Jan 19 2015
4957e4a147d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12951 f3b2605a-c512-4ea7…	Jan 19 2015
1eb5be159143	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12950 f3b2605a-c512-4ea7…	Jan 19 2015
3eab216a550b	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12949 f3b2605a-c512-4ea7…	Jan 19 2015
c91903505083	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12948 f3b2605a-c512-4ea7…	Jan 19 2015
c377d599d0df	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12947 f3b2605a-c512-4ea7…	Jan 19 2015
7f94deb3dbbb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12946 f3b2605a-c512-4ea7…	Jan 19 2015

Changes (222)
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/fix_adapt.html
	M			doc/fix_adapt.txt
	M			doc/fix_adapt_fep.html
	M			doc/fix_adapt_fep.txt
	M			doc/fix_atom_swap.html
	M			doc/fix_atom_swap.txt
	M			doc/fix_move.html
	M			doc/fix_move.txt
	M			src/ASPHERE/pair_gayberne.cpp
	M			src/ASPHERE/pair_line_lj.cpp
	M			src/ASPHERE/pair_resquared.cpp
	M			src/ASPHERE/pair_tri_lj.cpp
	M			src/BODY/pair_body.cpp
	M			src/CLASS2/pair_lj_class2_coul_cut.cpp
	M			src/CLASS2/pair_lj_class2_coul_long.cpp
	M			src/COLLOID/pair_yukawa_colloid.cpp
	M			src/DIPOLE/pair_lj_cut_dipole_cut.cpp
	M			src/DIPOLE/pair_lj_cut_dipole_long.cpp
	M			src/DIPOLE/pair_lj_long_dipole_long.cpp
	M			src/FLD/pair_brownian.cpp
	M			src/FLD/pair_brownian_poly.cpp
	M			src/FLD/pair_lubricate.cpp
	M			src/FLD/pair_lubricateU.cpp
	M			src/FLD/pair_lubricateU_poly.cpp
	M			src/FLD/pair_lubricate_poly.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_buck_coul_cut_gpu.cpp
	M			src/GPU/pair_buck_coul_long_gpu.cpp
	M			src/GPU/pair_buck_gpu.cpp
	M			src/GPU/pair_colloid_gpu.cpp
	M			src/GPU/pair_coul_cut_gpu.cpp
	M			src/GPU/pair_coul_debye_gpu.cpp
	M			src/GPU/pair_coul_dsf_gpu.cpp
	M			src/GPU/pair_coul_long_gpu.cpp
	M			src/GPU/pair_dpd_gpu.cpp
	M			src/GPU/pair_dpd_tstat_gpu.cpp
	M			src/GPU/pair_eam_gpu.cpp
	M			src/GPU/pair_gauss_gpu.cpp
	M			src/GPU/pair_gayberne_gpu.cpp
	M			src/GPU/pair_lj96_cut_gpu.cpp
	M			src/GPU/pair_lj_charmm_coul_long_gpu.cpp
	M			src/GPU/pair_lj_class2_coul_long_gpu.cpp
	M			src/GPU/pair_lj_class2_gpu.cpp
	M			src/GPU/pair_lj_cut_coul_cut_gpu.cpp
	M			src/GPU/pair_lj_cut_coul_debye_gpu.cpp
	M			src/GPU/pair_lj_cut_coul_dsf_gpu.cpp
	M			src/GPU/pair_lj_cut_coul_long_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_cut_gpu.cpp
	M			src/GPU/pair_lj_expand_gpu.cpp
	M			src/GPU/pair_lj_gromacs_gpu.cpp
	M			src/GPU/pair_lj_sdk_coul_long_gpu.cpp
	M			src/GPU/pair_lj_sdk_gpu.cpp
	M			src/GPU/pair_lj_sf_dipole_sf_gpu.cpp
	M			src/GPU/pair_mie_cut_gpu.cpp
	M			src/GPU/pair_morse_gpu.cpp
	M			src/GPU/pair_resquared_gpu.cpp
	M			src/GPU/pair_soft_gpu.cpp
	M			src/GPU/pair_sw_gpu.cpp
	M			src/GPU/pair_table_gpu.cpp
	M			src/GPU/pair_yukawa_colloid_gpu.cpp
	M			src/GPU/pair_yukawa_gpu.cpp
	M			src/GPU/pppm_gpu.cpp
	M			src/GRANULAR/pair_gran_hooke_history.cpp
	M			src/KIM/pair_kim.cpp
	M			src/KOKKOS/pair_table_kokkos.cpp
	M			src/KSPACE/ewald.cpp
	M			src/KSPACE/ewald_disp.cpp
	M			src/KSPACE/msm.cpp
	M			src/KSPACE/msm_cg.cpp
	M			src/KSPACE/pair_born_coul_long.cpp
	M			src/KSPACE/pair_buck_coul_long.cpp
	M			src/KSPACE/pair_buck_long_coul_long.cpp
	M			src/KSPACE/pair_coul_long.cpp
	M			src/KSPACE/pair_lj_charmm_coul_long.cpp
	M			src/KSPACE/pair_lj_cut_coul_long.cpp
	M			src/KSPACE/pair_lj_long_coul_long.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/pair_adp.cpp
	M			src/MANYBODY/pair_airebo.cpp
	M			src/MANYBODY/pair_bop.cpp
	M			src/MANYBODY/pair_comb.cpp
	M			src/MANYBODY/pair_comb3.cpp
	M			src/MANYBODY/pair_eam.cpp
	M			src/MANYBODY/pair_eim.cpp
	M			src/MANYBODY/pair_lcbop.cpp
	M			src/MANYBODY/pair_nb3b_harmonic.cpp
	M			src/MANYBODY/pair_sw.cpp
	M			src/MANYBODY/pair_tersoff.cpp
	M			src/MC/fix_atom_swap.cpp
	M			src/MC/fix_atom_swap.h
	M			src/MC/fix_bond_create.cpp
	M			src/MC/fix_bond_swap.cpp
	M			src/MEAM/pair_meam.cpp
	M			src/MISC/fix_orient_fcc.cpp
	M			src/MISC/pair_nm_cut_coul_cut.cpp
	M			src/MISC/pair_nm_cut_coul_long.cpp
	M			src/MOLECULE/pair_hbond_dreiding_lj.cpp
	M			src/MOLECULE/pair_hbond_dreiding_morse.cpp
	M			src/MOLECULE/pair_lj_charmm_coul_charmm.cpp
	M			src/MOLECULE/pair_lj_cut_tip4p_cut.cpp
	M			src/MOLECULE/pair_tip4p_cut.cpp
	M			src/PERI/fix_peri_neigh.cpp
	M			src/PERI/pair_peri_eps.cpp
	M			src/PERI/pair_peri_lps.cpp
	M			src/PERI/pair_peri_pmb.cpp
	M			src/PERI/pair_peri_ves.cpp
	M			src/QEQ/fix_qeq.cpp
	M			src/QEQ/fix_qeq_dynamic.cpp
	M			src/QEQ/fix_qeq_point.cpp
	M			src/QEQ/fix_qeq_shielded.cpp
	M			src/QEQ/fix_qeq_slater.cpp
	M			src/REAX/pair_reax.cpp
	M			src/SNAP/compute_sna_atom.cpp
	M			src/SNAP/compute_snad_atom.cpp
	M			src/SNAP/compute_snav_atom.cpp
	M			src/SNAP/pair_snap.cpp
	M			src/USER-ATC/fix_atc.cpp
	M			src/USER-AWPMD/pair_awpmd_cut.cpp
	M			src/USER-CG-CMM/pair_lj_sdk_coul_long.cpp
	M			src/USER-CUDA/pair_born_coul_long_cuda.cpp
	M			src/USER-CUDA/pair_buck_coul_cut_cuda.cpp
	M			src/USER-CUDA/pair_buck_coul_long_cuda.cpp
	M			src/USER-CUDA/pair_buck_cuda.cpp
	M			src/USER-CUDA/pair_eam_cuda.cpp
	M			src/USER-CUDA/pair_gran_hooke_cuda.cpp
	M			src/USER-CUDA/pair_lj96_cut_cuda.cpp
	M			src/USER-CUDA/pair_lj_charmm_coul_charmm_cuda.cpp
	M			src/USER-CUDA/pair_lj_charmm_coul_charmm_implicit_cuda.cpp
	M			src/USER-CUDA/pair_lj_charmm_coul_long_cuda.cpp
	M			src/USER-CUDA/pair_lj_class2_coul_cut_cuda.cpp
	M			src/USER-CUDA/pair_lj_class2_coul_long_cuda.cpp
	M			src/USER-CUDA/pair_lj_class2_cuda.cpp
	M			src/USER-CUDA/pair_lj_cut_coul_cut_cuda.cpp
	M			src/USER-CUDA/pair_lj_cut_coul_debye_cuda.cpp
	M			src/USER-CUDA/pair_lj_cut_coul_long_cuda.cpp
	M			src/USER-CUDA/pair_lj_cut_cuda.cpp
	M			src/USER-CUDA/pair_lj_cut_experimental_cuda.cpp
	M			src/USER-CUDA/pair_lj_expand_cuda.cpp
	M			src/USER-CUDA/pair_lj_gromacs_coul_gromacs_cuda.cpp
	M			src/USER-CUDA/pair_lj_gromacs_cuda.cpp
	M			src/USER-CUDA/pair_lj_sdk_coul_long_cuda.cpp
	M			src/USER-CUDA/pair_lj_sdk_cuda.cpp
	M			src/USER-CUDA/pair_lj_smooth_cuda.cpp
	M			src/USER-CUDA/pair_morse_cuda.cpp
	M			src/USER-CUDA/pair_sw_cuda.cpp
	M			src/USER-CUDA/pair_tersoff_cuda.cpp
	M			src/USER-CUDA/pppm_cuda.cpp
	M			src/USER-CUDA/pppm_old.cpp
	M			src/USER-EFF/pair_eff_cut.cpp
	M			src/USER-FEP/compute_fep.cpp
	M			src/USER-FEP/fix_adapt_fep.cpp
	M			src/USER-FEP/pair_coul_cut_soft.cpp
	M			src/USER-FEP/pair_coul_long_soft.cpp
	M			src/USER-FEP/pair_lj_charmm_coul_long_soft.cpp
	M			src/USER-FEP/pair_lj_cut_coul_cut_soft.cpp
	M			src/USER-FEP/pair_lj_cut_coul_long_soft.cpp
	M			src/USER-FEP/pair_lj_cut_soft.cpp
	M			src/USER-MISC/compute_ackland_atom.cpp
	M			src/USER-MISC/compute_basal_atom.cpp
	M			src/USER-MISC/pair_coul_diel.cpp
	M			src/USER-MISC/pair_edip.cpp
	M			src/USER-MISC/pair_lj_sf_dipole_sf.cpp
	M			src/USER-MISC/pair_meam_spline.cpp
	M			src/USER-MISC/pair_meam_sw_spline.cpp
	M			src/USER-MISC/pair_srp.cpp
	M			src/USER-MISC/pair_tersoff_table.cpp
	M			src/USER-OMP/ewald_omp.cpp
	M			src/USER-OMP/fix_peri_neigh_omp.cpp
	M			src/USER-OMP/fix_qeq_comb_omp.cpp
	M			src/USER-OMP/msm_cg_omp.cpp
	M			src/USER-REAXC/fix_qeq_reax.cpp
	M			src/USER-REAXC/pair_reax_c.cpp
	M			src/USER-SPH/pair_sph_rhosum.cpp
	M			src/compute.cpp
	M			src/compute.h
	M			src/compute_centro_atom.cpp
	M			src/compute_cluster_atom.cpp
	M			src/compute_cna_atom.cpp
	M			src/compute_contact_atom.cpp
	M			src/compute_coord_atom.cpp
	M			src/compute_group_group.cpp
	M			src/compute_pair_local.cpp
	M			src/compute_property_local.cpp
	M			src/compute_rdf.cpp
	M			src/delete_atoms.cpp
	M			src/fix.cpp
	M			src/fix.h
	M			src/fix_adapt.cpp
	M			src/kspace.cpp
	M			src/kspace.h
	M			src/neigh_list.cpp
	M			src/neigh_request.cpp
	M			src/neigh_request.h
	M			src/neighbor.cpp
	M			src/neighbor.h
	M			src/pair.cpp
	M			src/pair.h
	M			src/pair_born_coul_wolf.cpp
	M			src/pair_buck_coul_cut.cpp
	M			src/pair_coul_cut.cpp
	M			src/pair_coul_dsf.cpp
	M			src/pair_coul_wolf.cpp
	M			src/pair_dpd.cpp
	M			src/pair_hybrid.cpp
	M			src/pair_lj96_cut.cpp
	M			src/pair_lj_cut.cpp
	M			src/pair_lj_cut_coul_cut.cpp
	M			src/pair_lj_cut_coul_dsf.cpp
	M			src/pair_lj_gromacs_coul_gromacs.cpp
	M			src/pair_mie_cut.cpp
	M			src/pair_zbl.cpp
	M			src/version.h