Commit 8d204263 authored by Henning Janssen's avatar Henning Janssen

Revert "Something seems to be broken with the mixing routines with LDA+U, ugly workaround for now"

This reverts commit 82d6a296.
parent a2458a0a
......@@ -84,7 +84,7 @@ contains
ENDIF
CALL timestart("Reading of distances")
CALL mixvector_init(mpi%mpi_comm,.FALSE.,oneD,input,vacuum,noco,sym,stars,cell,sphhar,atoms)
CALL mixvector_init(mpi%mpi_comm,l_densitymatrix,oneD,input,vacuum,noco,sym,stars,cell,sphhar,atoms)
CALL mixing_history_open(mpi,input%maxiter)
......@@ -146,17 +146,15 @@ contains
inDen%pw=0.0;inDen%mt=0.0
IF (ALLOCATED(inDen%vacz)) inden%vacz=0.0
IF (ALLOCATED(inDen%vacxy)) inden%vacxy=0.0
IF (ALLOCATED(inDen%mmpMat).AND..FALSE.) inden%mmpMat(:,:,1:atoms%n_u,:)=0.0
IF (ALLOCATED(inDen%mmpMat).AND.l_densitymatrix) inden%mmpMat(:,:,1:atoms%n_u,:)=0.0
CALL sm(it)%to_density(inDen)
IF (atoms%n_u>0.AND..NOT.input%ldaulinmix) THEN
IF (atoms%n_u>0.AND..NOT.l_densitymatrix.AND..NOT.input%ldaulinmix) THEN
!No density matrix was present
!but is now created...
inden%mmpMAT(:,:,1:atoms%n_u,:)=outden%mmpMat(:,:,1:atoms%n_u,:)
IF(.NOT.l_densitymatrix) THEN
CALL mixing_history_reset(mpi)
CALL mixvector_reset()
ENDIF
ENDIF
IF(atoms%n_hia>0) THEN
!For LDA+HIA we don't use any mixing of the density matrices we just pass it on
......
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