Commit 8bd7e078 authored by Robin Hilgers's avatar Robin Hilgers

score is now only in plotdop.f90 and plot.f90=> TO BE RENAMED SOON. Next step:...

score is now only in plotdop.f90 and plot.f90=> TO BE RENAMED SOON. Next step: Make Testfiles free of score and plplot.
parent 79688b4b
......@@ -140,7 +140,7 @@
input%gauss= .false. ; input%tria = .false.
sliceplot%slice= .false. ; input%swsp = .false.
input%lflip= .false. ; banddos%vacdos= .false. ; input%integ = .false.
sliceplot%iplot= 0 ; input%score = .false. ; sliceplot%plpot = .false.
sliceplot%iplot= 0
input%pallst = .false. ; obsolete%lwb = .false. ; vacuum%starcoeff = .false.
input%strho = .false. ; input%l_f = .false. ; atoms%l_geo(:) = .true.
noco%l_noco = noco%l_ss ; input%jspins = 1
......
......@@ -68,13 +68,6 @@ MODULE m_nocoInputCheck
CALL juDFT_error("Coretail option cannot be used!!!",calledby="nocoInputCheck")
END IF
!---> make sure score is false
IF (input%score) THEN
WRITE (6,*) 'This non-collinear version of the flapw program'
WRITE (6,*) 'cannot be used with the score option!! '
CALL juDFT_error("score must be false!!!",calledby ="nocoInputCheck")
END IF
!---> make sure that moments are not relaxed and constrained
l_relax_any = .FALSE.
DO itype = 1,atoms%ntype
......
......@@ -71,7 +71,7 @@
INTEGER ::nw,idsprs
INTEGER ieq,i,k,na,n,ilo
REAL s3,ah,a,hs2,rest
LOGICAL l_hyb,l_sym,ldum
LOGICAL l_hyb,l_sym,ldum,ldum2
INTEGER :: ierr, intDummy
! ..
!... Local Arrays
......@@ -619,16 +619,16 @@
END IF
!
band = .false.
READ (UNIT=5,FMT=8050,END=992,ERR=992) ldum,input%score,sliceplot%plpot,band
WRITE (6,9240) ldum,input%score,sliceplot%plpot,band
READ (UNIT=5,FMT=8050,END=992,ERR=992) ldum,ldum2,ldum2,band
WRITE (6,9240) ldum,ldum2,ldum2,band
sliceplot%iplot=MERGE(1,0,ldum)
IF (band) THEN
banddos%dos=.true. ; banddos%ndir = -4
ENDIF
GOTO 993
992 BACKSPACE(5)
READ (UNIT=5,FMT=8050,END=99,ERR=99) ldum,input%score,sliceplot%plpot
WRITE (6,9240) ldum,input%score,sliceplot%plpot,band
READ (UNIT=5,FMT=8050,END=99,ERR=99) ldum,ldum2,ldum2
WRITE (6,9240) ldum,ldum2,ldum2,band
sliceplot%iplot=MERGE(1,0,ldum)
!
993 READ (UNIT=5,FMT='(i3,2f10.6,6x,i3,8x,l1)',END=99,ERR=99)&
......@@ -932,7 +932,7 @@
WRITE (5,*)
END IF
band = .false.
WRITE (5,9240) ldum,input%score,sliceplot%plpot,band
WRITE (5,9240) ldum,ldum2,ldum2,band
9240 FORMAT ('iplot=',l1,',score=',l1,',plpot=',l1,',band=',l1)
WRITE (5,9250) sliceplot%kk,sliceplot%e1s,sliceplot%e2s,sliceplot%nnne,input%pallst
9250 FORMAT (i3,2f10.6,',nnne=',i3,',pallst=',l1)
......
......@@ -103,7 +103,6 @@ CONTAINS
IF (mpi%irank == 0) THEN
IF (sliceplot%plpot) input%score = .FALSE.
IF (sliceplot%iplot.NE.0) THEN
CALL timestart("Plotting")
IF (input%strho) CALL juDFT_error("strho = T and iplot=/=0",calledby = "optional")
......
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