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

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

Description

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

Resolved Conflicts:
src/MAKE/Makefile.mingw32-cross
src/MAKE/Makefile.mingw32-cross-mpi
src/MAKE/Makefile.mingw64-cross
src/MAKE/Makefile.mingw64-cross-mpi

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 30 2014, 13:54

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS889bae9bf8f0: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11386 f3b2605a-c512-4ea7…
rLAMMPS1ea04038e49a: cleanup

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSd181769e8881: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 30 2014, 13:54

Merged Changes

Commit	Author	Details	Committed
889bae9bf8f0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11386 f3b2605a-c512-4ea7…	Jan 30 2014
16131a324038	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11385 f3b2605a-c512-4ea7…	Jan 30 2014
c758cc119fae	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11384 f3b2605a-c512-4ea7…	Jan 30 2014
c42f8c43f5bb	athomps	Added Si vacancy hop example	Jan 29 2014
8c9aa159b4ef	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11382 f3b2605a-c512-4ea7…	Jan 29 2014
89a4708824ae	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11381 f3b2605a-c512-4ea7…	Jan 29 2014
9fe494cc6a62	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11380 f3b2605a-c512-4ea7…	Jan 29 2014
fffe7f95b761	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11379 f3b2605a-c512-4ea7…	Jan 29 2014
f2a83a10412a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11378 f3b2605a-c512-4ea7…	Jan 29 2014
814f2d46be63	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11376 f3b2605a-c512-4ea7…	Jan 29 2014
fd5e4d67b109	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11375 f3b2605a-c512-4ea7…	Jan 29 2014
31ae0b54564d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11374 f3b2605a-c512-4ea7…	Jan 29 2014
4845f423d970	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11373 f3b2605a-c512-4ea7…	Jan 29 2014
13335a703f92	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11372 f3b2605a-c512-4ea7…	Jan 29 2014

