Skip to content

Commit ac6bb97

Browse files
author
Roberto Di Remigio
committed
Get ENABLE_64BIT_INTEGERS to work.
We are not actually using 64-bit integers. This is to be compatible with DIRAC/DALTON, inside pedra we're using regular 32-bit integers.
1 parent eeebcdd commit ac6bb97

16 files changed

+355
-308
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8.3 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
22
#
33
# Declare project name and programming languages
44
#
@@ -16,6 +16,7 @@ option(ENABLE_CODE_COVERAGE "Enable code coverage"
1616
option(DISABLE_EIGEN_OWN "Do not use Eigen3 headers shipped with the module" OFF)
1717
option(ENABLE_EIGEN_MKL "Enable Eigen3 automatic fallback to some of Intel MKL algorithms" OFF)
1818
option(ENABLE_PYTHON_EMBEDDING "Enable Python embedding" ON)
19+
option(ENABLE_64BIT_INTEGERS "Enable 64-bit integers" OFF)
1920
#
2021
# CMake modules
2122
#

cmake/compilers/CheckCXX11Features.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ function(cxx11_check_feature FEATURE_NAME RESULT_VAR)
7474
if (NOT DEFINED ${RESULT_VAR})
7575
set(_bindir "${CMAKE_CURRENT_BINARY_DIR}/check_cxx11/cxx11_${FEATURE_NAME}")
7676

77-
set(_SRCFILE_BASE ${CMAKE_CURRENT_LIST_DIR}/CheckCXX11Features/cxx11-test-${FEATURE_NAME})
77+
set(_location "${PROJECT_SOURCE_DIR}/cmake/compilers/CheckCXX11Features")
78+
set(_SRCFILE_BASE "${_location}/cxx11-test-${FEATURE_NAME}")
7879
set(_LOG_NAME "\"${FEATURE_NAME}\"")
7980
#message(STATUS "Checking C++11 support for ${_LOG_NAME}")
8081

cmake/compilers/FortranFlags.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,4 @@ if (NOT DEFINED DEFAULT_Fortran_FLAGS_SET OR RESET_FLAGS)
8686

8787
save_compiler_flags(Fortran)
8888

89-
9089
endif()

src/pedra/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ set(sources_list "")
22
# Get sources with Fortran extension
33
get_fortran_sources(sources_list)
44
# If you want to remove some sources specify them explictly here
5-
list(REMOVE_ITEM sources_list "")
5+
list(REMOVE_ITEM sources_list "pedra_cavity_derivatives.F90")
66

77
# Write list of files to be passed to cloc for counting lines of code.
88
# Only files that are actually compiled are counted.

src/pedra/pcm_mxcent.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@
3434
! have to be around 2000 - 3000!!! Remember to set MXQM3 = MXCENT in
3535
! qm3.h!!!
3636
!
37-
INTEGER MXNEW, MXCENT, MXCOOR
37+
integer(kind=regint_k) MXNEW, MXCENT, MXCOOR
3838
PARAMETER (MXNEW =120, MXCENT = 120, MXCOOR = 3*MXCENT)

src/pedra/pcm_nuclei.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
! PCMSolver API, see: <https://repo.ctcc.no/projects/pcmsolver>
2222
!pcmsolver_copyright_end
2323

24-
INTEGER NUCPRE, NUCNUM, NUCDEG, ISTBNU, NCTOT, &
24+
integer(kind=regint_k) NUCPRE, NUCNUM, NUCDEG, ISTBNU, NCTOT, &
2525
NUCIND, NUCDEP, NTRACO, ITRACO, NATOMS, NFLOAT, &
2626
NBASIS, NLARGE, NSMALL, NPBAS, NPLRG, NPSML, &
2727
NCHTOT, INCENT, INUNIQ, NDEGNM, ISOTOP, IZATOM, &
@@ -43,6 +43,6 @@
4343
CHARACTER NAMEX*6, NAMDEP*6, NAMDPX*8, NAMN*4
4444
COMMON /PCM_NUCLEC/ NAMEX(MXCOOR), NAMDEP(MXCENT), NAMDPX(MXCOOR), &
4545
NAMN(MXCENT)
46-
INTEGER MULBSI
46+
INTEGER(kind=regint_k) MULBSI
4747
COMMON /PCM_MULBAS/ MULBSI(MXCENT)
4848
! MULBAS has been added for multiple basis sets (WK/UniKA/31-10-2002).

src/pedra/pcm_pcm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
RIN, RSOLV, QSN, QSE, QSENEQ, QLOC, PCMEN, PCMEE, PCMNE, &
2828
PCMNN, QNUC, XE, YE, ZE, RE, SSFE, STOT, VOL, RSPH, &
2929
XTSCOR, YTSCOR, ZTSCOR, RDIF, POTCAVNUC, POTCAVELE
30-
INTEGER IAN, ICOMPCM, ICESPH, IDXSPH, INA, IPOLYG, &
30+
integer(kind=regint_k) IAN, ICOMPCM, ICESPH, IDXSPH, INA, IPOLYG, &
3131
IPRPCM, IRETCAV, ISPHE, NESF, NESFP, NC, NVERT, NTS, NTSIRR, &
3232
NRWCAV, LUPCMD, LUCAVD, LUPCMI, NPCMMT
3333
COMMON /PCM_CAV/ OMEGA,RET,FRO,ALPHA(MXSP),RIN(MXSP),ICESPH, &

0 commit comments

Comments
 (0)