Update upstream source from tag 'upstream/1.6.1'
Update to upstream version '1.6.1'
with Debian dir 5b47998724da38947938c66d53b3297f6529cdeb
Nicholas Breen
3 years ago
0 | 0 |
For more detailed information about the changes see the history of the
|
1 | 1 |
[repository](https://github.com/votca/xtp/commits/master).
|
|
2 |
|
|
3 |
## Version 1.6.1 (released 21.06.20)
|
|
4 |
* fix warnings on Ubuntu 20.04 (#438, #460)
|
|
5 |
* remove obsolete boost define (#440)
|
2 | 6 |
|
3 | 7 |
## Version 1.6 _SuperPelagia_ (released 17.04.20)
|
4 | 8 |
* fix 32-bit build (#381, #380)
|
1 | 1 |
project(votca-xtp)
|
2 | 2 |
|
3 | 3 |
|
4 | |
set(PROJECT_VERSION "1.6")
|
|
4 |
set(PROJECT_VERSION "1.6.1")
|
5 | 5 |
set(PROJECT_CONTACT "bugs@votca.org")
|
6 | 6 |
string(REGEX REPLACE "^[1-9]+\\.([1-9]+).*$" "\\1" SOVERSION "${PROJECT_VERSION}")
|
7 | 7 |
if (NOT ${SOVERSION} MATCHES "[1-9]+")
|
|
17 | 17 |
endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CXX_FLAGS)
|
18 | 18 |
if(CMAKE_BUILD_TYPE STREQUAL Debug)
|
19 | 19 |
add_definitions(-DDEBUG)
|
20 | |
elseif(CMAKE_BUILD_TYPE STREQUAL Release)
|
21 | |
add_definitions(-DBOOST_UBLAS_NDEBUG)
|
22 | 20 |
endif()
|
23 | 21 |
|
24 | 22 |
enable_language(CXX)
|
|
46 | 44 |
find_package(LIBXC REQUIRED)
|
47 | 45 |
find_package(HDF5 1.8 REQUIRED COMPONENTS CXX)
|
48 | 46 |
|
49 | |
if (${HDF5_VERSION} GREATER 1.8)
|
|
47 |
if(HDF5_VERSION VERSION_GREATER 1.8)
|
50 | 48 |
message(WARNING "HDF5 will be used such that it is compatible with version 1.8.")
|
51 | 49 |
endif()
|
52 | 50 |
|
|
51 |
# https://github.com/votca/xtp/issues/436, hdf5-1.10.4 generates a implicitly-declared operator warning
|
|
52 |
if(HDF5_VERSION VERSION_GREATER_EQUAL 1.10.4 AND HDF5_VERSION VERSION_LESS_EQUAL 1.10.6)
|
|
53 |
include(CheckCXXCompilerFlag)
|
|
54 |
check_cxx_compiler_flag("-Wno-deprecated-copy" COMPILER_SUPPORTS_WNO_DEPRECATED_COPY)
|
|
55 |
if(COMPILER_SUPPORTS_WNO_DEPRECATED_COPY)
|
|
56 |
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-copy")
|
|
57 |
endif()
|
|
58 |
endif()
|
53 | 59 |
|
54 | 60 |
option(BUILD_SHARED_LIBS "Build shared libs" ON)
|
55 | 61 |
include(GNUInstallDirs)
|
1 | 1 |
|
2 | 2 |
project(xtp-tutorials)
|
3 | 3 |
|
4 | |
set(PROJECT_VERSION "1.6")
|
|
4 |
set(PROJECT_VERSION "1.6.1")
|
5 | 5 |
|
6 | 6 |
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules)
|
7 | 7 |
include(GNUInstallDirs)
|
|
0 |
<options>
|
|
1 |
<molpol help="Molecular polarizability calculator (and optimizer)" label="tool:molpol">
|
|
2 |
<mpsfiles>
|
|
3 |
<input help="mps input file">CH4_i.mps</input>
|
|
4 |
<output help="mps output file">CH4_i.mps</output>
|
|
5 |
<polar help="xml file with infos on polarizability tensor">output.xml</polar>
|
|
6 |
</mpsfiles>
|
|
7 |
<induction>
|
|
8 |
<expdamp help="Thole sharpness parameter">0.39000</expdamp>
|
|
9 |
<wSOR help="mixing factor for convergence">0.35000</wSOR>
|
|
10 |
<maxiter help="maximum number of iterations">1024</maxiter>
|
|
11 |
<tolerance help="rel. tolerance for induced moments">0.00001</tolerance>
|
|
12 |
</induction>
|
|
13 |
<target>
|
|
14 |
<optimize help="if 'true', refine atomic polarizabilities to match molecular polarizable volume specified in target.molpol">true</optimize>
|
|
15 |
<molpol help="target polarizability tensor in format xx xy xz yy yz zz (this should be in the eigen-frame, hence xy = xz = yz = 0), if optimize=true the associated polarizable volume will be matched iteratively and the resulting set of polar sites written to mpsfiles.output">2.3191 0.0 0.0 2.3199 0.0 2.3204</molpol>
|
|
16 |
<tolerance help="relative tolerance when optimizing the polarizable volume">0.00001</tolerance>
|
|
17 |
</target>
|
|
18 |
</molpol>
|
|
19 |
</options>
|
|
0 |
<options>
|
|
1 |
<molpol help="Molecular polarizability calculator (and optimizer)" label="tool:molpol">
|
|
2 |
<mpsfiles>
|
|
3 |
<input help="mps input file">CH4_h.mps</input>
|
|
4 |
<output help="mps output file">CH4_h.mps</output>
|
|
5 |
<polar help="xml file with infos on polarizability tensor">output.xml</polar>
|
|
6 |
</mpsfiles>
|
|
7 |
<induction>
|
|
8 |
<expdamp help="Thole sharpness parameter">0.39000</expdamp>
|
|
9 |
<wSOR help="mixing factor for convergence">0.35000</wSOR>
|
|
10 |
<maxiter help="maximum number of iterations">1024</maxiter>
|
|
11 |
<tolerance help="rel. tolerance for induced moments">0.00001</tolerance>
|
|
12 |
</induction>
|
|
13 |
<target>
|
|
14 |
<optimize help="if 'true', refine atomic polarizabilities to match molecular polarizable volume specified in target.molpol">true</optimize>
|
|
15 |
<molpol help="target polarizability tensor in format xx xy xz yy yz zz (this should be in the eigen-frame, hence xy = xz = yz = 0), if optimize=true the associated polarizable volume will be matched iteratively and the resulting set of polar sites written to mpsfiles.output">1.4451 0.0 0.0 2.0267 0.0 2.0267</molpol>
|
|
16 |
<tolerance help="relative tolerance when optimizing the polarizable volume">0.00001</tolerance>
|
|
17 |
</target>
|
|
18 |
</molpol>
|
|
19 |
</options>
|
|
0 |
<options>
|
|
1 |
<molpol help="Molecular polarizability calculator (and optimizer)" label="tool:molpol">
|
|
2 |
<mpsfiles>
|
|
3 |
<input help="mps input file">CH4_n.mps</input>
|
|
4 |
<output help="mps output file">CH4_n.mps</output>
|
|
5 |
<polar help="xml file with infos on polarizability tensor">output.xml</polar>
|
|
6 |
</mpsfiles>
|
|
7 |
<induction>
|
|
8 |
<expdamp help="Thole sharpness parameter">0.39000</expdamp>
|
|
9 |
<wSOR help="mixing factor for convergence">0.35000</wSOR>
|
|
10 |
<maxiter help="maximum number of iterations">1024</maxiter>
|
|
11 |
<tolerance help="rel. tolerance for induced moments">0.00001</tolerance>
|
|
12 |
</induction>
|
|
13 |
<target>
|
|
14 |
<optimize help="if 'true', refine atomic polarizabilities to match molecular polarizable volume specified in target.molpol">true</optimize>
|
|
15 |
<molpol help="target polarizability tensor in format xx xy xz yy yz zz (this should be in the eigen-frame, hence xy = xz = yz = 0), if optimize=true the associated polarizable volume will be matched iteratively and the resulting set of polar sites written to mpsfiles.output">2.3191 0.0 0.0 2.3199 0.0 2.3204</molpol>
|
|
16 |
<tolerance help="relative tolerance when optimizing the polarizable volume">0.00001</tolerance>
|
|
17 |
</target>
|
|
18 |
</molpol>
|
|
19 |
</options>
|