Commit 7985b293 authored by Robin Hilgers's avatar Robin Hilgers

Merge branch 'plot' of https://iffgit.fz-juelich.de/fleur/fleur into plot

parents 7b4d3be8 2b27b77c
......@@ -546,12 +546,12 @@ SUBROUTINE postprocessInput(mpi,input,field,sym,stars,atoms,vacuum,obsolete,kpts
CALL timestart("stepf")
CALL stepf(sym,stars,atoms,oneD,input,cell,vacuum,mpi)
CALL timestop("stepf")
IF (sliceplot%iplot.EQ.0) THEN
!IF (sliceplot%iplot.EQ.0) THEN
IF (mpi%irank.EQ.0) THEN
CALL convn(DIMENSION,atoms,stars)
CALL e_field(atoms,DIMENSION,stars,sym,vacuum,cell,input,field%efield)
END IF !(mpi%irank.EQ.0)
END IF
!END IF
!At some point this should be enabled for noco as well
#ifdef CPP_MPI
......
......@@ -94,12 +94,12 @@ CONTAINS
! ..
it = 1
IF ((sliceplot%iplot.NE.0 ).AND. (mpi%irank==0) ) THEN
IF (noco%l_noco) THEN
!CALL pldngen(mpi,sym,stars,atoms,sphhar,vacuum,&
! cell,input,noco,oneD,sliceplot)
ENDIF
ENDIF
! IF ((sliceplot%iplot.NE.0 ).AND. (mpi%irank==0) ) THEN
! IF (noco%l_noco) THEN
! CALL pldngen(mpi,sym,stars,atoms,sphhar,vacuum,&
! cell,input,noco,oneD,sliceplot)
! ENDIF
! ENDIF
!
......
......@@ -77,7 +77,7 @@ CONTAINS
TYPE(t_sphhar), INTENT(IN) :: sphhar
TYPE(t_input), INTENT(IN) :: input
TYPE(t_noco), INTENT(IN) :: noco
TYPE(t_potden), INTENT(INOUT) :: denmat
TYPE(t_potden), INTENT(IN) :: denmat
TYPE(t_potden), INTENT(OUT) :: cden, mden
CALL cden%init(stars,atoms,sphhar,vacuum,noco,input%jspins,POTDEN_TYPE_DEN)
......@@ -118,7 +118,7 @@ CONTAINS
TYPE(t_noco), INTENT(IN) :: noco
TYPE(t_sliceplot), INTENT(IN) :: sliceplot
REAL, INTENT(IN) :: factor
TYPE(t_potden), INTENT(INOUT) :: denmat
TYPE(t_potden), INTENT(IN) :: denmat
TYPE(t_potden), INTENT(OUT) :: cden, mxden, myden, mzden
! Local type instances
......@@ -424,7 +424,7 @@ CONTAINS
! .. Local Scalars ..
REAL :: tec,qint,fermiEnergyTemp,phi0,angss
INTEGER :: i,j,ix,iy,iz,jsp,na,nplo,iv,iflag,nfile
INTEGER :: i,j,ix,iy,iz,na,nplo,iv,iflag,nfile
INTEGER :: nplot,nt,jm,jspin,numInDen,numOutFiles
LOGICAL :: twodim,oldform,newform,l_qfix
LOGICAL :: cartesian,xsf,unwind,polar
......@@ -611,7 +611,7 @@ CONTAINS
END IF
DO i = 1, numInDen
CALL outcdn(pt,nt,na,iv,iflag,jsp,.FALSE.,stars,&
CALL outcdn(pt,nt,na,iv,iflag,1,.FALSE.,stars,&
vacuum,sphhar,atoms,sym,cell,oneD,&
den(i),xdnout(i))
END DO
......@@ -727,7 +727,7 @@ CONTAINS
TYPE(t_sphhar), INTENT(IN) :: sphhar
TYPE(t_input), INTENT(IN) :: input
TYPE(t_noco), INTENT(IN) :: noco
TYPE(t_potden), INTENT(INOUT) :: denmat
TYPE(t_potden), INTENT(IN) :: denmat
TYPE(t_oned), INTENT(IN) :: oneD
TYPE(t_sliceplot), INTENT(IN) :: sliceplot
LOGICAL, INTENT(IN) :: score
......@@ -761,7 +761,7 @@ CONTAINS
TYPE(t_noco), INTENT(IN) :: noco
TYPE(t_sliceplot), INTENT(IN) :: sliceplot
REAL, INTENT(IN) :: factor
TYPE(t_potden), INTENT(INOUT) :: denmat
TYPE(t_potden), INTENT(IN) :: denmat
LOGICAL, INTENT(IN) :: score
CHARACTER(len=10), INTENT(IN) :: denName
......@@ -789,7 +789,7 @@ CONTAINS
TYPE(t_oneD), INTENT(IN) :: oneD
TYPE(t_noco), INTENT(IN) :: noco
TYPE(t_sliceplot), INTENT(IN) :: sliceplot
TYPE(t_potden), INTENT(INOUT) :: denmat
TYPE(t_potden), INTENT(IN) :: denmat
INTEGER, INTENT(IN) :: plot_const
INTEGER :: i
......@@ -845,7 +845,7 @@ CALL timestop("Hallo, ich sollte hier nicht sein. 2")
TYPE(t_oneD), INTENT(IN) :: oneD
TYPE(t_noco), INTENT(IN) :: noco
TYPE(t_sliceplot), INTENT(IN) :: sliceplot
TYPE(t_potden), INTENT(INOUT) :: denmat
TYPE(t_potden), INTENT(IN) :: denmat
INTEGER, INTENT(IN) :: plot_const
LOGICAL :: allowplot
......
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