jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,207 Commits 9 Branches 198 Tags 1.1 GiB
Commit Graph

675 Commits

Author SHA1 Message Date
Axel Kohlmeyer b0c6641f1b
tweak compiler flags for Intel and GNU 2020-03-05 10:16:38 -05:00
Axel Kohlmeyer 1642bf5afc
always skip deprecated C++ MPI interface 2020-03-05 10:16:21 -05:00
Axel Kohlmeyer ec87a51a61
put C++11 compliance check into CMake 2020-03-04 14:52:38 -05:00
Axel Kohlmeyer a972850b39
require CMake version 3.10. remove tests for older versions. 2020-03-04 14:28:33 -05:00
Axel Kohlmeyer 5a8eaed13b
Update handling of USER-QMMM package in CMake scripts. minor cosmetic changes 2020-02-20 14:39:53 +01:00
jrgissing ec887b37da Merge branch 'master' of https://github.com/lammps/lammps into bond/react-new-examples-and-package 2020-02-17 21:34:20 -07:00
Axel Kohlmeyer 4cacc4701d
update plumed support to include version 2.6.0. Fix bug in API check 2020-02-13 16:03:58 +01:00
Axel Kohlmeyer 795f2fd894
properly support threaded FFTs with MKL and document it. remove commented out FFTW2 code 2020-01-27 11:00:57 -05:00
Axel Kohlmeyer f14b200b6a
correct KOKKOS FFT output for CMake summary one more time 2020-01-23 00:27:00 -05:00
Axel Kohlmeyer c126df4f79
update KOKKOS FFT status message in CMake summary 2020-01-22 17:08:58 -05:00
Axel Kohlmeyer 53554fdb84
add -DFFT_CUFFT for KOKKOS only when KISSFFT is not selected 2020-01-22 16:56:12 -05:00
Axel Kohlmeyer 9a27aa4e9e
Merge branch 'master' into fft 
# Conflicts:
#	src/MAKE/OPTIONS/Makefile.kokkos_cuda_mpi
 2020-01-22 15:21:08 -05:00
Christoph Junghans 392b32ef6f
cmake: fix warning about chain.x 2020-01-14 14:26:28 -07:00
Axel Kohlmeyer 15603e0ff7
add documentation for including cufft with KOKKOS+CUDA (for conventional build, CMake is automatic) 2020-01-12 21:46:02 -05:00
Axel Kohlmeyer 3784df23f0
use FFT_FFTW_THREADS consistently, add CUFFT to CMake, minor improvements 2020-01-12 21:32:07 -05:00
Axel Kohlmeyer 7cb36d1705
Merge branch 'master' into fft 2020-01-12 20:22:15 -05:00
jrgissing 683d6ce9b3 'install' USER-REACTION package 2020-01-09 21:11:30 -07:00
jotelha 46584d4520
Update cmake/Modules/FindPNetCDF.cmake 
Co-Authored-By: Christoph Junghans <christoph.junghans@gmail.com>
 2020-01-07 13:26:01 +01:00
jotelha 24ef36dd4d
Update cmake/Modules/FindPNetCDF.cmake 
Co-Authored-By: Christoph Junghans <christoph.junghans@gmail.com>
 2020-01-07 13:25:54 +01:00
jotelha 3f24144abd
Update cmake/Modules/FindPNetCDF.cmake 
Co-Authored-By: Christoph Junghans <christoph.junghans@gmail.com>
 2019-12-22 13:25:24 +01:00
jotelha 0c7d6a01e8
Update cmake/Modules/FindNetCDF.cmake 
Co-Authored-By: Christoph Junghans <christoph.junghans@gmail.com>
 2019-12-22 13:25:08 +01:00
jotelha 4e7bcee8e3
Update cmake/Modules/FindNetCDF.cmake 
Co-Authored-By: Christoph Junghans <christoph.junghans@gmail.com>
 2019-12-22 13:24:34 +01:00
Johannes Hörmann c8a53d560a Find parallel NetCDF with cmake for USER-NETCDF 
Conflicts:
	cmake/presets/forhlr2-gnu.cmake
 2019-12-20 17:59:05 +01:00
