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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 8 2014, 14:49.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/MISC/fix_efield.cpp
src/fix_addforce.cpp
src/fix_move.cpp
src/fix_setforce.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 8 2014, 14:49

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPScf0cd2e912ad: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11945 f3b2605a-c512-4ea7…
rLAMMPSfc62bdc5cb96: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS4acacd8e3b18: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 8 2014, 14:49

Merged Changes

Commit	Author	Details	Committed
cf0cd2e912ad	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11945 f3b2605a-c512-4ea7…	May 7 2014
4d9cdc874670	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11944 f3b2605a-c512-4ea7…	May 7 2014
8c0de891d7fd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11943 f3b2605a-c512-4ea7…	May 7 2014
919d293a147f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11941 f3b2605a-c512-4ea7…	May 7 2014
c3a29a758563	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11940 f3b2605a-c512-4ea7…	May 7 2014
320d269f42b5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11939 f3b2605a-c512-4ea7…	May 7 2014
59971d161674	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11938 f3b2605a-c512-4ea7…	May 7 2014
4c9bba90f109	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11937 f3b2605a-c512-4ea7…	May 7 2014
4ab16d538868	athomps	Added viscosity estimate from diagonal shear stress	May 7 2014
53db68362ec1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11935 f3b2605a-c512-4ea7…	May 7 2014

Changes (61)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			examples/VISCOSITY/in.gk.2d
	M			src/ASPHERE/compute_temp_asphere.cpp
	M			src/ASPHERE/compute_temp_asphere.h
	M			src/DIPOLE/atom_vec_dipole.cpp
	M			src/MISC/fix_efield.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_template.cpp
	M			src/PERI/atom_vec_peri.cpp
	M			src/USER-AWPMD/atom_vec_wavepacket.cpp
	M			src/USER-CUDA/atom_vec_angle_cuda.cpp
	M			src/USER-CUDA/atom_vec_atomic_cuda.cpp
	M			src/USER-CUDA/atom_vec_charge_cuda.cpp
	M			src/USER-CUDA/atom_vec_full_cuda.cpp
	M			src/USER-EFF/atom_vec_electron.cpp
	M			src/USER-EFF/compute_temp_eff.cpp
	M			src/USER-MISC/compute_temp_rotate.cpp
	M			src/USER-SPH/atom_vec_meso.cpp
	M			src/atom.cpp
	M			src/atom.h
	M			src/atom_vec.cpp
	M			src/atom_vec.h
	M			src/atom_vec_atomic.cpp
	M			src/atom_vec_body.cpp
	M			src/atom_vec_charge.cpp
	M			src/atom_vec_ellipsoid.cpp
	M			src/atom_vec_hybrid.cpp
	M			src/atom_vec_line.cpp
	M			src/atom_vec_sphere.cpp
	M			src/atom_vec_tri.cpp
	M			src/compute.cpp
	M			src/compute.h
	M			src/compute_temp.cpp
	M			src/compute_temp.h
	M			src/compute_temp_com.cpp
	M			src/compute_temp_com.h
	M			src/compute_temp_deform.cpp
	M			src/compute_temp_deform.h
	M			src/compute_temp_partial.cpp
	M			src/compute_temp_partial.h
	M			src/compute_temp_profile.cpp
	M			src/compute_temp_profile.h
	M			src/compute_temp_ramp.cpp
	M			src/compute_temp_ramp.h
	M			src/compute_temp_region.cpp
	M			src/compute_temp_sphere.cpp
	M			src/compute_temp_sphere.h
	M			src/create_box.cpp
	M			src/fix_adapt.cpp
	M			src/fix_addforce.cpp
	M			src/fix_move.cpp
	M			src/fix_setforce.cpp
	M			src/fix_store_state.cpp
	M			src/modify.cpp
	M			src/read_data.cpp
	M			src/read_restart.cpp
	M			src/version.h