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

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

Description

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

Resolved Conflicts:
doc/Manual.txt
doc/dump.txt
doc/kspace_modify.txt
src/STUBS/mpi.c
src/STUBS/mpi.h
src/USER-OMP/respa_omp.cpp
src/respa.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 23 2014, 18:11

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS1bc6cf22608c: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11302 f3b2605a-c512-4ea7…
rLAMMPS9abe0cc5e178: Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps…

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS979c5746a06c: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 23 2014, 18:11

Merged Changes

Commit	Author	Details	Committed
1bc6cf22608c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11302 f3b2605a-c512-4ea7…	Jan 22 2014
23c98595f542	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11301 f3b2605a-c512-4ea7…	Jan 22 2014
41c5be7a8ebb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11300 f3b2605a-c512-4ea7…	Jan 22 2014
b7eb7f3301ae	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11299 f3b2605a-c512-4ea7…	Jan 22 2014
286ff0a092f1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11298 f3b2605a-c512-4ea7…	Jan 22 2014
73d178691d39	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11296 f3b2605a-c512-4ea7…	Jan 22 2014
f0d395fb4db2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11295 f3b2605a-c512-4ea7…	Jan 22 2014
48f417e21918	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11294 f3b2605a-c512-4ea7…	Jan 22 2014
127eb167c116	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11293 f3b2605a-c512-4ea7…	Jan 22 2014
25613401a4b9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11291 f3b2605a-c512-4ea7…	Jan 22 2014
e19cfba3e073	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11290 f3b2605a-c512-4ea7…	Jan 22 2014
7932bcc79bd1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11289 f3b2605a-c512-4ea7…	Jan 22 2014
ad30cd374c1f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11287 f3b2605a-c512-4ea7…	Jan 22 2014
cd132122ef9d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11286 f3b2605a-c512-4ea7…	Jan 22 2014
ad0d830b9809	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11285 f3b2605a-c512-4ea7…	Jan 21 2014
4db641a9f03c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11284 f3b2605a-c512-4ea7…	Jan 21 2014
f709b5d63a57	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11283 f3b2605a-c512-4ea7…	Jan 21 2014
b26cc714c298	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11282 f3b2605a-c512-4ea7…	Jan 21 2014
9525facb198a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11280 f3b2605a-c512-4ea7…	Jan 21 2014
969e74a98e10	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11279 f3b2605a-c512-4ea7…	Jan 21 2014
3e00ba78234d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11278 f3b2605a-c512-4ea7…	Jan 21 2014
8481e06c751b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11277 f3b2605a-c512-4ea7…	Jan 21 2014
03b8ad7cdd31	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11276 f3b2605a-c512-4ea7…	Jan 21 2014
334b4124a1a1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11275 f3b2605a-c512-4ea7…	Jan 21 2014
59a15039c8dd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11273 f3b2605a-c512-4ea7…	Jan 21 2014
92f880530ace	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11272 f3b2605a-c512-4ea7…	Jan 21 2014
bad1b6e604b8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11271 f3b2605a-c512-4ea7…	Jan 21 2014

Changes (100)

		Path
M		doc/Manual.html
M		doc/Manual.txt
M		doc/dump.html
M		doc/dump.txt
M		doc/dump_modify.html
M		doc/dump_modify.txt
M		doc/kspace_modify.html
M		doc/kspace_modify.txt
M		doc/kspace_style.html
M		doc/kspace_style.txt
M		doc/molecule.html
M		doc/molecule.txt
M		doc/read_restart.html
M		doc/read_restart.txt
M		doc/restart.html
M		doc/restart.txt
M		doc/write_restart.html
M		doc/write_restart.txt
M		src/GRANULAR/fix_pour.cpp
M		src/GRANULAR/fix_pour.h
M		src/MC/fix_bond_swap.cpp
M		src/MC/fix_gcmc.cpp
M		src/MC/fix_gcmc.h
M		src/MISC/fix_deposit.cpp
M		src/MISC/fix_deposit.h
M		src/MISC/fix_evaporate.cpp
M		src/MOLECULE/atom_vec_angle.cpp
M		src/MOLECULE/atom_vec_bond.cpp
M		src/MOLECULE/atom_vec_full.cpp
M		src/MOLECULE/atom_vec_molecular.cpp
M		src/MOLECULE/atom_vec_molecular.h
A	(dir)	src/MPIIO/
A		src/MPIIO/Install.sh
A		src/MPIIO/restart_mpiio.cpp
P		src/MPIIO/restart_mpiio.h Copied from src/mpiio.h
M		src/Makefile
M		src/POEMS/fix_poems.cpp
M		src/RIGID/fix_rigid.cpp
M		src/RIGID/fix_rigid_small.cpp
M		src/RIGID/fix_rigid_small.h
M		src/RIGID/fix_shake.cpp
M		src/STUBS/mpi.c
M		src/STUBS/mpi.h
M		src/USER-LB/fix_lb_rigid_pc_sphere.cpp
M		src/USER-OMP/Install.sh
M		src/USER-OMP/neigh_full_omp.cpp
M		src/USER-OMP/neigh_gran_omp.cpp
M		src/USER-OMP/neigh_half_bin_omp.cpp
M		src/USER-OMP/neigh_half_multi_omp.cpp
M		src/USER-OMP/neigh_half_nsq_omp.cpp
M		src/USER-OMP/neigh_respa_omp.cpp
M		src/USER-PHONON/fix_phonon.cpp
M		src/USER-REAXC/fix_reaxc_bonds.cpp
M		src/accelerator_omp.h
M		src/atom.cpp
M		src/atom.h
M		src/atom_vec_line.cpp
M		src/atom_vec_tri.cpp
M		src/compute.cpp
M		src/compute.h
M		src/compute_atom_molecule.cpp
M		src/compute_atom_molecule.h
M		src/compute_com_molecule.cpp
M		src/compute_com_molecule.h
M		src/compute_gyration_molecule.cpp
M		src/compute_gyration_molecule.h
M		src/compute_inertia_molecule.cpp
M		src/compute_inertia_molecule.h
M		src/compute_msd_molecule.cpp
M		src/compute_msd_molecule.h
M		src/compute_property_molecule.cpp
M		src/compute_property_molecule.h
M		src/create_atoms.cpp
M		src/delete_atoms.cpp
M		src/dump_custom.cpp
M		src/fix_property_atom.cpp
M		src/fix_store_state.cpp
M		src/group.cpp
M		src/lammps.cpp
M		src/lmptype.h
M		src/molecule.cpp
M		src/molecule.h
P		src/mpiio.h Copied to src/MPIIO/restart_mpiio.h
M		src/neigh_full.cpp
M		src/neigh_gran.cpp
M		src/neigh_half_bin.cpp
M		src/neigh_half_multi.cpp
M		src/neigh_half_nsq.cpp
M		src/neigh_respa.cpp
M		src/neighbor.cpp
M		src/neighbor.h
M		src/read_restart.cpp
M		src/read_restart.h
M		src/replicate.cpp
M		src/respa.cpp
M		src/set.cpp
M		src/variable.cpp
M		src/version.h
M		src/write_restart.cpp
M		src/write_restart.h