Diffusion lammps 190974a167ba

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 25 2014, 17:23.

Description

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

Resolved Conflicts:
src/MAKE/MORE/Makefile.jaguar
src/MAKE/Makefile.jaguar
src/MAKE/Makefile.serial-clang

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 25 2014, 17:23

Pushed

junge

Oct 6 2016, 16:49

Parents

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

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS190974a167ba: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 25 2014, 17:23

Merged Changes

Commit	Author	Details	Committed
f64853170bb6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12537 f3b2605a-c512-4ea7…	Sep 25 2014
9482ac8cfe75	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12536 f3b2605a-c512-4ea7…	Sep 25 2014
53467a25ef19	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12535 f3b2605a-c512-4ea7…	Sep 24 2014
f62127f3739d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12534 f3b2605a-c512-4ea7…	Sep 24 2014
e1d881b11c54	athomps	Update minimization documentation to reflect line quadratic default	Sep 24 2014
fb705efa84eb	athomps	Change fix box/relax example to be more efficient	Sep 24 2014
463db5858357	athomps	Made line quadratic default and changed backtrack alpha zero check to be more…	Sep 24 2014
edd0d2dea75a	athomps	Update minimization documentation to reflect line quadratic default	Sep 24 2014
f45b388d1246	stamoor	Fixing a bug in the kspace error estimator for triclinic systems	Sep 24 2014
5d12a8fdab22	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12528 f3b2605a-c512-4ea7…	Sep 23 2014
159d82e4730a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12527 f3b2605a-c512-4ea7…	Sep 23 2014
80c69a6b5654	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12526 f3b2605a-c512-4ea7…	Sep 23 2014
c560bd50cb16	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12525 f3b2605a-c512-4ea7…	Sep 23 2014
5ae8de8f47aa	stamoor	Fixing broken USER-INTEL examples	Sep 22 2014

