Commit Graph

22 Commits

Author SHA1 Message Date
187e0b9ce4 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 2015-08-21 06:48:52 -04:00
3fcbe43295 Commented out line (temporarily) that causes a segmentation fault in the USER-AWPMD library
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13925 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2015-08-20 15:55:19 +00:00
1c3e0dbfe9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13904 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-08-19 14:56:21 +00:00
d35e3291a3 removed dead code and silence warnings about C++ standard violations 2015-06-17 15:56:14 -04:00
838ca5f5d3 update build scripts for steve's make system updates 2014-09-26 16:01:01 -04:00
190974a167 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
2014-09-25 11:23:12 -04:00
159d82e473 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12527 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2014-09-23 15:55:27 +00:00
bfbe995a9c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10165 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-28 19:30:58 +00:00
d45dd25ce6 add wrapper makefiles that allow to use non-MPI libraries and makefiles 2013-06-25 11:50:00 +02:00
2e5f2ba1e8 port AWPMD to cross compilation with mingw 2013-06-25 00:31:43 +02:00
0b32ec3147 remove comment within comment 2013-06-11 09:17:10 +02:00
ce2b853e4a Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Eqs/pair_gauss.jpg
	doc/Manual.txt
	doc/pair_list.html
	doc/pair_list.txt
	lib/atc/Makefile.lammps.linalg
	lib/awpmd/Makefile.lammps.linalg
	lib/gpu/Makefile.lincoln
	lib/linalg/Makefile.gfortran
	lib/linalg/Makefile.mingw_cross
	lib/linalg/README
	lib/reax/Makefile.lammps
	src/USER-CG-CMM/Install.sh
	src/USER-COLVARS/Install.sh
	src/USER-CUDA/Install.sh
	src/USER-MISC/Install.sh
	src/USER-MISC/pair_list.cpp
	src/USER-OMP/Install.sh
	src/USER-PHONON/Install.sh
2013-06-01 13:53:34 +02:00
52b3a24e2a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9992 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-31 15:37:58 +00:00
41d194f8be git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9966 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-30 19:20:05 +00:00
10d82d2d84 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9963 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-30 19:18:38 +00:00
d3ae4be6ef git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9960 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-05-30 17:54:44 +00:00
3929d2bd1d preconfigure ATC and AWPMD to use internal BLAS/LAPACK 2013-05-15 14:21:33 +02:00
533db03649 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8644 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-08-14 14:16:57 +00:00
740542f23b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7961 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-03-20 14:05:14 +00:00
d22491de17 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6729 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-08-18 17:32:34 +00:00
84b5b0bef8 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6727 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-08-18 17:32:05 +00:00
7025ec968f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6378 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-06-13 22:22:33 +00:00