Merge pull request #2094 from akohlmey/collected-small-changes (58ca1dcf) · Commits · 郑智淋 / lammps

cmake/CMakeLists.txt

+7 −2

Original line number	Diff line number	Diff line
		@@ -3,6 +3,11 @@
		# This file is part of LAMMPS
		# Created by Christoph Junghans and Richard Berger
		cmake_minimum_required(VERSION 3.10)
		# set policy to silence warnings about ignoring <PackageName>_ROOT but use it
		if(POLICY CMP0074)
		cmake_policy(SET CMP0074 NEW)
		endif()
		########################################

		project(lammps CXX)
		set(SOVERSION 0)
		@@ -60,11 +65,11 @@ if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
		endif()

		if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
		set(CMAKE_TUNE_DEFAULT "-ffast-math -march=native")
		set(CMAKE_TUNE_DEFAULT "-march=native")
		endif()

		if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
		set(CMAKE_TUNE_DEFAULT "-ffast-math -march=native")
		set(CMAKE_TUNE_DEFAULT "-march=native")
		endif()

		# we require C++11 without extensions

+0 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,6 @@
		# TBB_MALLOC_FOUND - True if tbb found.
		#


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

+0 −3

Original line number	Diff line number	Diff line
		enable_language(C)

		if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
		cmake_policy(SET CMP0074 NEW)
		endif()
		find_package(HDF5 REQUIRED)
		target_link_libraries(h5md PRIVATE ${HDF5_LIBRARIES})
		target_include_directories(h5md PUBLIC ${HDF5_INCLUDE_DIRS})

+2 −3

Original line number	Diff line number	Diff line
		# USER-NETCDF can use NetCDF, Parallel NetCDF (PNetCDF), or both. At least one necessary.
		# NetCDF library enables dump style "netcdf", while PNetCDF enables dump style "netcdf/mpiio"
		if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
		cmake_policy(SET CMP0074 NEW)
		endif()

		# may use NetCDF or PNetCDF with MPI, but must have NetCDF without
		if(NOT BUILD_MPI)
		find_package(NetCDF REQUIRED)
		else()

+1 −1

Original line number	Diff line number	Diff line
		@@ -224,7 +224,7 @@ double BondClass2::single(int type, double rsq, int /i/, int /j/, double &ff

		/* ---------------------------------------------------------------------- */

		void BondClass2::extract( char str, int &dim )
		void BondClass2::extract(const char str, int &dim)
		{
		dim = 1;
		if (strcmp(str,"r0")==0) return (void*) r0;