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

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

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

Description

Details

Event Timeline

Merged Changes

Changes (128)Show All Changes

Very Large Commit

rLAMMPSd181769e8881

doc/fix_ave_spatial.html

doc/fix_ave_spatial.txt

doc/fix_box_relax.html

doc/fix_box_relax.txt

examples/dreiding/data.dreiding

examples/micelle/in.micelle

examples/neb/README

examples/neb/Si.sw

examples/neb/final.sivac

examples/neb/in.neb.sivac

examples/reax/AB/log.reaxc.ab.18Feb11.linux.1

examples/reax/AB/log.reaxc.ab.18Feb11.linux.4

examples/reax/AuO/log.reaxc.auo.18Feb11.linux.1

examples/reax/AuO/log.reaxc.auo.18Feb11.linux.4

examples/reax/CHO/log.reaxc.cho.18Feb11.linux.1

examples/reax/CHO/log.reaxc.cho.18Feb11.linux.4

examples/reax/FC/README

examples/reax/FC/data.FC

examples/reax/FC/dumpnpt.xyz

examples/reax/FC/in.FC

examples/reax/FC/log.FC

examples/reax/FC/log.cite

examples/reax/FC/log.lammps

examples/reax/FeOH3/log.reaxc.feoh.18Feb11.linux.1

examples/reax/FeOH3/log.reaxc.feoh.18Feb11.linux.4

examples/reax/RDX/log.reaxc.rdx.18Feb11.linux.1

examples/reax/RDX/log.reaxc.rdx.18Feb11.linux.4

examples/reax/VOH/log.reaxc.voh.18Feb11.linux.1

examples/reax/VOH/log.reaxc.voh.18Feb11.linux.4

examples/reax/ZnOH2/log.reaxc.znoh.18Feb11.linux.1

examples/reax/ZnOH2/log.reaxc.znoh.18Feb11.linux.4

examples/rigid/in.rigid.tnr

src/CLASS2/dihedral_class2.h

src/CLASS2/improper_class2.h

src/GPU/fix_gpu.cpp

src/GPU/fix_gpu.h

src/GPU/pair_sw_gpu.h

src/GRANULAR/fix_pour.cpp

src/GRANULAR/fix_pour.h

src/KSPACE/ewald.h

src/KSPACE/ewald_disp.h

src/KSPACE/fix_tune_kspace.h

src/KSPACE/msm.h

src/MAKE/Makefile.mingw32-cross

src/MAKE/Makefile.mingw32-cross-mpi

src/MAKE/Makefile.mingw64-cross

src/MAKE/Makefile.mingw64-cross-mpi

src/MANYBODY/fix_qeq_comb.h

src/MANYBODY/pair_comb3.h

src/MANYBODY/pair_lcbop.h

src/MANYBODY/pair_nb3b_harmonic.h

src/MANYBODY/pair_tersoff_mod.h

src/MC/fix_bond_break.h

src/MC/fix_bond_create.h

src/MC/fix_bond_swap.h

src/MC/fix_gcmc.h

src/MISC/fix_deposit.h

src/MISC/fix_efield.h

src/MISC/fix_gld.cpp

src/MISC/fix_gld.h

src/MISC/pair_nm_cut.h

src/MOLECULE/atom_vec_angle.h

src/MOLECULE/atom_vec_template.cpp

src/MOLECULE/atom_vec_template.h

src/MOLECULE/bond_fene.h

src/MOLECULE/bond_fene_expand.h

src/MOLECULE/bond_quartic.h

src/MOLECULE/dihedral_charmm.h

src/MOLECULE/dihedral_harmonic.h

src/MOLECULE/dihedral_helix.h

src/MOLECULE/dihedral_multi_harmonic.h

src/MOLECULE/dihedral_opls.h

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

Changes (128)
Show All Changes