Commit 3d7500b4 authored by Uliana Alekseeva's avatar Uliana Alekseeva

bugfix to the previous commit

parent ea6d01cf
...@@ -26,6 +26,6 @@ LINK_LIBRARIES ${FLEUR_LIBRARIES}) ...@@ -26,6 +26,6 @@ LINK_LIBRARIES ${FLEUR_LIBRARIES})
message("20180525 ELPA: ${FLEUR_USE_ELPA_ONENODE_20180525}") message("20180525 ELPA: ${FLEUR_USE_ELPA_ONENODE_20180525}")
if (FLEUR_USE_ELPA_ONENODE_20180525) if (FLEUR_USE_ELPA_ONENODE_20180525)
set(FLEUR_USE_ELPA_ONENODE TRUE) set(FLEUR_USE_ELPA_ONENODE TRUE)
# set(FLEUR_DEFINITIONS ${FLEUR_DEFINITIONS} "CPP_ELPA" "CPP_ELPA2") set(FLEUR_DEFINITIONS ${FLEUR_DEFINITIONS} "CPP_ELPA_ONENODE")
endif() endif()
endif() endif()
...@@ -8,12 +8,8 @@ diagonalization/scalapack.F90 ...@@ -8,12 +8,8 @@ diagonalization/scalapack.F90
diagonalization/chase_diag.F90 diagonalization/chase_diag.F90
diagonalization/symmetrize_matrix.f90 diagonalization/symmetrize_matrix.f90
diagonalization/cusolver_diag.F90 diagonalization/cusolver_diag.F90
diagonalization/elemental.F90) diagonalization/elemental.F90
if (FLEUR_USE_ELPA_ONENODE_20180525) diagonalization/elpa_20180525_onenode.F90)
set(fleur_F90 ${fleur_F90}
diagonalization/elpa_20180525_onenode.F90
)
endif()
if (FLEUR_USE_ELPA_20180525) if (FLEUR_USE_ELPA_20180525)
set(fleur_F90 ${fleur_F90} set(fleur_F90 ${fleur_F90}
diagonalization/elpa_20180525.F90 diagonalization/elpa_20180525.F90
......
...@@ -41,8 +41,11 @@ MODULE m_eigen_diag ...@@ -41,8 +41,11 @@ MODULE m_eigen_diag
#endif #endif
INTEGER,PARAMETER:: diag_lapack=4 INTEGER,PARAMETER:: diag_lapack=4
#ifdef CPP_ELPA_ONENODE
INTEGER,PARAMETER:: diag_elpa_1node=14 INTEGER,PARAMETER:: diag_elpa_1node=14
#else
INTEGER,PARAMETER:: diag_elpa_1node=-14
#endif
INTEGER,PARAMETER:: diag_debugout=99 INTEGER,PARAMETER:: diag_debugout=99
PUBLIC eigen_diag,parallel_solver_available PUBLIC eigen_diag,parallel_solver_available
CONTAINS CONTAINS
......
...@@ -26,7 +26,9 @@ CONTAINS ...@@ -26,7 +26,9 @@ CONTAINS
!USE m_types_mpimat !USE m_types_mpimat
USE m_types_mat USE m_types_mat
USE m_types USE m_types
#ifdef CPP_ELPA_ONENODE
USE elpa USE elpa
#endif
IMPLICIT NONE IMPLICIT NONE
CLASS(t_mat),INTENT(INOUT) :: hmat,smat CLASS(t_mat),INTENT(INOUT) :: hmat,smat
...@@ -34,6 +36,7 @@ CONTAINS ...@@ -34,6 +36,7 @@ CONTAINS
REAL,INTENT(out) :: eig(:) REAL,INTENT(out) :: eig(:)
INTEGER,INTENT(INOUT) :: ne INTEGER,INTENT(INOUT) :: ne
#ifdef CPP_ELPA_ONENODE
!... Local variables !... Local variables
! !
INTEGER :: num!, np,myid INTEGER :: num!, np,myid
...@@ -123,6 +126,8 @@ CONTAINS ...@@ -123,6 +126,8 @@ CONTAINS
! CLASS DEFAULT ! CLASS DEFAULT
! CALL judft_error("Wrong type (2) in scalapack") ! CALL judft_error("Wrong type (2) in scalapack")
! END SELECT ! END SELECT
#endif
END SUBROUTINE elpa_diag_onenode END SUBROUTINE elpa_diag_onenode
END MODULE m_elpa_onenode END MODULE m_elpa_onenode
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