Stan Moore c169e88268 Update from master 2019-12-13 16:42:05 -07:00
Richard Berger 1f9f85e798 Mark LMP_NO_SSL_CHECK and LMP_DEBUG_CURL as advanced options 2019-12-12 14:17:32 -05:00
Yaser Afshar b0d0037f50 Certificate Verification 
if SSL report an error ("certificate verify failed") during the
handshake and thus refuses further communication with that server,
you can specify your own CA cert path by setting the environment
variable CURL_CA_BUNDLE to the path of your choice.
 2019-12-12 12:57:34 -06:00
Richard Berger 19b265f845 Update CMake-based doc build 2019-11-16 23:57:12 -05:00
Axel Kohlmeyer 22288e06b7
Merge branch 'master' into fix-compiler-warnings 2019-10-25 14:07:50 -04:00
Axel Kohlmeyer 6767fa5604
update supported plumed library to version 2.5.3 2019-10-20 16:27:32 -04:00
Axel Kohlmeyer f4fcd2a911
flag that MESSAGE package is not compatible with -DLAMMPS_BIGBIG 2019-10-19 09:50:07 -04:00
Axel Kohlmeyer 7358a3ce06
mirror changes to conventional build to forcibly enable c++11 for intel compilers 2019-10-18 18:34:39 -04:00
Axel Kohlmeyer 108b9a0a36
USER-MOLFILE cannot be configured with CMake 2.8.12, requiring 3.10. 2019-10-17 06:33:13 -04:00
Axel Kohlmeyer 9a4f208e4e
need to enable C compilation to detect BLAS/LAPACK on CMake 2.8.12 2019-10-17 06:32:35 -04:00
Axel Kohlmeyer 68adc56e93
Merge branch 'master' into fix-compiler-warnings 2019-10-17 06:03:59 -04:00
Axel Kohlmeyer e4c77f047f
document COLVARS_LEPTON flag to CMake configuration 2019-10-16 16:19:12 -04:00
Axel Kohlmeyer 437c0e59f2
Merge pull request #1724 from lammps/lepton-cxx11-handling 
Upgrade Lepton library, handle its C++11 requirement
 2019-10-16 21:11:00 +02:00
Giacomo Fiorin 2c9ae7ab4b Add -DCOLVARS_LEPTON, track user's choice via DISABLE_CXX11_REQUIREMENT 2019-10-16 08:35:37 -04:00
Axel Kohlmeyer 4aa47386ea
make handling of (temporary) C++11 check disabling define behave consistent across CMake versions 2019-10-15 18:42:59 -04:00
Axel Kohlmeyer 9a3824bfc1
add SNAP to "most" preset, since it seems to be used more frequently these days 2019-10-15 16:55:10 +02:00
Giacomo Fiorin b6a6638f49 Add CMake recipe for USER-COLVARS, test C++11 before including Lepton 2019-10-14 16:05:45 -04:00
Axel Kohlmeyer 28c9255f99
don't include USER-PLUMED in "most" preset 2019-10-14 08:02:59 -04:00
Axel Kohlmeyer 766b8c58d8
Merge branch 'master' into fft 2019-10-08 16:51:11 +02:00
Axel Kohlmeyer 178ca78dd9 add TODO comment for experimental and thus currently undocumented CMake option 2019-10-07 18:57:28 +02:00
Axel Kohlmeyer c37a64fd4f
Merge branch 'master' into fft 2019-09-25 15:56:49 -04:00
Christoph Junghans 3f0d1cb270 cmake: LMP_KOKKOS define is always needed 2019-09-24 13:15:48 -06:00
Christoph Junghans d7a8792916 cmake: allow to build against an external libkokkos 2019-09-19 14:26:07 -06:00
Axel Kohlmeyer 2ea11b3195
implement test for C++11 and document it 2019-09-18 15:50:26 -04:00
Axel Kohlmeyer d62ef0df82
add omitted cmake entries for recent KOKKOS package changes 2019-09-13 12:26:07 -04:00
Axel Kohlmeyer 11cb542211
add omitted cmake entries for recent KOKKOS package changes 2019-09-12 15:59:37 -04:00
Axel Kohlmeyer cd57708e85
Merge branch 'master' into fft 2019-09-12 15:51:02 -04:00
Axel Kohlmeyer 92c77a2b37
Merge pull request #1634 from junghans/kim-api-version 
cmake: add version check for kim-api
 2019-09-05 13:59:46 -04:00
