merge master into cslib branch, update docs (89a3670f) · Commits · 郑智淋 / lammps

.github/CODEOWNERS

+2 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ src/GPU/* @ndtrung81
		src/KOKKOS/* @stanmoore1
		src/KIM/* @ellio167
		src/LATTE/* @cnegre
		src/SPIN/* @julient31
		src/USER-CGDNA/* @ohenrich
		src/USER-CGSDK/* @akohlmey
		src/USER-COLVARS/* @giacomofiorin
		@@ -44,6 +45,7 @@ src/USER-MISC/_grem. @dstelter92

		# tools
		tools/msi2lmp/* @akohlmey
		tools/emacs/* @HaoZeke

		# cmake
		cmake/* @junghans @rbberger

README

+11 −4

Original line number	Diff line number	Diff line
		@@ -36,7 +36,14 @@ tools pre- and post-processing tools

		Point your browser at any of these files to get started:

		doc/Manual.html the LAMMPS manual
		doc/Section_intro.html hi-level introduction to LAMMPS
		doc/Section_start.html how to build and use LAMMPS
		doc/Developer.pdf LAMMPS developer guide
		http://lammps.sandia.gov/doc/Manual.html the LAMMPS manual
		http://lammps.sandia.gov/doc/Intro.html hi-level introduction
		http://lammps.sandia.gov/doc/Build.html how to build LAMMPS
		http://lammps.sandia.gov/doc/Run_head.html how to run LAMMPS
		http://lammps.sandia.gov/doc/Developer.pdf LAMMPS developer guide

		You can also create these doc pages locally:

		% cd doc
		% make html # creates HTML pages in doc/html
		% make pdf # creates Manual.pdf and Developer.pdf

cmake/CMakeLists.txt

+295 −84

File changed.

Preview size limit exceeded, changes collapsed.

cmake/Modules/FindQUIP.cmake

+2 −2

Original line number	Diff line number	Diff line
		# - Find quip
		# Find the native QUIP libraries.
		#
		# QUIP_LIBRARIES - List of libraries when using fftw3.
		# QUIP_FOUND - True if fftw3 found.
		# QUIP_LIBRARIES - List of libraries of the QUIP package
		# QUIP_FOUND - True if QUIP library was found.
		#

		find_library(QUIP_LIBRARY NAMES quip)

cmake/Modules/FindTBB.cmake

0 → 100644

+46 −0

Original line number	Diff line number	Diff line
		# - Find parts of TBB
		# Find the native TBB headers and libraries.
		#
		# TBB_INCLUDE_DIRS - where to find tbb.h, etc.
		# TBB_LIBRARIES - List of libraries when using tbb.
		# TBB_FOUND - True if tbb found.
		#

		########################################################
		# TBB

		# TODO use more generic FindTBB

		find_path(TBB_INCLUDE_DIR NAMES tbb/tbb.h PATHS $ENV{TBBROOT}/include)
		find_library(TBB_LIBRARY NAMES tbb PATHS $ENV{TBBROOT}/lib/intel64/gcc4.7
		$ENV{TBBROOT}/lib/intel64/gcc4.4
		$ENV{TBBROOT}/lib/intel64/gcc4.1)
		set(TBB_LIBRARIES ${TBB_LIBRARY})
		set(TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR})

		include(FindPackageHandleStandardArgs)
		# handle the QUIETLY and REQUIRED arguments and set TBB_FOUND to TRUE
		# if all listed variables are TRUE

		find_package_handle_standard_args(TBB DEFAULT_MSG TBB_LIBRARY TBB_INCLUDE_DIR)

		mark_as_advanced(TBB_INCLUDE_DIR TBB_LIBRARY )

		########################################################
		# TBB Malloc

		find_path(TBB_MALLOC_INCLUDE_DIR NAMES tbb/tbb.h PATHS $ENV{TBBROOT}/include)
		find_library(TBB_MALLOC_LIBRARY NAMES tbbmalloc PATHS $ENV{TBBROOT}/lib/intel64/gcc4.7
		$ENV{TBBROOT}/lib/intel64/gcc4.4
		$ENV{TBBROOT}/lib/intel64/gcc4.1)

		set(TBB_MALLOC_LIBRARIES ${TBB_MALLOC_LIBRARY})
		set(TBB_MALLOC_INCLUDE_DIRS ${TBB_MALLOC_INCLUDE_DIR})

		include(FindPackageHandleStandardArgs)
		# handle the QUIETLY and REQUIRED arguments and set TBB_MALLOC_FOUND to TRUE
		# if all listed variables are TRUE

		find_package_handle_standard_args(TBB_MALLOC DEFAULT_MSG TBB_MALLOC_LIBRARY TBB_MALLOC_INCLUDE_DIR)

		mark_as_advanced(TBB_MALLOC_INCLUDE_DIR TBB_MALLOC_LIBRARY )

Admin message