Commit 3da94d08 authored by Matthias Redies's avatar Matthias Redies

merge fixes

parent 2bb8eb6c
......@@ -27,7 +27,7 @@ CONTAINS
CLASS(t_mat),INTENT(INOUT) ::hmat
CALL timestart("non-spherical setup")
IF (mpi%n_size==1) THEN
#if defined (_CUDA)
#ifdef (_CUDA)
CALL priv_noMPI_gpu(n,mpi,sym,atoms,isp,iintsp,jintsp,chi,noco,cell,lapw,td,fj,gj,hmat)
#else
CALL priv_noMPI(n,mpi,sym,atoms,isp,iintsp,jintsp,chi,noco,cell,lapw,td,fj,gj,hmat)
......@@ -38,7 +38,7 @@ CONTAINS
CALL timestop("non-spherical setup")
END SUBROUTINE hsmt_nonsph
#if defined (_CUDA)
#ifdef (_CUDA)
SUBROUTINE priv_noMPI_gpu(n,mpi,sym,atoms,isp,iintsp,jintsp,chi,noco,cell,lapw,td,fj,gj,hmat)
!Calculate overlap matrix
USE m_hsmt_ab
......@@ -78,8 +78,6 @@ CONTAINS
integer :: i, j, istat
call nvtxStartRange("hsmt_nonsph",1)
ALLOCATE(ab(MAXVAL(lapw%nv),2*atoms%lmaxd*(atoms%lmaxd+2)+2),ab1(lapw%nv(jintsp),2*atoms%lmaxd*(atoms%lmaxd+2)+2))
#ifdef _CUDA
ALLOCATE(h_loc_dev(size(td%h_loc,1),size(td%h_loc,2)))
ALLOCATE(ab1_dev(lapw%nv(jintsp),2*atoms%lmaxd*(atoms%lmaxd+2)+2))
ALLOCATE(ab_dev(MAXVAL(lapw%nv),2*atoms%lmaxd*(atoms%lmaxd+2)+2))
......
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