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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 17 2014, 02:53.

Description

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

Resolved Conflicts:
src/RIGID/fix_rigid_small.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 17 2014, 02:53

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSfee9812c997f: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11246 f3b2605a-c512-4ea7…
rLAMMPSc9fb35679a58: make code compile with the inofficial changes in place from mike brown's repo

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSa6ca3cab542c: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 17 2014, 02:53

Merged Changes

Commit	Author	Details	Committed
fee9812c997f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11246 f3b2605a-c512-4ea7…	Jan 15 2014
96d7e80372ff	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11245 f3b2605a-c512-4ea7…	Jan 14 2014
a1ef01fc1ae2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11243 f3b2605a-c512-4ea7…	Jan 14 2014

Changes (101)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			src/DIPOLE/atom_vec_dipole.cpp
	M			src/DIPOLE/atom_vec_dipole.h
	M			src/GRANULAR/fix_pour.cpp
	M			src/GRANULAR/fix_pour.h
	M			src/MC/fix_gcmc.cpp
	M			src/MC/fix_gcmc.h
	M			src/MISC/compute_msd_nongauss.cpp
	M			src/MISC/fix_deposit.cpp
	M			src/MISC/fix_deposit.h
	M			src/MISC/fix_efield.cpp
	M			src/MOLECULE/atom_vec_angle.cpp
	M			src/MOLECULE/atom_vec_angle.h
	M			src/MOLECULE/atom_vec_bond.cpp
	M			src/MOLECULE/atom_vec_bond.h
	M			src/MOLECULE/atom_vec_full.cpp
	M			src/MOLECULE/atom_vec_full.h
	M			src/MOLECULE/atom_vec_molecular.cpp
	M			src/MOLECULE/atom_vec_molecular.h
	M			src/PERI/atom_vec_peri.cpp
	M			src/PERI/atom_vec_peri.h
	M			src/POEMS/fix_poems.cpp
	M			src/REPLICA/compute_event_displace.cpp
	M			src/REPLICA/fix_event.cpp
	M			src/REPLICA/tad.cpp
	M			src/RIGID/fix_rigid.cpp
	M			src/RIGID/fix_rigid.h
	M			src/RIGID/fix_rigid_nh.cpp
	M			src/RIGID/fix_rigid_small.cpp
	M			src/RIGID/fix_rigid_small.h
	M			src/USER-AWPMD/atom_vec_wavepacket.cpp
	M			src/USER-AWPMD/atom_vec_wavepacket.h
	M			src/USER-COLVARS/fix_colvars.cpp
	M			src/USER-EFF/atom_vec_electron.cpp
	M			src/USER-EFF/atom_vec_electron.h
	M			src/USER-LB/fix_lb_fluid.cpp
	M			src/USER-LB/fix_lb_rigid_pc_sphere.cpp
	M			src/USER-MISC/compute_temp_rotate.cpp
	M			src/USER-MISC/fix_addtorque.cpp
	M			src/USER-MISC/fix_imd.cpp
	M			src/USER-MISC/fix_ti_spring.cpp
	M			src/USER-MOLFILE/dump_molfile.cpp
	M			src/USER-OMP/domain_omp.cpp
	M			src/USER-OMP/fix_rigid_nh_omp.cpp
	M			src/USER-OMP/fix_rigid_omp.cpp
	M			src/USER-OMP/fix_rigid_small_omp.cpp
	M			src/USER-SPH/atom_vec_meso.cpp
	M			src/USER-SPH/atom_vec_meso.h
	M			src/XTC/dump_xtc.cpp
	M			src/atom.cpp
	M			src/atom.h
	M			src/atom_vec.h
	M			src/atom_vec_atomic.cpp
	M			src/atom_vec_atomic.h
	M			src/atom_vec_body.cpp
	M			src/atom_vec_body.h
	M			src/atom_vec_charge.cpp
	M			src/atom_vec_charge.h
	M			src/atom_vec_ellipsoid.cpp
	M			src/atom_vec_ellipsoid.h
	M			src/atom_vec_hybrid.cpp
	M			src/atom_vec_hybrid.h
	M			src/atom_vec_line.cpp
	M			src/atom_vec_line.h
	M			src/atom_vec_sphere.cpp
	M			src/atom_vec_sphere.h
	M			src/atom_vec_tri.cpp
	M			src/atom_vec_tri.h
	M			src/change_box.cpp
	M			src/compute_com_molecule.cpp
	M			src/compute_displace_atom.cpp
	M			src/compute_gyration.cpp
	M			src/compute_gyration_molecule.cpp
	M			src/compute_inertia_molecule.cpp
	M			src/compute_msd.cpp
	M			src/compute_msd_molecule.cpp
	M			src/compute_property_atom.cpp
	M			src/create_atoms.cpp
	M			src/displace_atoms.cpp
	M			src/domain.cpp
	M			src/domain.h
	M			src/dump_atom.cpp
	M			src/dump_custom.cpp
	M			src/dump_dcd.cpp
	M			src/fix_addforce.cpp
	M			src/fix_deform.cpp
	M			src/fix_momentum.cpp
	M			src/fix_move.cpp
	M			src/fix_nh.cpp
	M			src/fix_spring_rg.cpp
	M			src/fix_spring_self.cpp
	M			src/fix_store_state.cpp
	M			src/fix_tmd.cpp
	M			src/group.cpp
	M			src/lammps.cpp
	M			src/lmptype.h
	M			src/read_dump.cpp
	M			src/read_restart.cpp
	M			src/replicate.cpp
	M			src/set.cpp
	M			src/velocity.cpp
	M			src/write_restart.cpp