Diffusion lammps 4469e4e4070f

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

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

Description

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

Resolved Conflicts:
lib/cuda/Makefile.defaults
lib/cuda/Makefile.lammps

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 5 2014, 13:19

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS451d5c04efab: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12403 f3b2605a-c512-4ea7…
rLAMMPSfcc58a2b65f3: another one-line fix for compiling USER-CUDA

Branches

Unknown

Tags

Unknown

Event Timeline

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

Merged Changes

Commit	Author	Details	Committed
451d5c04efab	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12403 f3b2605a-c512-4ea7…	Sep 4 2014
9b4e8563d1ea	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12402 f3b2605a-c512-4ea7…	Sep 4 2014
d143c88dffe3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12401 f3b2605a-c512-4ea7…	Sep 4 2014
3b20ca9f1a41	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12400 f3b2605a-c512-4ea7…	Sep 4 2014
af4909ab5130	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12399 f3b2605a-c512-4ea7…	Sep 4 2014
37ab2751d182	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12398 f3b2605a-c512-4ea7…	Sep 4 2014
e814b5dbcfb0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12397 f3b2605a-c512-4ea7…	Sep 4 2014
dfde50e9f7c5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12396 f3b2605a-c512-4ea7…	Sep 4 2014
0c0e5c356f44	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12394 f3b2605a-c512-4ea7…	Sep 4 2014
f3e11380a73c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12393 f3b2605a-c512-4ea7…	Sep 4 2014
34d05e299f46	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12391 f3b2605a-c512-4ea7…	Sep 4 2014
eca79d427e1a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12390 f3b2605a-c512-4ea7…	Sep 4 2014

Changes (66)

		Path
A	(dir)	bench/FERMI/
V		bench/{FERMI ← GPU}/README
V		bench/{FERMI ← GPU}/in.eam.cpu
V		bench/{FERMI ← GPU}/in.eam.cuda
P		bench/FERMI/in.eam.gpu Copied from bench/GPU/in.eam.gpu
V		bench/{FERMI/in.eam.titan ← GPU/in.eam.gpu}
P		bench/FERMI/in.lj.cpu Copied from bench/GPU/in.lj.cpu
V		bench/{FERMI ← GPU}/in.lj.cuda
P		bench/FERMI/in.lj.gpu Copied from bench/GPU/in.lj.gpu
A		bench/FERMI/in.lj.titan
V		bench/{FERMI ← GPU}/in.rhodo.cpu
V		bench/{FERMI ← GPU}/in.rhodo.cuda
P		bench/FERMI/in.rhodo.gpu Copied from bench/GPU/in.rhodo.gpu
P		bench/FERMI/in.rhodo.scaled.titan Copied from bench/GPU/in.rhodo.gpu
V		bench/{FERMI/in.rhodo.split.titan ← GPU/in.rhodo.gpu}
D		bench/GPU
V		bench/{GPU → FERMI}/README
V		bench/{GPU → FERMI}/in.eam.cpu
V		bench/{GPU → FERMI}/in.eam.cuda
P		bench/GPU/in.eam.gpu Deleted after being copied to multiple locations: bench/FERMI/in.eam.gpu bench/FERMI/in.eam.titan
P		bench/GPU/in.lj.cpu Deleted after being copied to multiple locations: bench/FERMI/in.lj.cpu bench/KEPLER/in.lj.cpu bench/KEPLER/in.lj.cuda bench/KEPLER/in.lj.intel.cpu bench/KEPLER/in.lj.kokkos.omp bench/KEPLER/in.lj.omp bench/KEPLER/in.lj.opt
V		bench/{GPU → FERMI}/in.lj.cuda
P		bench/GPU/in.lj.gpu Deleted after being copied to multiple locations: bench/FERMI/in.lj.gpu bench/KEPLER/in.lj.gpu bench/KEPLER/in.lj.kokkos.cuda
V		bench/{GPU → FERMI}/in.rhodo.cpu
V		bench/{GPU → FERMI}/in.rhodo.cuda
P		bench/GPU/in.rhodo.gpu Deleted after being copied to multiple locations: bench/FERMI/in.rhodo.gpu bench/FERMI/in.rhodo.scaled.titan bench/FERMI/in.rhodo.split.titan
A	(dir)	bench/KEPLER/
A		bench/KEPLER/Makefile.cpu
A		bench/KEPLER/Makefile.cuda
A		bench/KEPLER/Makefile.gpu
P		bench/KEPLER/Makefile.gpu.double Copied from lib/gpu/Makefile.linux.double
P		bench/KEPLER/Makefile.gpu.mixed Copied from lib/gpu/Makefile.linux.mixed
P		bench/KEPLER/Makefile.gpu.single Copied from lib/gpu/Makefile.linux.single
A		bench/KEPLER/Makefile.intel.cpu
A		bench/KEPLER/Makefile.kokkos.cuda
A		bench/KEPLER/Makefile.kokkos.omp
A		bench/KEPLER/Makefile.omp
A		bench/KEPLER/Makefile.opt
A		bench/KEPLER/README
A		bench/KEPLER/build.py
P		bench/KEPLER/in.lj.cpu Copied from bench/GPU/in.lj.cpu
P		bench/KEPLER/in.lj.cuda Copied from bench/GPU/in.lj.cpu
P		bench/KEPLER/in.lj.gpu Copied from bench/GPU/in.lj.gpu
P		bench/KEPLER/in.lj.intel.cpu Copied from bench/GPU/in.lj.cpu
V		bench/{KEPLER/in.lj.kokkos.cuda ← GPU/in.lj.gpu}
P		bench/KEPLER/in.lj.kokkos.omp Copied from bench/GPU/in.lj.cpu
P		bench/KEPLER/in.lj.omp Copied from bench/GPU/in.lj.cpu
V		bench/{KEPLER/in.lj.opt ← GPU/in.lj.cpu}
A		bench/KEPLER/run_cpu.sh
A		bench/KEPLER/run_gpu.sh
A		bench/KEPLER/run_intel_cpu.sh
A		bench/KEPLER/run_kokkos_cuda.sh
A		bench/KEPLER/run_kokkos_omp.sh
A		bench/KEPLER/run_opt.sh
A		bench/KEPLER/run_user_cuda.sh
A		bench/KEPLER/run_user_omp.sh
M		bench/README
M		doc/Section_accelerate.html
M		doc/Section_accelerate.txt
M		doc/Section_start.html
M		doc/Section_start.txt
M		lib/cuda/Makefile.defaults
M		lib/cuda/Makefile.lammps
P		lib/gpu/Makefile.linux.double Copied to bench/KEPLER/Makefile.gpu.double
P		lib/gpu/Makefile.linux.mixed Copied to bench/KEPLER/Makefile.gpu.mixed
P		lib/gpu/Makefile.linux.single Copied to bench/KEPLER/Makefile.gpu.single