Commit 7a6dfd39 authored by Daniel Wortmann's avatar Daniel Wortmann

more for old input

parent b1dc7820
......@@ -193,7 +193,7 @@ contains
ap=t_atompar(id=id,nucnumber=z,rmt=rmt,rmt_min=rmt_min,jri=jri,dx=dx,bmu=bmu,lmax=lmax,lnonsph=lnonsph,lo=lo,econfig=econfig,desc=desc)
ELSE
!try old namelist
CALL read_params_old(ap)
CALL read_params_old(99,ap)
END IF
CALL add_atompar(ap)
ENDIF
......@@ -201,8 +201,9 @@ contains
100 CLOSE(99)
END SUBROUTINE read_params
SUBROUTINE read_params_old(ap)
SUBROUTINE read_atom_params_old(fh,ap)
!Try to read old namelist
integer,intent(in)::fh
TYPE(t_atompar),INTENT(out)::ap
REAL:: id,z,rmt,dx,bmu
......@@ -213,11 +214,11 @@ contains
id=-9999.9;z=-1.0;rmt=0.0;dx=0.0;jri=0;lmax=0;lnonsph=0;ncst=-1;lo='';econfig='';name='';bmu=-9999.0
BACKSPACE(99)
READ(99,atom,iostat=io_stat)
BACKSPACE(fh)
READ(fh,atom,iostat=io_stat)
IF(io_stat.NE.0) THEN
BACKSPACE(99)
READ(99,*) name
BACKSPACE(fh)
READ(fh,*) name
WRITE(*,*) name
CALL judft_error("Found a &atom namelist in input that was incorrect")
END IF
......
......@@ -19,7 +19,7 @@ CONTAINS
REAL, INTENT(IN) :: amat,dvac
TYPE(t_noco),INTENT(in) :: noco
TYPE(t_cell),INTENT(out) ::cell
TYPE(t_cell),INTENT(in) ::cell
TYPE(t_sym),INTENT(out) ::sym
TYPE(t_atoms),INTENT(out) ::atoms
......@@ -28,14 +28,7 @@ CONTAINS
INTEGER :: i,j,k,n,m,na,nt,inversionOp
REAL,PARAMETER :: eps7 = 1.0e-7
!Generate cell-datatype
cell%amat=amat
IF (film) THEN
CALL cell%init(dvac)
ELSE
CALL cell%init()
ENDIF
!generate basic atom type
......
This diff is collapsed.
This diff is collapsed.
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