tx258/lammps-gran-kokkos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixup FindKIM-API.cmake and clean up some v2 remnants

Browse Source
This commit is contained in:
Ryan S. Elliott
2019-04-06 14:20:21 -05:00
parent 67f8c83661
commit 6643a4ec92
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/Modules/FindKIM-API.cmake
View File

@ -41,9 +41,9 @@ include(FindPackageHandleStandardArgs)
pkg_check_modules(KIM-API REQUIRED libkim-api>=2.0)
pkg_get_variable(KIM-API-V2-CMAKE_C_COMPILER libkim-api CMAKE_C_COMPILER)
pkg_get_variable(KIM-API-V2-CMAKE_CXX_COMPILER libkim-api CMAKE_CXX_COMPILER)
pkg_get_variable(KIM-API-V2_CMAKE_Fortran_COMPILER libkim-api CMAKE_Fortran_COMPILER)
pkg_get_variable(KIM-API-CMAKE_C_COMPILER libkim-api CMAKE_C_COMPILER)
pkg_get_variable(KIM-API-CMAKE_CXX_COMPILER libkim-api CMAKE_CXX_COMPILER)
pkg_get_variable(KIM-API_CMAKE_Fortran_COMPILER libkim-api CMAKE_Fortran_COMPILER)
# handle the QUIETLY and REQUIRED arguments and set KIM-API_FOUND to TRUE
# if all listed variables are TRUE

2
src/KIM/kim_query.cpp
View File

@ -52,7 +52,7 @@
------------------------------------------------------------------------- */
/* ----------------------------------------------------------------------
Designed for use with the kim-api-v2-2.0.0 (and newer) package
Designed for use with the kim-api-2.0.2 (and newer) package
------------------------------------------------------------------------- */
#include <mpi.h>

2
src/KIM/kim_query.h
View File

@ -51,7 +51,7 @@
------------------------------------------------------------------------- */
/* ----------------------------------------------------------------------
Designed for use with the kim-api-v2-2.0.0 (and newer) package
Designed for use with the kim-api-2.0.2 (and newer) package
------------------------------------------------------------------------- */
#ifdef COMMAND_CLASS

4
src/KIM/pair_kim.cpp
View File

@ -50,7 +50,7 @@
------------------------------------------------------------------------- */
/* ----------------------------------------------------------------------
Designed for use with the kim-api-v2-2.0.0 (and newer) package
Designed for use with the kim-api-2.0.2 (and newer) package
------------------------------------------------------------------------- */
#include <cstring>
@ -313,7 +313,7 @@ void PairKIM::settings(int narg, char **arg)
(0 == strcmp("LAMMPSvirial", arg[0]))))
{
error->all(FLERR,"'KIMvirial' or 'LAMMPSvirial' not supported with "
"kim-api-v2.");
"kim-api.");
}
else
error->all(FLERR,"Illegal pair_style command");

6
src/KIM/pair_kim.h
View File

@ -50,7 +50,7 @@
------------------------------------------------------------------------- */
/* ----------------------------------------------------------------------
Designed for use with the kim-api-v2-2.0.0 (and newer) package
Designed for use with the kim-api-2.0.2 (and newer) package
------------------------------------------------------------------------- */
#ifdef PAIR_CLASS
@ -182,9 +182,9 @@ E: KIM Compute returned error
The KIM model was unable, for some reason, to complete the computation.
E: 'KIMvirial' or 'LAMMPSvirial' not supported with kim-api-v2.
E: 'KIMvirial' or 'LAMMPSvirial' not supported with kim-api.
"KIMvirial or "LAMMPSvirial" found on the pair_style line. These keys are not supported kim-api-v2. (The virial computation is always performed by LAMMPS.) Please remove these keys, make sure the KIM model you are using supports kim-api-v2, and rerun.
"KIMvirial or "LAMMPSvirial" found on the pair_style line. These keys are not supported kim-api. (The virial computation is always performed by LAMMPS.) Please remove these keys, make sure the KIM model you are using supports kim-api, and rerun.
E: Illegal pair_style command