Commit ddfbe795 authored by Bálint Aradi's avatar Bálint Aradi

Minor fixes to compile the code with the NAG compiler

The compiler needs the degradation flags '-dcfuns -mismatch
-kind=byte' in order to process the code.
parent dfebb1d7
......@@ -18,6 +18,7 @@ IF(PROJECT_BINARY_DIR STREQUAL PROJECT_SOURCE_DIR)
MESSAGE(FATAL_ERROR "${MAGENTA}Build in the source directory is not allowed${COLORRESET}")
ENDIF()
SET(CMAKE_Fortran_MODULE_DIRECTORY "${PROJECT_BINARY_DIR}/include")
include_directories("${PROJECT_BINARY_DIR}/include")
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
......
......@@ -3327,9 +3327,9 @@ subroutine solve_tridi_double( na, nev, d, e, q, ldq, nblk, matrixCols, mpi_comm
use precision
implicit none
real(kind=rk8) :: g_col(nlen), l_col(*) ! chnage this to proper 2d 1d matching ! remove assumed size
integer(kind=ik) :: noff, nlen, my_prow, np_rows, nblk
real(kind=rk8) :: g_col(nlen), l_col(*) ! chnage this to proper 2d 1d matching ! remove assumed size
integer(kind=ik) :: nbs, nbe, jb, g_off, l_off, js, je
nbs = noff/(nblk*np_rows)
......
......@@ -69,13 +69,13 @@ subroutine qr_pdlarfb_1dcomm_double(m,mb,n,k,a,lda,v,ldv,tau,t,ldt,baseidx,idx,r
implicit none
! input variables (global)
integer(kind=ik) :: m,mb,n,k,baseidx,idx,rev,mpicomm
! input variables (local)
integer(kind=ik) :: lda,ldv,ldt,lwork
real(kind=rk8) :: a(lda,*),v(ldv,*),tau(*),t(ldt,*),work(k,*)
! input variables (global)
integer(kind=ik) :: m,mb,n,k,baseidx,idx,rev,mpicomm
! output variables (global)
! derived input variables from QR_PQRPARAM
......@@ -143,13 +143,13 @@ subroutine qr_pdlarft_pdlarfb_1dcomm_double(m,mb,n,oldk,k,v,ldv,tau,t,ldt,a,lda,
implicit none
! input variables (global)
integer(kind=ik) :: m,mb,n,k,oldk,baseidx,rev,mpicomm
! input variables (local)
integer(kind=ik) :: ldv,ldt,lda,lwork
real(kind=rk8) :: v(ldv,*),tau(*),t(ldt,*),work(k,*),a(lda,*)
! input variables (global)
integer(kind=ik) :: m,mb,n,k,oldk,baseidx,rev,mpicomm
! output variables (global)
! derived input variables from QR_PQRPARAM
......@@ -234,13 +234,13 @@ subroutine qr_pdlarft_set_merge_1dcomm_double(m,mb,n,blocksize,v,ldv,t,ldt,basei
implicit none
! input variables (global)
integer(kind=ik) :: m,mb,n,blocksize,baseidx,rev,mpicomm
! input variables (local)
integer(kind=ik) :: ldv,ldt,lwork
real(kind=rk8) :: v(ldv,*),t(ldt,*),work(n,*)
! input variables (global)
integer(kind=ik) :: m,mb,n,blocksize,baseidx,rev,mpicomm
! output variables (global)
! derived input variables from QR_PQRPARAM
......@@ -287,13 +287,13 @@ subroutine qr_pdlarft_tree_merge_1dcomm_double(m,mb,n,blocksize,treeorder,v,ldv,
implicit none
! input variables (global)
integer(kind=ik) :: m,mb,n,blocksize,treeorder,baseidx,rev,mpicomm
! input variables (local)
integer(kind=ik) :: ldv,ldt,lwork
real(kind=rk8) :: v(ldv,*),t(ldt,*),work(n,*)
! input variables (global)
integer(kind=ik) :: m,mb,n,blocksize,treeorder,baseidx,rev,mpicomm
! output variables (global)
! derived input variables from QR_PQRPARAM
......
......@@ -381,7 +381,7 @@ CONTAINS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
ELSE
!! Setup Involves Just The Root Opening And Reading Parameter Data
CALL StartTimer("MPI Read Text")
bytes_per_character = sizeof(temp_char)
bytes_per_character = c_sizeof(temp_char)
IF (IsRoot(process_grid_in)) THEN
header_length = 0
local_file_handler = 16
......@@ -720,8 +720,8 @@ CONTAINS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
CALL MergeMatrixLocalBlocks(this, merged_local_data)
!! Determine Write Location
bytes_per_int = sizeof(temp_int)
bytes_per_data = sizeof(temp_data)
bytes_per_int = c_sizeof(temp_int)
bytes_per_data = c_sizeof(temp_data)
header_size = bytes_per_int*4
ALLOCATE(local_values_buffer(this%process_grid%slice_size))
CALL MPI_Allgather(SIZE(merged_local_data%values), 1, MPINTINTEGER,&
......@@ -805,8 +805,8 @@ CONTAINS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
CALL MergeMatrixLocalBlocks(this, merged_local_data)
!! Determine Write Location
bytes_per_int = sizeof(temp_int)
bytes_per_data = sizeof(temp_data)
bytes_per_int = c_sizeof(temp_int)
bytes_per_data = c_sizeof(temp_data)
header_size = bytes_per_int*4
ALLOCATE(local_values_buffer(this%process_grid%slice_size))
CALL MPI_Allgather(SIZE(merged_local_data%values), 1, MPINTINTEGER,&
......@@ -914,7 +914,7 @@ CONTAINS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! Merge all the local data
CALL MergeMatrixLocalBlocks(this, merged_local_data)
bytes_per_character = sizeof(temp_char)
bytes_per_character = c_sizeof(temp_char)
!! Create the matrix size line
NEW_LINE_LENGTH = LEN(new_line('A'))
......@@ -1047,7 +1047,7 @@ CONTAINS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! Merge all the local data
CALL MergeMatrixLocalBlocks(this, merged_local_data)
bytes_per_character = sizeof(temp_char)
bytes_per_character = c_sizeof(temp_char)
!! Create the matrix size line
NEW_LINE_LENGTH = LEN(new_line('A'))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment