Diffusion lammps 34c103e2c9c1

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 26 2013, 11:57.

Description

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

Resolved Conflicts:
doc/Manual.txt
src/Depend.sh

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 26 2013, 11:57

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS1ccf84c21ce3: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9926 f3b2605a-c512-4ea7…
rLAMMPSed880c680ec9: update list of files to be ignored

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS34c103e2c9c1: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 26 2013, 11:57

Merged Changes

Commit	Author	Details	Committed
1ccf84c21ce3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9926 f3b2605a-c512-4ea7…	May 25 2013
6aa294e22b54	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9925 f3b2605a-c512-4ea7…	May 25 2013
f2d23f681e97	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9923 f3b2605a-c512-4ea7…	May 25 2013
b6ff322129e4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9922 f3b2605a-c512-4ea7…	May 24 2013
43dd96f69857	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9920 f3b2605a-c512-4ea7…	May 24 2013
f829398403b1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9919 f3b2605a-c512-4ea7…	May 24 2013
3038917a0949	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9918 f3b2605a-c512-4ea7…	May 24 2013
0c81ff62d609	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9917 f3b2605a-c512-4ea7…	May 24 2013
bb6f5d5b75fd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9916 f3b2605a-c512-4ea7…	May 24 2013
859db8d77bb8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9915 f3b2605a-c512-4ea7…	May 24 2013
b7930c959c65	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9914 f3b2605a-c512-4ea7…	May 24 2013
db8eda02538f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9913 f3b2605a-c512-4ea7…	May 24 2013
3452583172f2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9912 f3b2605a-c512-4ea7…	May 24 2013
6f06973281df	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9911 f3b2605a-c512-4ea7…	May 24 2013
60d099f48b60	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9910 f3b2605a-c512-4ea7…	May 24 2013
8dad92c71471	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9909 f3b2605a-c512-4ea7…	May 24 2013
b4a109bfe892	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9908 f3b2605a-c512-4ea7…	May 24 2013
a508eafb697b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9907 f3b2605a-c512-4ea7…	May 24 2013

Changes (53)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/fix_pour.html
	M			doc/fix_pour.txt
	M			doc/lattice.html
	M			doc/lattice.txt
	M			doc/pair_lubricate.html
	M			doc/pair_lubricate.txt
	M			doc/pair_lubricateU.html
	M			doc/pair_lubricateU.txt
	M			doc/units.html
	M			doc/units.txt
	M			examples/COUPLE/fortran2/LAMMPS.F90
	M			examples/pour/in.pour.2d
	M			src/Depend.sh
	M			src/GPU/Package.sh
	M			src/GRANULAR/fix_pour.cpp
	M			src/GRANULAR/fix_pour.h
	M			src/GRANULAR/pair_gran_hooke_history.cpp
	M			src/MC/fix_bond_break.cpp
	M			src/MC/fix_bond_create.cpp
	M			src/Makefile
	M			src/OPT/Package.sh
	M			src/PERI/pair_peri_lps.cpp
	M			src/PERI/pair_peri_pmb.cpp
	M			src/SHOCK/fix_append_atoms.cpp
	M			src/SHOCK/fix_wall_piston.cpp
	M			src/SRD/fix_wall_srd.cpp
	M			src/USER-CUDA/pair_gran_hooke_cuda.cpp
	M			src/USER-MOLFILE/Package.sh
	M			src/change_box.cpp
	M			src/compute_temp_ramp.cpp
	M			src/create_atoms.cpp
	M			src/displace_atoms.cpp
	M			src/domain.cpp
	M			src/fix_ave_spatial.cpp
	M			src/fix_deform.cpp
	M			src/fix_deposit.cpp
	M			src/fix_dt_reset.cpp
	M			src/fix_indent.cpp
	M			src/fix_move.cpp
	M			src/fix_recenter.cpp
	M			src/fix_store_state.cpp
	M			src/fix_wall.cpp
	M			src/fix_wall_reflect.cpp
	M			src/integrate.cpp
	M			src/lattice.cpp
	M			src/region.cpp
	M			src/thermo.cpp
	M			src/velocity.cpp
	M			src/version.h