IffGit has a new shared runner for building Docker images in GitLab CI. Visit https://iffgit.fz-juelich.de/examples/ci-docker-in-docker for more details.

Commit 86f6c752 authored by Daniel Wortmann's avatar Daniel Wortmann
Browse files

Merge branch 'develop' of fleur-git:fleur into develop

parents b6fb7915 6ede0b11
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
INTEGER :: lmax0,lnonsph0,jri0,ncst0,nlod0,llod INTEGER :: lmax0,lnonsph0,jri0,ncst0,nlod0,llod
INTEGER :: natomst,ncorest,nvalst,z,nlo0 INTEGER :: natomst,ncorest,nvalst,z,nlo0
INTEGER :: xmlCoreStateNumber, lmaxdTemp INTEGER :: xmlCoreStateNumber, lmaxdTemp
REAL :: rmt0_def,dx0_def,bmu0_def REAL :: rmt0_def,dx0_def,bmu0_def, upReal, dnReal
REAL :: rmt0,dx0,bmu0,zat0,id,electronsOnAtom, electronsLeft REAL :: rmt0,dx0,bmu0,zat0,id,electronsOnAtom, electronsLeft
LOGICAL :: fatalerror, h_atom, h_allatoms LOGICAL :: fatalerror, h_atom, h_allatoms
LOGICAL :: idone(atoms%ntype) LOGICAL :: idone(atoms%ntype)
...@@ -505,6 +505,8 @@ c in s and p states equal occupation of up and down states ...@@ -505,6 +505,8 @@ c in s and p states equal occupation of up and down states
ENDIF ENDIF
up = j up = j
dn = j dn = j
upReal = coreocc(i,n) / 2.0
dnReal = coreocc(i,n) / 2.0
END IF END IF
WRITE(27,'(4i3,i4,a1)') coreqn(1,i,n),coreqn(2,i,n),up,dn, WRITE(27,'(4i3,i4,a1)') coreqn(1,i,n),coreqn(2,i,n),up,dn,
& coreqn(1,i,n),lotype(lval(i,n)) & coreqn(1,i,n),lotype(lval(i,n))
...@@ -560,8 +562,8 @@ c in s and p states equal occupation of up and down states ...@@ -560,8 +562,8 @@ c in s and p states equal occupation of up and down states
! up = CEILING(coreocc(i,n)/2) ! up = CEILING(coreocc(i,n)/2)
! dn = FLOOR(coreocc(i,n)/2) ! dn = FLOOR(coreocc(i,n)/2)
! END SELECT ! END SELECT
xmlCoreOccs(1,xmlCoreStateNumber,n) = up xmlCoreOccs(1,xmlCoreStateNumber,n) = upReal
xmlCoreOccs(2,xmlCoreStateNumber,n) = dn xmlCoreOccs(2,xmlCoreStateNumber,n) = dnReal
ENDDO ENDDO
WRITE (6,*) '----------' WRITE (6,*) '----------'
......
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