Commit db2eabd2 authored by Henning Janssen's avatar Henning Janssen

Merge remote-tracking branch 'origin/develop' into develop

parents 3db65716 fd97e91c
......@@ -184,7 +184,7 @@ CONTAINS
z = atoms%zatom(itype)
dxx = atoms%dx(itype)
bmu = 0.0
call atoms%econf(itype)%get_core(nst,kappa,nprnc,occ_h)
call atoms%econf(itype)%get_core(nst,nprnc,kappa,occ_h)
IF ((bmu > 99.)) THEN
occ(1:nst) = input%jspins*occ_h(1:nst, jspin)
......@@ -225,7 +225,7 @@ CONTAINS
z = atoms%zatom(itype)
dxx = atoms%dx(itype)
bmu = 0.0
call atoms%econf(itype)%get_core(nst,kappa,nprnc,occ_h)
call atoms%econf(itype)%get_core(nst,nprnc,kappa,occ_h)
IF ((bmu > 99.)) THEN
occ(1:nst) = input%jspins*occ_h(1:nst, jspin)
ELSE
......@@ -335,7 +335,7 @@ CONTAINS
dxx = atoms%dx(itype)
bmu = 0.0
call atoms%econf(itype)%get_core(nst,kappa,nprnc,occ_h)
call atoms%econf(itype)%get_core(nst,nprnc,kappa,occ_h)
occ(1:nst) = occ_h(1:nst, 1)
rnot = atoms%rmsh(1, itype)
......
......@@ -326,7 +326,11 @@ CONTAINS
bmu = 0.0
! CALL setcor( itype,input%jspins,atoms,input,bmu,&
! & nst,kappa,nprnc,occ_h)
<<<<<<< HEAD
call atoms%econf(itype)%get_core(nst,nprnc,kappa, occ_h)
=======
call atoms%econf(itype)%get_core(nst, kappa, nprnc, occ_h)
>>>>>>> b5433f1a2742d2d6de7a95caf5b67eb81a944ce4
IF ((bmu > 99.)) THEN
occ(1:nst) = input%jspins*occ_h(1:nst, jspin)
......
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