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

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

Description

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

Resolved Conflicts:
src/MAKE/MORE/Makefile.debug
src/MAKE/MORE/Makefile.openmpi
src/MAKE/MORE/Makefile.serial
src/MAKE/MORE/Makefile.ubuntu_simple
src/MAKE/Makefile.g++
src/MAKE/Makefile.serial-opt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 27 2014, 12:34

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSde171dbcc9e5: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12568 f3b2605a-c512-4ea7…
rLAMMPS13d0a3225fa5: move old makefile back in place for RPM builds

Branches

Unknown

Tags

Unknown

Event Timeline

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

Merged Changes

Commit	Author	Details	Committed
de171dbcc9e5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12568 f3b2605a-c512-4ea7…	Sep 26 2014
7b64253516e5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12567 f3b2605a-c512-4ea7…	Sep 26 2014
b1c711b508ca	athomps	Updated to MacPorts Open MPI 1.4.3	Sep 26 2014
8ac96007c031	athomps	Updated to MacPorts Open MPI 1.4.3	Sep 26 2014
8fa22b4037ff	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12564 f3b2605a-c512-4ea7…	Sep 26 2014
e8b64a9080fd	stamoor	Fixed memory error in ewald_disp.cpp	Sep 26 2014
bf8b5e4d630a	stamoor	Fixing broken basal example	Sep 26 2014
62c95d86a8dc	stamoor	Fixing broken USER-EFF example	Sep 26 2014

Changes (56)

				Path
	M			examples/USER/eff/fixed-core/C2H6/in.C2H6fc.bohr
	M			examples/USER/misc/basal/in.basal
	M			src/KSPACE/ewald_disp.cpp
	M			src/MAKE/MACHINES/Makefile.mac_mpi
	D			src/MAKE/MORE/Makefile.altix
	D			src/MAKE/MORE/Makefile.auto
	D			src/MAKE/MORE/Makefile.beacon
	D			src/MAKE/MORE/Makefile.bgl
	D			src/MAKE/MORE/Makefile.bgq
	D			src/MAKE/MORE/Makefile.bgq.details
	D			src/MAKE/MORE/Makefile.chama
	D			src/MAKE/MORE/Makefile.cuda
	D			src/MAKE/MORE/Makefile.cygwin
	D			src/MAKE/MORE/Makefile.debug
	D			src/MAKE/MORE/Makefile.encanto
	D			src/MAKE/MORE/Makefile.fink
	D			src/MAKE/MORE/Makefile.g++3
	D			src/MAKE/MORE/Makefile.g++_openmpi
	D			src/MAKE/MORE/Makefile.glory
	D			src/MAKE/MORE/Makefile.intel
	D			src/MAKE/MORE/Makefile.intel_offload
	D			src/MAKE/MORE/Makefile.lam
	D			src/MAKE/MORE/Makefile.linux
	D			src/MAKE/MORE/Makefile.mac
	D			src/MAKE/MORE/Makefile.mac_mpi
	D			src/MAKE/MORE/Makefile.mingw32-cross
	D			src/MAKE/MORE/Makefile.mingw32-cross-mpi
	D			src/MAKE/MORE/Makefile.mingw64-cross
	D			src/MAKE/MORE/Makefile.mingw64-cross-mpi
	D			src/MAKE/MORE/Makefile.mkl
	D			src/MAKE/MORE/Makefile.odin
	D			src/MAKE/MORE/Makefile.openmpi
	D			src/MAKE/MORE/Makefile.pgi
	D			src/MAKE/MORE/Makefile.power5
	D			src/MAKE/MORE/Makefile.qed
	D			src/MAKE/MORE/Makefile.redsky
	D			src/MAKE/MORE/Makefile.sdsc
	D			src/MAKE/MORE/Makefile.seaborg
	D			src/MAKE/MORE/Makefile.serial
	D			src/MAKE/MORE/Makefile.sgi
	D			src/MAKE/MORE/Makefile.solaris
	D			src/MAKE/MORE/Makefile.spirit
	D			src/MAKE/MORE/Makefile.stampede
	D			src/MAKE/MORE/Makefile.storm
	D			src/MAKE/MORE/Makefile.tacc
	D			src/MAKE/MORE/Makefile.tbird
	D			src/MAKE/MORE/Makefile.tesla
	D			src/MAKE/MORE/Makefile.tunnison
	D			src/MAKE/MORE/Makefile.ubuntu
	D			src/MAKE/MORE/Makefile.ubuntu_simple
	D			src/MAKE/MORE/Makefile.xe6
	D			src/MAKE/MORE/Makefile.xt3
	D			src/MAKE/MORE/Makefile.xt5
	D			src/MAKE/Makefile.serial-opt
	M			src/Make.py
	M			src/fix_nh.cpp