Changes (120)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		doc/fix_box_relax.html
M		doc/fix_box_relax.txt
M		doc/min_modify.html
M		doc/min_modify.txt
M		examples/intel/in.intel.lc
M		examples/intel/in.intel.rhodo
M		examples/min/in.min.box
V		lib/awpmd/{Makefile.mpicc ← Makefile.openmpi}
V		lib/awpmd/{Makefile.openmpi → Makefile.mpicc}
A	(dir)	src/MAKE/MORE/
V		src/MAKE/{MORE ← }/Makefile.altix
P		src/MAKE/MORE/Makefile.auto Copied from src/MAKE/Makefile.linux
V		src/MAKE/{MORE ← }/Makefile.beacon
V		src/MAKE/{MORE ← }/Makefile.bgl
V		src/MAKE/{MORE ← }/Makefile.bgq
V		src/MAKE/{MORE ← }/Makefile.bgq.details
V		src/MAKE/{MORE ← }/Makefile.chama
V		src/MAKE/{MORE ← }/Makefile.cuda
V		src/MAKE/{MORE ← }/Makefile.cygwin
V		src/MAKE/{MORE ← }/Makefile.debug
V		src/MAKE/{MORE ← }/Makefile.encanto
V		src/MAKE/{MORE ← }/Makefile.fink
V		src/MAKE/{MORE ← }/Makefile.g++
V		src/MAKE/{MORE ← }/Makefile.g++3
V		src/MAKE/{MORE ← }/Makefile.g++_openmpi
V		src/MAKE/{MORE ← }/Makefile.glory
V		src/MAKE/{MORE ← }/Makefile.intel
V		src/MAKE/{MORE ← }/Makefile.intel_offload
V		src/MAKE/{MORE ← }/Makefile.lam
V		src/MAKE/{MORE ← }/Makefile.linux
V		src/MAKE/{MORE ← }/Makefile.mac
V		src/MAKE/{MORE ← }/Makefile.mac_mpi
V		src/MAKE/{MORE ← }/Makefile.mingw32-cross
V		src/MAKE/{MORE ← }/Makefile.mingw32-cross-mpi
V		src/MAKE/{MORE ← }/Makefile.mingw64-cross
V		src/MAKE/{MORE ← }/Makefile.mingw64-cross-mpi
V		src/MAKE/{MORE ← }/Makefile.mkl
V		src/MAKE/{MORE ← }/Makefile.odin
V		src/MAKE/{MORE ← }/Makefile.openmpi
P		src/MAKE/MORE/Makefile.openmpi-kissfft Copied from src/MAKE/Makefile.openmpi-omp
V		src/MAKE/{MORE ← }/Makefile.pgi
V		src/MAKE/{MORE ← }/Makefile.power5
V		src/MAKE/{MORE ← }/Makefile.qed
V		src/MAKE/{MORE ← }/Makefile.redsky
V		src/MAKE/{MORE ← }/Makefile.sdsc
V		src/MAKE/{MORE ← }/Makefile.seaborg
V		src/MAKE/{MORE ← }/Makefile.serial
V		src/MAKE/{MORE ← }/Makefile.sgi
V		src/MAKE/{MORE ← }/Makefile.solaris
V		src/MAKE/{MORE ← }/Makefile.spirit
V		src/MAKE/{MORE ← }/Makefile.stampede
V		src/MAKE/{MORE ← }/Makefile.storm
V		src/MAKE/{MORE ← }/Makefile.tacc
V		src/MAKE/{MORE ← }/Makefile.tbird
V		src/MAKE/{MORE ← }/Makefile.tesla
V		src/MAKE/{MORE ← }/Makefile.tunnison
V		src/MAKE/{MORE ← }/Makefile.ubuntu
V		src/MAKE/{MORE ← }/Makefile.ubuntu_simple
V		src/MAKE/{MORE ← }/Makefile.xe6
V		src/MAKE/{MORE ← }/Makefile.xt3
V		src/MAKE/{MORE ← }/Makefile.xt5
V		src/MAKE/{ → MORE}/Makefile.altix
V		src/MAKE/{ → MORE}/Makefile.beacon
V		src/MAKE/{ → MORE}/Makefile.bgl
V		src/MAKE/{ → MORE}/Makefile.bgq
V		src/MAKE/{ → MORE}/Makefile.bgq.details
V		src/MAKE/{ → MORE}/Makefile.chama
V		src/MAKE/{ → MORE}/Makefile.cuda
V		src/MAKE/{ → MORE}/Makefile.cygwin
V		src/MAKE/{ → MORE}/Makefile.debug
V		src/MAKE/{ → MORE}/Makefile.encanto
V		src/MAKE/{ → MORE}/Makefile.fink
V		src/MAKE/{ → MORE}/Makefile.g++
V		src/MAKE/{ → MORE}/Makefile.g++3
V		src/MAKE/{ → MORE}/Makefile.g++_openmpi
V		src/MAKE/{ → MORE}/Makefile.glory
V		src/MAKE/{ → MORE}/Makefile.intel
V		src/MAKE/{ → MORE}/Makefile.intel_offload
V		src/MAKE/{ → MORE}/Makefile.lam
P		src/MAKE/Makefile.linux Deleted after being copied to multiple locations: src/MAKE/MORE/Makefile.auto src/MAKE/MORE/Makefile.linux
V		src/MAKE/{ → MORE}/Makefile.mac
V		src/MAKE/{ → MORE}/Makefile.mac_mpi
V		src/MAKE/{ → MORE}/Makefile.mingw32-cross
V		src/MAKE/{ → MORE}/Makefile.mingw32-cross-mpi
V		src/MAKE/{ → MORE}/Makefile.mingw64-cross
V		src/MAKE/{ → MORE}/Makefile.mingw64-cross-mpi
V		src/MAKE/{ → MORE}/Makefile.mkl
V		src/MAKE/{ → MORE}/Makefile.odin
V		src/MAKE/{ → MORE}/Makefile.openmpi
D		src/MAKE/Makefile.openmpi-kissfft
V		src/MAKE/{ → MORE}/Makefile.pgi
V		src/MAKE/{ → MORE}/Makefile.power5
V		src/MAKE/{ → MORE}/Makefile.qed
V		src/MAKE/{ → MORE}/Makefile.redsky
V		src/MAKE/{ → MORE}/Makefile.sdsc
V		src/MAKE/{ → MORE}/Makefile.seaborg
V		src/MAKE/{ → MORE}/Makefile.serial
D		src/MAKE/Makefile.serial-clang
V		src/MAKE/{ → MORE}/Makefile.sgi
V		src/MAKE/{ → MORE}/Makefile.solaris
V		src/MAKE/{ → MORE}/Makefile.spirit
V		src/MAKE/{ → MORE}/Makefile.stampede
V		src/MAKE/{ → MORE}/Makefile.storm
V		src/MAKE/{ → MORE}/Makefile.tacc
V		src/MAKE/{ → MORE}/Makefile.tbird
V		src/MAKE/{ → MORE}/Makefile.tesla
V		src/MAKE/{ → MORE}/Makefile.tunnison
V		src/MAKE/{ → MORE}/Makefile.ubuntu
V		src/MAKE/{ → MORE}/Makefile.ubuntu_simple
V		src/MAKE/{ → MORE}/Makefile.xe6
V		src/MAKE/{ → MORE}/Makefile.xt3
V		src/MAKE/{ → MORE}/Makefile.xt5
D		src/Make.py
M		src/Makefile
M		src/USER-INTEL/fix_intel.cpp
M		src/compute_pair_local.cpp
M		src/kspace.cpp
M		src/min.cpp
M		src/min_linesearch.cpp
M		src/neigh_half_nsq.cpp