Merge branch 'merge-stable' into lammps-icms
625b3d3bdeef
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 30 2014, 23:24.

Description

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

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 30 2014, 23:24

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS5136d597135f: anticipate 1 Feb 2014 patch from upstream
rLAMMPS78f68cec4499: correct logic when checking against data files

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS625b3d3bdeef: Merge branch 'merge-stable' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 30 2014, 23:24

Merged Changes

	Commit			Author	Details	Committed
	5136d597135f			Axel Kohlmeyer	anticipate 1 Feb 2014 patch from upstream	Jan 30 2014

Changes (107)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			src/CLASS2/dihedral_class2.h
	M			src/CLASS2/improper_class2.h
	M			src/DIPOLE/atom_vec_dipole.h
	M			src/DIPOLE/pair_lj_cut_dipole_long.h
	M			src/DIPOLE/pair_lj_long_dipole_long.h
	M			src/GPU/gpu_extra.h
	M			src/GPU/pair_lj_gromacs_gpu.h
	M			src/GPU/pair_sw_gpu.h
	M			src/KIM/pair_kim.cpp
	M			src/KIM/pair_kim.h
	M			src/KSPACE/msm.cpp
	M			src/KSPACE/pair_buck_long_coul_long.h
	M			src/KSPACE/pair_lj_long_coul_long.h
	M			src/KSPACE/pppm.h
	M			src/KSPACE/pppm_disp.cpp
	M			src/KSPACE/pppm_disp.h
	M			src/KSPACE/pppm_old.h
	M			src/MANYBODY/fix_qeq_comb.h
	M			src/MANYBODY/pair_airebo.h
	M			src/MANYBODY/pair_comb3.cpp
	M			src/MANYBODY/pair_comb3.h
	M			src/MANYBODY/pair_lcbop.h
	M			src/MANYBODY/pair_nb3b_harmonic.h
	M			src/MANYBODY/pair_tersoff.h
	M			src/MANYBODY/pair_tersoff_mod.h
	M			src/MANYBODY/pair_tersoff_zbl.h
	M			src/MISC/fix_deposit.cpp
	M			src/MISC/pair_nm_cut.h
	M			src/MOLECULE/atom_vec_bond.h
	M			src/MOLECULE/atom_vec_full.h
	M			src/MOLECULE/atom_vec_molecular.h
	M			src/MOLECULE/atom_vec_template.h
	M			src/MOLECULE/bond_fene.h
	M			src/MOLECULE/bond_fene_expand.h
	M			src/MOLECULE/dihedral_charmm.h
	M			src/MOLECULE/dihedral_harmonic.h
	M			src/MOLECULE/dihedral_helix.h
	M			src/MOLECULE/dihedral_multi_harmonic.h
	M			src/MOLECULE/dihedral_opls.h
	M			src/MOLECULE/improper_cvff.h
	M			src/MOLECULE/improper_harmonic.h
	M			src/MOLECULE/improper_umbrella.h
	M			src/MOLECULE/pair_lj_cut_tip4p_cut.h
	M			src/MOLECULE/pair_tip4p_cut.h
	M			src/MPIIO/restart_mpiio.cpp
	M			src/MPIIO/restart_mpiio.h
	M			src/PERI/atom_vec_peri.h
	M			src/PERI/fix_peri_neigh.cpp
	M			src/PERI/pair_peri_lps.h
	M			src/PERI/pair_peri_pmb.h
	M			src/REPLICA/tad.cpp
	M			src/REPLICA/tad.h
	M			src/REPLICA/verlet_split.h
	M			src/RIGID/fix_rigid_small.h
	M			src/RIGID/fix_shake.h
	M			src/SHOCK/fix_wall_piston.h
	M			src/SRD/fix_srd.h
	M			src/SRD/fix_wall_srd.h
	M			src/XTC/xdr_compat.h
	M			src/atom.cpp
	M			src/atom.h
	M			src/atom_map.cpp
	M			src/atom_vec_atomic.h
	M			src/atom_vec_body.h
	M			src/atom_vec_charge.h
	M			src/atom_vec_ellipsoid.h
	M			src/atom_vec_hybrid.h
	M			src/atom_vec_line.h
	M			src/atom_vec_sphere.h
	M			src/atom_vec_tri.h
	M			src/change_box.h
	M			src/compute_temp_ramp.h
	M			src/create_box.h
	M			src/displace_atoms.h
	M			src/dump.h
	M			src/dump_cfg.cpp
	M			src/dump_custom.h
	M			src/fix_deform.h
	P			src/fix_dt_reset.h Copied to src/write_dump.h
	M			src/fix_indent.h
	M			src/fix_move.h
	M			src/fix_recenter.h
	M			src/fix_restrain.h
	M			src/fix_shear_history.h
	M			src/fix_wall.h
	M			src/fix_wall_reflect.h
	M			src/force.h
	M			src/image.h
	M			src/molecule.h
	M			src/neigh_bond.h
	M			src/pair.h
	M			src/read_data.h
	M			src/read_dump.h
	M			src/read_restart.cpp
	M			src/read_restart.h
	M			src/region.h
	M			src/replicate.h
	M			src/respa.h
	M			src/set.h
	M			src/thermo.h
	M			src/variable.h
	M			src/velocity.h
	M			src/version.h
	M			src/write_data.h
	P			src/write_dump.h Copied from src/fix_dt_reset.h
	M			src/write_restart.cpp
	M			src/write_restart.h