Commit Graph

278 Commits

Author SHA1 Message Date
1bc62d40b2 more mostly cosmetic issues found by clang 2013-07-24 23:24:18 +02:00
378860097d disable warning that gets triggered a lot for non-problems in LAMMPS 2013-07-18 14:06:01 +02:00
c64c45982d use correct define for memory alignment 2013-07-13 20:36:48 +02:00
0132a8f4b0 update warning settings to disable useless warnings 2013-07-13 12:10:09 +02:00
444749a7c3 include support for MKL 2013-07-12 09:28:18 +02:00
632b105572 stop using clock_gettime() since it seems to be horribly inconsistent 2013-07-08 20:06:09 +02:00
24033a2436 Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
2013-07-04 16:42:17 +02:00
f0b9e26bc7 enable hi-res timers 2013-07-04 00:05:41 +02:00
d469f8f067 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10214 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-07-02 20:52:19 +00:00
b0007d45b7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10199 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-29 21:27:42 +00:00
d22bb59fde add x-compile support for windows with MPICH2 installed 2013-06-25 12:04:22 +02:00
fc3042a101 enable exceptions and rtti so we can include atc and awpmd 2013-06-25 07:16:08 +02:00
0b60341150 more dynamic linkage for a cleaner nsis installer 2013-06-18 14:18:18 +02:00
c9710e0c20 Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	src/DIPOLE/pair_lj_cut_dipole_cut.cpp
	src/USER-MISC/pair_lj_sf_dipole_sf.cpp
	src/USER-MISC/pair_lj_sf_dipole_sf.h
2013-06-07 14:49:08 +02:00
8f2bc5c721 Just a few tweaks
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10044 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2013-06-06 18:08:40 +00:00
ae3a6aca60 configuration to compile serial 32-bit binary on 64-bit Linux machine 2013-06-02 12:35:06 +02:00
78f895807c include support for jpeg library 2013-05-29 10:02:45 +02:00
3e7db1abd1 go back to linking static libjpeg again 2013-05-25 09:36:34 +02:00
d7237b1ab7 link jpeg regularly on mingw??-cross 2013-05-24 16:27:13 +02:00
753531e2a1 suggest cross compilers to link more libraries statically 2013-05-22 14:00:23 +02:00
1b1962e505 include jpeg support for serial-opt config 2013-05-20 12:24:45 +02:00
91b79997d1 finalized concurrent multi-platform support for windows 32/64 and linux 2013-05-18 18:41:30 +02:00
1c7d97e02e support cross-compiling to 64-bit windows 2013-05-17 16:00:21 +02:00
46205c1607 support using arch specific object directories for libraries, so one can have multiple compiles also in lib 2013-05-17 15:33:20 +02:00
639c49115e more tweaks to make mingw32 cross compilation working 2013-05-17 14:24:33 +02:00
7b7a41ef61 adapt cross-compilation to 32-bit windows for fedora 18 2013-05-17 13:58:39 +02:00
ec9af69e46 Merge remote branch 'lammps-ro/master' into lammps-icms 2013-04-19 13:58:23 +02:00
effd06c945 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9778 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-04-18 15:09:07 +00:00
a15670bebd part 1 of the big makefile cleanup 2013-04-03 14:05:18 +02:00
1543cc0d46 Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
2013-04-03 13:31:40 +02:00
e4580f5896 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9734 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-04-02 18:32:30 +00:00
1822bd92e6 use -MM as DEPFLAG instead of -M 2013-03-26 10:27:09 +01:00
398b4273d2 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
2013-03-22 11:19:07 +01:00
b8a8af17de git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9696 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-03-21 14:38:40 +00:00
b30900e507 update intel compiler based makefiles for more recent versions 2013-02-15 11:00:37 +01:00
934fd0dddf fix makefile for new name of STUBS library 2013-02-14 20:40:21 +01:00
bf7d884802 used double precision FFT for MSM support 2013-01-14 06:18:19 -05:00
427161ef56 Merge branch 'master' into lammps-icms
Resolved Conflicts:
	src/MAKE/Makefile.openmpi
	src/min_linesearch.cpp
2013-01-09 07:09:35 -05:00
0c063777a9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9214 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-01-03 20:49:12 +00:00
af4e81ff64 Merge branch 'master' into lammps-icms 2012-11-27 10:47:29 -05:00
94c2edcdce git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9120 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-11-26 23:06:57 +00:00
bb6d24d6e6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8938 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-10-10 15:52:31 +00:00
7103e5903b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8934 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-10-10 15:17:28 +00:00
788b01cd71 Merge branch 'master' into lammps-icms 2012-08-18 17:17:35 -04:00
0df7e37169 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8674 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-08-16 14:20:20 +00:00
ffc41c52c5 Merge branch 'master' into lammps-icms
Resolved Conflicts:
	lib/meam/Makefile.gfortran
	lib/poems/Makefile.g++
	lib/reax/Makefile.gfortran
	python/lammps.py
	src/USER-CUDA/cuda.cpp
2012-08-15 08:38:04 -04:00
7f5e8cb896 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8656 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-08-14 20:13:20 +00:00
01830d476b Merge branch 'master' into lammps-icms
Resolved Conflicts:
	python/lammps.py
	src/MAKE/Makefile.mingw
	src/MAKE/Makefile.openmpi
	src/MAKE/Makefile.serial
	src/MAKE/Makefile.serial_debug
	src/USER-CUDA/verlet_cuda.cpp
2012-08-14 03:35:29 -04:00
6618a2a19d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8628 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-08-13 21:43:20 +00:00
6304a8c9bf git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8626 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-08-13 21:41:28 +00:00