Changes (128)

				Path
	M			doc/fix_ave_spatial.html
	M			doc/fix_ave_spatial.txt
	M			doc/fix_box_relax.html
	M			doc/fix_box_relax.txt
	M			examples/dreiding/data.dreiding
	M			examples/micelle/in.micelle
	M			examples/neb/README
	A			examples/neb/Si.sw
	A			examples/neb/final.sivac
	A			examples/neb/in.neb.sivac
	D			examples/reax/AB/log.reaxc.ab.18Feb11.linux.1
	D			examples/reax/AB/log.reaxc.ab.18Feb11.linux.4
	D			examples/reax/AuO/log.reaxc.auo.18Feb11.linux.1
	D			examples/reax/AuO/log.reaxc.auo.18Feb11.linux.4
	D			examples/reax/CHO/log.reaxc.cho.18Feb11.linux.1
	D			examples/reax/CHO/log.reaxc.cho.18Feb11.linux.4
	M			examples/reax/FC/README
	M			examples/reax/FC/data.FC
	D			examples/reax/FC/dumpnpt.xyz
	M			examples/reax/FC/in.FC
	D			examples/reax/FC/log.FC
	D			examples/reax/FC/log.cite
	D			examples/reax/FC/log.lammps
	D			examples/reax/FeOH3/log.reaxc.feoh.18Feb11.linux.1
	D			examples/reax/FeOH3/log.reaxc.feoh.18Feb11.linux.4
	D			examples/reax/RDX/log.reaxc.rdx.18Feb11.linux.1
	D			examples/reax/RDX/log.reaxc.rdx.18Feb11.linux.4
	D			examples/reax/VOH/log.reaxc.voh.18Feb11.linux.1
	D			examples/reax/VOH/log.reaxc.voh.18Feb11.linux.4
	D			examples/reax/ZnOH2/log.reaxc.znoh.18Feb11.linux.1
	D			examples/reax/ZnOH2/log.reaxc.znoh.18Feb11.linux.4
	M			examples/rigid/in.rigid.tnr
	M			src/CLASS2/dihedral_class2.h
	M			src/CLASS2/improper_class2.h
	M			src/GPU/fix_gpu.cpp
	M			src/GPU/fix_gpu.h
	M			src/GPU/pair_sw_gpu.h
	M			src/GRANULAR/fix_pour.cpp
	M			src/GRANULAR/fix_pour.h
	M			src/KSPACE/ewald.h
	M			src/KSPACE/ewald_disp.h
	M			src/KSPACE/fix_tune_kspace.h
	M			src/KSPACE/msm.h
	M			src/MAKE/Makefile.mingw32-cross
	M			src/MAKE/Makefile.mingw32-cross-mpi
	M			src/MAKE/Makefile.mingw64-cross
	M			src/MAKE/Makefile.mingw64-cross-mpi
	M			src/MANYBODY/fix_qeq_comb.h
	M			src/MANYBODY/pair_comb3.h
	M			src/MANYBODY/pair_lcbop.h
	M			src/MANYBODY/pair_nb3b_harmonic.h
	M			src/MANYBODY/pair_tersoff_mod.h
	M			src/MC/fix_bond_break.h
	M			src/MC/fix_bond_create.h
	M			src/MC/fix_bond_swap.h
	M			src/MC/fix_gcmc.h
	M			src/MISC/fix_deposit.h
	M			src/MISC/fix_efield.h
	M			src/MISC/fix_gld.cpp
	M			src/MISC/fix_gld.h
	M			src/MISC/pair_nm_cut.h
	M			src/MOLECULE/atom_vec_angle.h
	M			src/MOLECULE/atom_vec_template.cpp
	M			src/MOLECULE/atom_vec_template.h
	M			src/MOLECULE/bond_fene.h
	M			src/MOLECULE/bond_fene_expand.h
	M			src/MOLECULE/bond_quartic.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/MPIIO/dump_atom_mpiio.cpp
	P			src/MPIIO/dump_atom_mpiio.h Copied to src/MPIIO/dump_xyz_mpiio.h
	M			src/MPIIO/dump_custom_mpiio.cpp
	M			src/MPIIO/dump_custom_mpiio.h
	M			src/MPIIO/dump_xyz_mpiio.cpp
	P			src/MPIIO/dump_xyz_mpiio.h Copied from src/MPIIO/dump_atom_mpiio.h
	M			src/POEMS/fix_poems.h
	M			src/REPLICA/neb.h
	M			src/RIGID/compute_erotate_rigid.cpp
	M			src/RIGID/compute_erotate_rigid.h
	M			src/RIGID/compute_ke_rigid.h
	M			src/RIGID/fix_rigid.h
	M			src/RIGID/fix_rigid_small.h
	M			src/RIGID/fix_shake.h
	M			src/SHOCK/fix_append_atoms.h
	M			src/SRD/fix_srd.h
	M			src/VORONOI/compute_voronoi_atom.cpp
	M			src/VORONOI/compute_voronoi_atom.h
	M			src/atom.h
	M			src/atom_vec_hybrid.h
	M			src/citeme.cpp
	M			src/citeme.h
	M			src/compute.h
	M			src/compute_property_atom.h
	M			src/compute_property_local.h
	M			src/compute_vacf.h
	M			src/create_atoms.h
	M			src/create_box.h
	M			src/domain.cpp
	M			src/domain.h
	M			src/dump.cpp
	M			src/dump.h
	M			src/dump_cfg.h
	M			src/dump_custom.cpp
	M			src/dump_custom.h
	M			src/dump_image.h
	M			src/dump_movie.h
	M			src/fix_ave_spatial.cpp
	M			src/fix_ave_spatial.h
	M			src/fix_nve_limit.h
	M			src/fix_property_atom.h
	M			src/fix_restrain.h
	M			src/fix_shear_history.h
	M			src/input.h
	M			src/kspace.cpp
	M			src/kspace.h
	M			src/lammps.h
	M			src/min_fire.cpp
	M			src/min_quickmin.cpp
	M			src/neigh_bond.h
	M			src/output.cpp
	M			src/output.h
	M			src/write_dump.h