Commit 36e66f65 authored by Daniel Wortmann's avatar Daniel Wortmann

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

parents 1ce32b22 67e5c0d0
......@@ -135,6 +135,9 @@ SUBROUTINE r_inpXML(&
INTEGER :: coreStateKappaList(29)
REAL :: coreStateOccs(29,2)
INTEGER :: coreStateNprnc(29), coreStateKappa(29)
INTEGER :: speciesXMLElectronStates(29)
REAL :: speciesXMLCoreOccs(2,29)
LOGICAL :: speciesXMLPrintCoreStates(29)
INTEGER :: iType, iLO, iSpecies, lNumCount, nNumCount, iLLO, jsp, j, l
INTEGER :: numberNodes, nodeSum, numSpecies, n2spg, n1, n2, ikpt, iqpt
......@@ -1305,6 +1308,9 @@ SUBROUTINE r_inpXML(&
providedCoreStates = 0
providedStates = 0
coreStateOccs = 0.0
speciesXMLElectronStates = noState_const
speciesXMLCoreOccs = -1.0
speciesXMLPrintCoreStates = .FALSE.
WRITE(xPathA,*) '/fleurInput/atomSpecies/species[',iSpecies,']/electronConfig'
numberNodes = xmlGetNumberOfNodes(TRIM(ADJUSTL(xPathA)))
IF (numberNodes.EQ.1) THEN
......@@ -1322,6 +1328,7 @@ SUBROUTINE r_inpXML(&
coreStateOccs(j-providedCoreStates,:) = coreStateNumElecsList(j)
coreStateNprnc(j-providedCoreStates) = coreStateNprncList(j)
coreStateKappa(j-providedCoreStates) = coreStateKappaList(j)
speciesXMLElectronStates(j) = coreState_const
END DO
providedCoreStates = providedCoreStates + nobleGasNumStatesList(i)
END IF
......@@ -1336,6 +1343,7 @@ SUBROUTINE r_inpXML(&
coreStateOccs(providedCoreStates,:) = coreStateNumElecsList(i)
coreStateNprnc(providedCoreStates) = coreStateNprncList(i)
coreStateKappa(providedCoreStates) = coreStateKappaList(i)
speciesXMLElectronStates(i) = coreState_const
END IF
END DO
END IF
......@@ -1356,6 +1364,7 @@ SUBROUTINE r_inpXML(&
coreStateOccs(providedStates,:) = coreStateNumElecsList(i)
coreStateNprnc(providedStates) = coreStateNprncList(i)
coreStateKappa(providedStates) = coreStateKappaList(i)
speciesXMLElectronStates(i) = valenceState_const
END IF
END DO
token = popFirstStringToken(valueString)
......@@ -1381,6 +1390,9 @@ SUBROUTINE r_inpXML(&
IF (TRIM(ADJUSTL(valueString)).EQ.coreStateList(j)) THEN
nprncTemp = coreStateNprncList(j)
kappaTemp = coreStateKappaList(j)
speciesXMLPrintCoreStates(j) = .TRUE.
speciesXMLCoreOccs(1,j) = evaluateFirstOnly(xmlGetAttributeValue(TRIM(ADJUSTL(xPathB))//'/@spinUp'))
speciesXMLCoreOccs(2,j) = evaluateFirstOnly(xmlGetAttributeValue(TRIM(ADJUSTL(xPathB))//'/@spinDown'))
END IF
END DO
DO j = 1, providedStates
......@@ -1448,6 +1460,10 @@ SUBROUTINE r_inpXML(&
atoms%coreStateOccs(k,2,iType) = coreStateOccs(k,2)
atoms%coreStateNprnc(k,iType) = coreStateNprnc(k)
atoms%coreStateKappa(k,iType) = coreStateKappa(k)
xmlElectronStates(k,iType) = speciesXMLElectronStates(k)
xmlPrintCoreStates(k,iType) = speciesXMLPrintCoreStates(k)
xmlCoreOccs (1,k,iType) = speciesXMLCoreOccs(1,k)
xmlCoreOccs (2,k,iType) = speciesXMLCoreOccs(2,k)
END DO
WRITE(*,*) 'setcor still has to be adapted!!!'
END IF
......
......@@ -146,6 +146,7 @@ SUBROUTINE w_inpXML(&
fileNum = -1
IF(l_outFile) THEN
fileNum = getXMLOutputUnitNumber()
CALL openXMLElementNoAttributes('inputData')
ELSE
fileNum = 5
OPEN (fileNum,file='inp.xml',form='formatted',status='unknown')
......@@ -330,6 +331,11 @@ SUBROUTINE w_inpXML(&
END IF
END IF
268 FORMAT(' <vacuumEnergyParameters vacuum="',i0,'" spinUp="',f0.8,'" spinDown="',f0.8,'">')
DO i = 1, vacuum%nvac
WRITE(fileNum,268) i, enpara%evac0(i,1), enpara%evac0(i,input%jspins)
END DO
WRITE (fileNum,'(a)') ' </filmLattice>'
ELSE
......@@ -612,7 +618,9 @@ SUBROUTINE w_inpXML(&
WRITE (fileNum,420) obsolete%form66,input%eonly,input%l_bmt
WRITE (fileNum,'(a)') ' </output>'
IF(.NOT.l_outFile) THEN
IF(l_outFile) THEN
CALL closeXMLElement('inputData')
ELSE
WRITE (fileNum,'(a)') '</fleurInput>'
CLOSE (fileNum)
END IF
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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