Merge branch 'master' into kim_fix (5b427500) · Commits · 郑智淋 / lammps

cmake/CMakeLists.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -72,7 +72,7 @@ endif()
	# we require C++11 without extensions		# we require C++11 without extensions
	set(CMAKE_CXX_STANDARD 11)		set(CMAKE_CXX_STANDARD 11)
	set(CMAKE_CXX_STANDARD_REQUIRED ON)		set(CMAKE_CXX_STANDARD_REQUIRED ON)
	set(CMAKE_CXX_EXTENSIONS OFF)		set(CMAKE_CXX_EXTENSIONS OFF CACHE BOOL "Use compiler extensions")

	########################################################################		########################################################################
	# User input options #		# User input options #

cmake/Modules/GTest.cmake

+4 −4

doc/src/Commands_fix.rst

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -244,3 +244,4 @@ OPT.
	* :doc:`wall/region <fix_wall_region>`		* :doc:`wall/region <fix_wall_region>`
	* :doc:`wall/region/ees <fix_wall_ees>`		* :doc:`wall/region/ees <fix_wall_ees>`
	* :doc:`wall/srd <fix_wall_srd>`		* :doc:`wall/srd <fix_wall_srd>`
			* :doc:`widom <fix_widom>`

doc/src/fix.rst

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -387,6 +387,7 @@ accelerated styles exist.
	* :doc:`wall/region <fix_wall_region>` - use region surface as wall		* :doc:`wall/region <fix_wall_region>` - use region surface as wall
	* :doc:`wall/region/ees <fix_wall_ees>` - use region surface as wall for ellipsoidal particles		* :doc:`wall/region/ees <fix_wall_ees>` - use region surface as wall for ellipsoidal particles
	* :doc:`wall/srd <fix_wall_srd>` - slip/no-slip wall for SRD particles		* :doc:`wall/srd <fix_wall_srd>` - slip/no-slip wall for SRD particles
			* :doc:`widom <fix_widom>` - Widom insertions of atoms or molecules

	Restrictions		Restrictions
	""""""""""""		""""""""""""

doc/src/fix_gcmc.rst

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -68,7 +68,7 @@ Description
	This fix performs grand canonical Monte Carlo (GCMC) exchanges of		This fix performs grand canonical Monte Carlo (GCMC) exchanges of
	atoms or molecules with an imaginary ideal gas		atoms or molecules with an imaginary ideal gas
	reservoir at the specified T and chemical potential (mu) as discussed		reservoir at the specified T and chemical potential (mu) as discussed
	in :ref:`(Frenkel) <Frenkel>`. It also		in :ref:`(Frenkel) <Frenkel2>`. It also
	attempts Monte Carlo (MC) moves (translations and molecule		attempts Monte Carlo (MC) moves (translations and molecule
	rotations) within the simulation cell or		rotations) within the simulation cell or
	region. If used with the :doc:`fix nvt <fix_nh>`		region. If used with the :doc:`fix nvt <fix_nh>`
	@@ -481,7 +481,7 @@ listed above.

	----------		----------

	.. _Frenkel:		.. _Frenkel2:

	(Frenkel) Frenkel and Smit, Understanding Molecular Simulation,		(Frenkel) Frenkel and Smit, Understanding Molecular Simulation,
	Academic Press, London, 2002.		Academic Press, London, 2002.

Original line number	Original line	Diff line number	Diff line
	@@ -52,26 +52,26 @@ add_library(GTest::GTest UNKNOWN IMPORTED)
	set_target_properties(GTest::GTest PROPERTIES		set_target_properties(GTest::GTest PROPERTIES
	IMPORTED_LOCATION ${GTEST_LIBRARY_PATH}		IMPORTED_LOCATION ${GTEST_LIBRARY_PATH}
	INTERFACE_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIR}		INTERFACE_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIR}
	IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})		INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
	add_dependencies(GTest::GTest googletest)		add_dependencies(GTest::GTest googletest)

	add_library(GTest::GMock UNKNOWN IMPORTED)		add_library(GTest::GMock UNKNOWN IMPORTED)
	set_target_properties(GTest::GMock PROPERTIES		set_target_properties(GTest::GMock PROPERTIES
	IMPORTED_LOCATION ${GMOCK_LIBRARY_PATH}		IMPORTED_LOCATION ${GMOCK_LIBRARY_PATH}
	INTERFACE_INCLUDE_DIRECTORIES ${GMOCK_INCLUDE_DIR}		INTERFACE_INCLUDE_DIRECTORIES ${GMOCK_INCLUDE_DIR}
	IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})		INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
	add_dependencies(GTest::GMock googletest)		add_dependencies(GTest::GMock googletest)

	add_library(GTest::GTestMain UNKNOWN IMPORTED)		add_library(GTest::GTestMain UNKNOWN IMPORTED)
	set_target_properties(GTest::GTestMain PROPERTIES		set_target_properties(GTest::GTestMain PROPERTIES
	IMPORTED_LOCATION ${GTEST_MAIN_LIBRARY_PATH}		IMPORTED_LOCATION ${GTEST_MAIN_LIBRARY_PATH}
	INTERFACE_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIR}		INTERFACE_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIR}
	IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})		INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
	add_dependencies(GTest::GTestMain googletest)		add_dependencies(GTest::GTestMain googletest)

	add_library(GTest::GMockMain UNKNOWN IMPORTED)		add_library(GTest::GMockMain UNKNOWN IMPORTED)
	set_target_properties(GTest::GMockMain PROPERTIES		set_target_properties(GTest::GMockMain PROPERTIES
	IMPORTED_LOCATION ${GMOCK_MAIN_LIBRARY_PATH}		IMPORTED_LOCATION ${GMOCK_MAIN_LIBRARY_PATH}
	INTERFACE_INCLUDE_DIRECTORIES ${GMOCK_INCLUDE_DIR}		INTERFACE_INCLUDE_DIRECTORIES ${GMOCK_INCLUDE_DIR}
	IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})		INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
	add_dependencies(GTest::GMockMain googletest)		add_dependencies(GTest::GMockMain googletest)

Admin message