From 20508365d6115883ef66e8f719a887ee627b4291 Mon Sep 17 00:00:00 2001 From: "G. Bihlmayer" Date: Thu, 20 Sep 2018 15:40:47 +0200 Subject: [PATCH] Some fixes in the SOC part for the non-MPI version. --- eigen_soc/alineso.F90 | 4 ++-- eigen_soc/eigenso.F90 | 6 +++++- eigen_soc/hsohelp.F90 | 3 +-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/eigen_soc/alineso.F90 b/eigen_soc/alineso.F90 index 9a32b2a1..159f39a8 100644 --- a/eigen_soc/alineso.F90 +++ b/eigen_soc/alineso.F90 @@ -159,16 +159,16 @@ CONTAINS ALLOCATE ( bhelp(atoms%lmaxd*(atoms%lmaxd+2),nat_l,DIMENSION%neigd,DIMENSION%jspd) ) ALLOCATE ( chelp(-atoms%llod :atoms%llod, DIMENSION%neigd,atoms%nlod,nat_l,DIMENSION%jspd) ) CALL timestart("alineso SOC: -help") + write(*,*) nat_start,nat_stop,nat_l CALL hsohelp(& & DIMENSION,atoms,sym,& & input,lapw,nsz,& & cell,& & zmat,usdus,& & zso,noco,oneD,& - & mpi%n_rank,mpi%n_size,mpi%SUB_COMM,& & nat_start,nat_stop,nat_l,& & ahelp,bhelp,chelp) - write(*,*) 'process',mpi%irank,' after hsohelp',mpi%n_rank + CALL timestop("alineso SOC: -help") ! ! set up hamilton matrix ! diff --git a/eigen_soc/eigenso.F90 b/eigen_soc/eigenso.F90 index aa480e1f..b1fb5ffa 100644 --- a/eigen_soc/eigenso.F90 +++ b/eigen_soc/eigenso.F90 @@ -124,9 +124,13 @@ CONTAINS !IF (mpi%irank.LT.n_plus) i_plus = 0 !n_end = (mpi%irank+1)+(n_loc+i_plus)*mpi%isize ! +#if defined(CPP_MPI) n_stride = kpts%nkpt/mpi%n_groups +#else + n_stride = 1 +#endif n_end = kpts%nkpt - ! write(*,'(4i12)') mpi%irank, mpi%n_groups, n_stride, mpi%n_start + write(*,'(4i12)') mpi%irank, mpi%n_groups, n_stride, mpi%n_start ! !---> start loop k-pts ! diff --git a/eigen_soc/hsohelp.F90 b/eigen_soc/hsohelp.F90 index 3240d06a..f4e2cb8f 100644 --- a/eigen_soc/hsohelp.F90 +++ b/eigen_soc/hsohelp.F90 @@ -17,7 +17,7 @@ MODULE m_hsohelp ! CONTAINS SUBROUTINE hsohelp(DIMENSION,atoms,sym,input,lapw,nsz, cell,& - zmat,usdus, zso,noco,oneD,n_rank,n_size,SUB_COMM,& + zmat,usdus, zso,noco,oneD,& nat_start,nat_stop,nat_l,ahelp,bhelp,chelp) ! USE m_abcof_soc @@ -40,7 +40,6 @@ CONTAINS ! .. Scalar Arguments .. ! .. INTEGER, INTENT (IN) :: nat_start,nat_stop,nat_l - INTEGER, INTENT (IN) :: n_rank,n_size,SUB_COMM ! .. Array Arguments .. INTEGER, INTENT (IN) :: nsz(DIMENSION%jspd) COMPLEX, INTENT (INOUT) :: zso(:,:,:)!DIMENSION%nbasfcn,2*DIMENSION%neigd,DIMENSION%jspd) -- GitLab