Richard Berger 364ccf6361 Fix typo 2019-09-04 16:26:03 -04:00
Richard Berger 09937c9941 Add missing npair style for KOKKOS when using CMake 2019-08-22 18:36:36 -04:00
Ryan S. Elliott 5cee51204c Adjust warnings for default kim download behavior settings 2019-08-17 12:04:00 -05:00
Ryan S. Elliott 3a4e6c0dfd Revert "Update FindKIM-API.cmake" 
This reverts commit 2f531d0dab.
 2019-08-17 11:40:13 -05:00
Christoph Junghans 2f531d0dab
Update FindKIM-API.cmake 2019-08-16 12:05:20 -06:00
Christoph Junghans 379fa22147 FindKIM-API.cmake: address Ryan's comments 2019-08-16 10:30:09 -06:00
Ryan S. Elliott 42711245a2 bump kim-api to 2.1.3 2019-08-16 10:08:23 -06:00
Christoph Junghans cd77f71e99 cmake: add version check for kim-api 2019-08-15 12:56:15 -06:00
Christoph Junghans edbd525bcb cmake: install chain.x as well 2019-08-14 17:16:43 -06:00
Axel Kohlmeyer 3ef93d6e1b
cannot forced enable FFMpeg and gzip on windows yet. 2019-08-05 16:59:18 -04:00
Axel Kohlmeyer 16bf916dd0
Merge pull request #1616 from akohlmey/fixes-for-stable 
Collected small fixes for stable release
 2019-08-05 16:48:50 -04:00
Richard Berger f2757eaf41 Mention LAMMPS_LIB_SUFFIX in docs 2019-08-05 14:00:56 -04:00
Axel Kohlmeyer 096c225594
Merge pull request #1613 from rbberger/cmake_docs_update 
Update CMake documentation
 2019-08-04 18:32:11 -04:00
Axel Kohlmeyer 58d27403f1
CMake tweaks to improve building LAMMPS for windows with mingw on Linux 2019-08-04 18:28:26 -04:00
Axel Kohlmeyer 5b3423c60e
tweaks for Linux to Windows cross-compilation 2019-08-03 11:16:14 -04:00
Richard Berger eb7fa1b6cb Update CMake documentation 2019-08-02 17:04:59 -04:00
Axel Kohlmeyer 5c25355b9b
update comments 2019-08-02 12:18:10 -04:00
Axel Kohlmeyer 6a65deeb65
make support for threaded FFTW3 consistent and incorporate it into CMake 
This now also includes threaded FFTW3 for regular FFTs, not only KOKKOS.
 2019-08-02 12:14:32 -04:00
Axel Kohlmeyer 8b134cb0c9
refactor FFT handling in CMake module for KSPACE. 
This also improves the FFT info output in the PPPM styles

# Conflicts:
#	cmake/Modules/Packages/KSPACE.cmake
 2019-08-02 12:14:27 -04:00
Axel Kohlmeyer 5b4b418289
use check_language() instead of enable_language() to get fortran compiler name 2019-08-01 18:24:14 -04:00
Axel Kohlmeyer 8df7f51470
Merge branch 'master' into timeout-for-replica 2019-08-01 16:56:49 -04:00
Axel Kohlmeyer f9e34825f0
workaround for xcode oddity with compiling voro++ 2019-08-01 16:42:52 -04:00
Axel Kohlmeyer bc79412203
list(TRANSFORM ...) is not portable to older versions of cmake. work around it. 2019-07-30 22:54:02 -04:00
Axel Kohlmeyer 528ec75f88
special case for MacOSX not needed 2019-07-30 16:38:40 -04:00
Axel Kohlmeyer f5bf86b32d
more improvements to CMake build for USER-PLUMED on MacOSX 
default to shared linkage on MacOSX to avoid linker issues from
configure/cmake library detection differences

