Diffusion lammps e162a292b673

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 12 2014, 13:07.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
lib/cuda/Makefile.defaults

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 12 2014, 13:07

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS40da76395508: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12503 f3b2605a-c512-4ea7…
rLAMMPS92484500a16b: clean up cleanup.sh to handle a clean tree more cleanly

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSe162a292b673: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 12 2014, 13:07

Merged Changes

Commit	Author	Details	Committed
40da76395508	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12503 f3b2605a-c512-4ea7…	Sep 11 2014
1c68c2b3c0cd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12501 f3b2605a-c512-4ea7…	Sep 11 2014
1ddb9ab14852	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12500 f3b2605a-c512-4ea7…	Sep 11 2014
87863d5451c4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12499 f3b2605a-c512-4ea7…	Sep 11 2014
1aa7f33727e4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12498 f3b2605a-c512-4ea7…	Sep 11 2014
5910f5103170	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12497 f3b2605a-c512-4ea7…	Sep 11 2014
4a95b0047713	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12496 f3b2605a-c512-4ea7…	Sep 11 2014
df728d6a0950	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12495 f3b2605a-c512-4ea7…	Sep 11 2014
bbc60e3aefaa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12494 f3b2605a-c512-4ea7…	Sep 11 2014
35642380446d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12493 f3b2605a-c512-4ea7…	Sep 11 2014
978269a4cedc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12492 f3b2605a-c512-4ea7…	Sep 11 2014
010542ff0595	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12491 f3b2605a-c512-4ea7…	Sep 11 2014
5b648b760b78	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12490 f3b2605a-c512-4ea7…	Sep 11 2014
f4f1cfe220d3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12489 f3b2605a-c512-4ea7…	Sep 11 2014
356bcc1f010c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12488 f3b2605a-c512-4ea7…	Sep 11 2014
6c767f30b143	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12487 f3b2605a-c512-4ea7…	Sep 11 2014
4fea80fecffe	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12486 f3b2605a-c512-4ea7…	Sep 11 2014
705237ae9eea	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12485 f3b2605a-c512-4ea7…	Sep 11 2014
17a7fb2c98a2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12484 f3b2605a-c512-4ea7…	Sep 11 2014
fb2b228ac987	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12483 f3b2605a-c512-4ea7…	Sep 11 2014
05a63d764e22	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12482 f3b2605a-c512-4ea7…	Sep 11 2014
853f7be70012	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12481 f3b2605a-c512-4ea7…	Sep 11 2014

Changes (82)

		Path
M		bench/FERMI/README
V		bench/FERMI/{in.eam ← in.eam.cpu}
V		bench/FERMI/{in.eam.cpu → in.eam}
D		bench/FERMI/in.eam.cuda
D		bench/FERMI/in.eam.gpu
V		bench/FERMI/{in.lj ← in.lj.cpu}
V		bench/FERMI/{in.lj.cpu → in.lj}
D		bench/FERMI/in.lj.cuda
D		bench/FERMI/in.lj.gpu
V		bench/FERMI/{in.rhodo ← in.rhodo.cpu}
V		bench/FERMI/{in.rhodo.cpu → in.rhodo}
D		bench/FERMI/in.rhodo.cuda
D		bench/FERMI/in.rhodo.gpu
M		bench/KEPLER/Makefile.omp
M		bench/KEPLER/Makefile.opt
M		bench/KEPLER/README
M		bench/KEPLER/build.py
V		bench/KEPLER/{in.lj ← in.lj.cpu}
V		bench/KEPLER/{in.lj.cpu → in.lj}
D		bench/KEPLER/in.lj.cuda
D		bench/KEPLER/in.lj.gpu
D		bench/KEPLER/in.lj.intel.cpu
D		bench/KEPLER/in.lj.kokkos.cuda
D		bench/KEPLER/in.lj.kokkos.omp
D		bench/KEPLER/in.lj.omp
D		bench/KEPLER/in.lj.opt
M		bench/KEPLER/run_cpu.sh
A		bench/KEPLER/run_cuda.sh
M		bench/KEPLER/run_gpu.sh
M		bench/KEPLER/run_intel_cpu.sh
M		bench/KEPLER/run_kokkos_cuda.sh
M		bench/KEPLER/run_kokkos_omp.sh
A		bench/KEPLER/run_omp.sh
M		bench/KEPLER/run_opt.sh
A		bench/KEPLER/run_strong.sh
D		bench/KEPLER/run_user_cuda.sh
D		bench/KEPLER/run_user_omp.sh
A		bench/KEPLER/run_weak.sh
M		bench/README
M		doc/Manual.html
M		doc/Manual.txt
M		doc/Section_example.html
M		doc/Section_example.txt
M		doc/accelerate_cuda.html
M		doc/accelerate_cuda.txt
M		doc/accelerate_gpu.html
M		doc/accelerate_gpu.txt
M		doc/accelerate_intel.html
M		doc/accelerate_intel.txt
M		doc/accelerate_kokkos.html
M		doc/accelerate_kokkos.txt
M		doc/accelerate_omp.html
M		doc/accelerate_omp.txt
M		doc/accelerate_opt.html
M		doc/accelerate_opt.txt
M		doc/package.html
M		doc/package.txt
M		examples/README
D		examples/USER/cuda
V		examples/{USER → }/cuda/data.phosphate
V		examples/{USER → }/cuda/data.rhodo
V		examples/{USER/cuda/in.melt_2.5.cuda → cuda/in.cuda.melt.2.5}
V		examples/{USER/cuda/in.melt_5.0.cuda → cuda/in.cuda.melt.5.0}
V		examples/{USER/cuda/in.phosphate.cuda → cuda/in.cuda.phosphate}
V		examples/{USER/cuda/in.rhodo.cuda → cuda/in.cuda.rhodo}
A	(dir)	examples/cuda/
A		examples/cuda/README
V		examples/{ ← USER}/cuda/data.phosphate
V		examples/{ ← USER}/cuda/data.rhodo
V		examples/{cuda/in.cuda.melt.2.5 ← USER/cuda/in.melt_2.5.cuda}
V		examples/{cuda/in.cuda.melt.5.0 ← USER/cuda/in.melt_5.0.cuda}
V		examples/{cuda/in.cuda.phosphate ← USER/cuda/in.phosphate.cuda}
V		examples/{cuda/in.cuda.rhodo ← USER/cuda/in.rhodo.cuda}
M		examples/gpu/README
M		examples/gpu/in.gpu.melt.2.5
M		examples/gpu/in.gpu.melt.5.0
M		examples/gpu/in.gpu.phosphate
M		examples/gpu/in.gpu.rhodo
M		examples/intel/README
M		src/GPU/fix_gpu.cpp
M		src/KOKKOS/kokkos.cpp
M		src/version.h