Merge pull request #1331 from akohlmey/collected-small-changes (34d42091) · Commits · 郑智淋 / lammps

cmake/CMakeLists.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -453,7 +453,7 @@ if(PKG_VORONOI)
		set(VORO_BUILD_OPTIONS CXX=${CMAKE_CXX_COMPILER} CFLAGS=${VORO_BUILD_CFLAGS})

		ExternalProject_Add(voro_build
		URL http://math.lbl.gov/voro++/download/dir/voro++-0.4.6.tar.gz
		URL https://download.lammps.org/thirdparty/voro++-0.4.6.tar.gz
		URL_MD5 2338b824c3b7b25590e18e8df5d68af9
		CONFIGURE_COMMAND "" BUILD_COMMAND make ${VORO_BUILD_OPTIONS} BUILD_IN_SOURCE 1 INSTALL_COMMAND ""
		)

+12 −0

Original line number	Diff line number	Diff line
		@@ -116,6 +116,18 @@ enables OpenMP. For GNU compilers it is -fopenmp. For (recent) Intel
		compilers it is -qopenmp. If you are using a different compiler,
		please refer to its documentation.

		[OpenMP Compiler compatibility info]: :link(default-none-issues)

		Some compilers do not fully support the 'default(none)' directive
		and others (e.g. GCC version 9 and beyond) may implement OpenMP 4.0
		semantics, which are incompatible with the OpenMP 3.1 directives used
		in LAMMPS (for maximal compatibility with compiler versions in use).
		In those case, all 'default(none)' directives (which aid in detecting
		incorrect and unwanted sharing) can be replaced with 'default(shared)'
		while dropping all 'shared()' directives. The script
		'src/USER-OMP/hack_openmp_for_pgi_gcc9.sh' can be used to automate
		this conversion.

		:line

		Choice of compiler and compile/link options :h4,link(compile)

+3 −1

Original line number	Diff line number	Diff line
		@@ -932,7 +932,9 @@ LINKFLAGS: -fopenmp # for GNU Compilers
		LINKFLAGS: -qopenmp # for Intel compilers on Linux :pre

		For other platforms and compilers, please consult the documentation
		about OpenMP support for your compiler.
		about OpenMP support for your compiler. Please see the note about
		how to address compatibility "issues with the 'default(none)'
		directive"_Build_basics.html#default-none-issues of some compilers.

		:line

+7 −6

Original line number	Diff line number	Diff line
		@@ -71,12 +71,13 @@ exterior surfaces of regions.
		Regions can either be primitive shapes (block, sphere, cylinder, etc)
		or combinations of primitive shapes specified via the {union} or
		{intersect} region styles. These latter styles can be used to
		construct particle containers with complex shapes. Regions can also
		move dynamically via the "region"_region.html command keywords (move)
		and {rotate}, or change their shape by use of variables as inputs to
		the "region"_region.html command. If such a region is used with this
		fix, then the region surface will move in time in the corresponding
		manner.
		construct particle containers with complex shapes.

		Regions can also move dynamically via the "region"_region.html command
		keywords (move) and {rotate}, or change their shape by use of variables
		as inputs to the "region"_region.html command. If such a region is used
		with this fix, then the region surface will move in time in the
		corresponding manner.

		NOTE: As discussed on the "region"_region.html command doc page,
		regions in LAMMPS do not get wrapped across periodic boundaries. It

+2 −0