link/depend on GSL and LAPACK explicitly only for static linkage
 2019-07-30 16:27:00 -04:00
Axel Kohlmeyer 2d93a713e2
Merge branch 'master' into collected-small-changes 2019-07-30 14:14:11 -04:00
Stan Moore 9a43a6824c Fix issues 2019-07-30 09:25:24 -06:00
Axel Kohlmeyer 7ab7691c51
update PLUMED support to version 2.5.2 2019-07-30 05:57:57 -04:00
Ryan S. Elliott c9f3f99ee8 Update to kim-api-2.1.2 2019-07-29 21:48:12 -05:00
Axel Kohlmeyer 6833d6def6
Merge branch 'master' into kim-simulator-models 
# Resolved Conflicts:
#	src/KIM/kim_query.cpp
#	src/KIM/pair_kim.cpp
 2019-07-29 20:43:10 -04:00
Stan Moore 4874fcc32a
Merge branch 'master' into fft 2019-07-29 14:05:46 -06:00
Axel Kohlmeyer 96e0b03ede
.frc files only need to be installed if msi2lmp is built 2019-07-29 13:38:38 -04:00
Axel Kohlmeyer 5307558727
need to install some base C++ headers for C++ library use 2019-07-29 13:34:04 -04:00
Ryan S. Elliott 010cb0edf3 Add warning to cmake if PKG_KIM=ON but DOWNLOAD_KIM not set & KIM is not found 
This can be a scenario where the user has KIM installed but does not have the
environment setup correctly to be found.  The config. step should provide some
warning of this.  Otherwise, it is easy to miss the fact that KIM is being
downloaded and built.
 2019-07-26 11:10:54 -05:00
Axel Kohlmeyer 0bb9df76c2
correct shell profile variables to point to the installation directory 2019-07-26 09:58:18 -04:00
Axel Kohlmeyer e8d891c0dd
simplify installation of data folders and make it consistent 
fixes #1586
 2019-07-26 06:06:03 -04:00
Ryan S. Elliott ca291f1015 Update to kim-api-2.1.1 2019-07-25 11:47:56 -05:00
Axel Kohlmeyer 6ee38d4887
use ${CMAKE_SHARED_LIBRARY_SUFFIX) for better portability 2019-07-24 16:02:36 -04:00
Axel Kohlmeyer 24d9c537c0
only search for LAPACK when building in static mode and when it is not needed for something else 2019-07-24 16:01:46 -04:00
Ryan S. Elliott 03d26f6f6f Merge branch 'master' into kim-simulator-models 2019-07-21 13:59:48 -05:00
Axel Kohlmeyer bcf600d781
let CMake configuration default to Release with debug settings 
this way we can more easily get detailed stack traces from people compiling with CMake
 2019-07-17 15:47:28 -04:00
Axel Kohlmeyer 06275b03c0
refactor FFT handling in CMake module for KSPACE. 
This also improves the FFT info output in the PPPM styles
 2019-07-17 15:46:39 -04:00
Ryan S. Elliott 354f4d19fd Update to kim-api-2.1.0 release 2019-07-16 22:11:23 -05:00
Stan Moore 94cb1a8a6a Add CUFFT to KSPACE.cmake 2019-07-02 11:40:23 -06:00
Axel Kohlmeyer 41e8cf3d69
Merge branch 'master' into kim-simulator-models 
# Conflicts:
#	src/input.cpp
 2019-07-02 01:15:29 -04:00
Ellad Tadmor 483353a017 Merge remote-tracking branch 'lammps/master' into kim-simulator-models 2019-06-24 15:35:06 -05:00
Axel Kohlmeyer f8f8e441b9
add missing cmake package module 2019-06-19 07:06:54 -04:00
Axel Kohlmeyer 995b6b31a2
flag a couple more packages that contain sub-builds of downloaded code 2019-06-17 16:05:54 -04:00
Axel Kohlmeyer f4f4a7c850
adapt for Ninja build tool, which cannot handle sub-builds and fortran 
so builds of downloaded libraries are not supported right now
 2019-06-17 14:24:51 -04:00