Skip to content

GitLab

fleur
fleur
Commit 314e972b authored by Daniel Wortmann's avatar Daniel Wortmann
Browse files
Options

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

parents ea79d409 d9f23c38
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3579 additions and 55 deletions
cmake/Files_and_Targets.txt
View file @ 314e972b
include_directories(include)
set(c_files io/xml/inputSchema.h io/xml/dropInputSchema.c)
set(fleur_F90 main/fleur.F90)
set(fleur_F77 "")
include(eigen/CMakeLists.txt)
......@@ -37,12 +39,14 @@ inpgen/atom_sym.f inpgen/generator.f inpgen/read_record.f inpgen/soc_or_ssdw.f i
inpgen/bravais_symm.f inpgen/set_atom_core.f inpgen/spg_gen.f global/triang.f
inpgen/closure.f inpgen/lapw_input.f inpgen/struct_input.f inpgen/write_struct.f
global/hybridmix.f io/calculator.f global/ss_sym.f global/soc_sym.f math/inv3.f io/rw_symfile.f
global/sort.f
global/sort.f init/kptgen_hybrid.f init/od_kptsgen.f init/bravais.f init/divi.f init/brzone.f
init/kptmop.f init/kpttet.f init/bandstr1.F init/ordstar.f init/fulstar.f init/kprep.f
init/tetcon.f init/kvecon.f
)
set(inpgen_F90 io/xsf_io.f90
global/types.F90 global/enpara.f90 global/chkmt.f90 inpgen/inpgen.f90 inpgen/set_inp.f90 io/rw_inp.f90 juDFT/juDFT.F90
juDFT/stop.F90 juDFT/time.F90 juDFT/init.F90)
juDFT/stop.F90 juDFT/time.F90 juDFT/init.F90 io/w_inpXML.f90 init/julia.f90)
set(fleur_SRC ${fleur_F90} ${fleur_F77})
......@@ -57,12 +61,12 @@ add_executable(fleur ${fleur_SRC} ${c_files})
target_link_libraries(fleur ${HDF5_LIBS} ${LAPACK_LIBS})
set_target_properties(fleur PROPERTIES Fortran_MODULE_DIRECTORY fleur_modules COMPILE_OPTIONS -Ifleur_modules)
add_executable(fleur_INVS ${fleur_SRC})
add_executable(fleur_INVS ${fleur_SRC} ${c_files})
target_link_libraries(fleur_INVS ${HDF5_LIBS} ${LAPACK_LIBS})
target_compile_definitions(fleur_INVS PUBLIC -DCPP_INVERSION)
set_target_properties(fleur_INVS PROPERTIES Fortran_MODULE_DIRECTORY fleur_INVS_modules COMPILE_OPTIONS -Ifleur_INVS_modules)
add_executable(fleur_SOC ${fleur_SRC})
add_executable(fleur_SOC ${fleur_SRC} ${c_files})
target_link_libraries(fleur_SOC ${HDF5_LIBS} ${LAPACK_LIBS})
target_compile_definitions(fleur_SOC PUBLIC -DCPP_SOC)
set_target_properties(fleur_SOC PROPERTIES Fortran_MODULE_DIRECTORY fleur_SOC_modules COMPILE_OPTIONS -Ifleur_SOC_modules)
......@@ -83,21 +87,21 @@ if(${Fleur_uses_MPI})
set(MPI_DEFINITIONS -DCPP_MPI ${MPI_DEFINITIONS})
#fleur_MPI
add_executable(fleur_MPI ${juDFT_HDF} ${juDFT_SRC_F90} ${fleur_SRC}
add_executable(fleur_MPI ${juDFT_HDF} ${juDFT_SRC_F90} ${fleur_SRC} ${c_files}
${fleur_SRC_MPI})
target_compile_definitions(fleur_MPI PUBLIC ${MPI_DEFINITIONS})
target_link_libraries(fleur_MPI ${HDF5_LIBS} ${LAPACK_LIBS})
set_target_properties(fleur_MPI PROPERTIES Fortran_MODULE_DIRECTORY fleur_MPI_modules COMPILE_OPTIONS -Ifleur_MPI_modules)
#fleur_INVS_MPI
add_executable(fleur_INVS_MPI ${juDFT_HDF} ${juDFT_SRC_F90} ${fleur_SRC}
add_executable(fleur_INVS_MPI ${juDFT_HDF} ${juDFT_SRC_F90} ${fleur_SRC} ${c_files}
${fleur_SRC_MPI})
target_link_libraries(fleur_INVS_MPI ${HDF5_LIBS} ${LAPACK_LIBS})
target_compile_definitions(fleur_INVS_MPI PUBLIC ${MPI_DEFINITIONS} -DCPP_INVERSION)
set_target_properties(fleur_INVS_MPI PROPERTIES Fortran_MODULE_DIRECTORY fleur_INVS_MPI_modules COMPILE_OPTIONS -Ifleur_INVS_MPI_modules)
#fleur_SOC_MPI
add_executable(fleur_SOC_MPI ${juDFT_HDF} ${juDFT_SRC_F90} ${fleur_SRC}
add_executable(fleur_SOC_MPI ${juDFT_HDF} ${juDFT_SRC_F90} ${fleur_SRC} ${c_files}
${fleur_SRC_MPI})
target_link_libraries(fleur_SOC_MPI ${HDF5_LIBS} ${LAPACK_LIBS})
target_compile_definitions(fleur_SOC_MPI PUBLIC ${MPI_DEFINITIONS} -DCPP_SOC)
......@@ -106,7 +110,7 @@ ${fleur_SRC_MPI})
endif ()
#inpgen executable
add_executable(inpgen ${inpgen_F77} ${inpgen_F90} ${juDFT_SRC_F90})
add_executable(inpgen ${inpgen_F77} ${inpgen_F90} ${juDFT_SRC_F90} ${c_files})
set_target_properties(inpgen PROPERTIES Fortran_MODULE_DIRECTORY inpgen_modules COMPILE_OPTIONS -Iinpgen_modules)
......
global/types.F90
View file @ 314e972b
......@@ -246,9 +246,10 @@
TYPE t_kpts
!no
INTEGER ::nkpts
INTEGER ::nkpt
INTEGER ::nkptd
INTEGER :: nkpts
INTEGER :: nkpt
INTEGER :: nkptd
LOGICAL :: l_gamma
INTEGER :: nmop(3) !<number of k-points in 3 directions
!(3,nkpts) k-vectors internal units
REAL,ALLOCATABLE ::bk(:,:)
......
init/dimen7.F90
View file @ 314e972b
......@@ -331,7 +331,7 @@
sym%nop2=1
CALL julia(&
& sym,cell,input,noco,banddos,&
& kpts,.false.)
& kpts,.false.,.FALSE.)
sym%nop=n1
sym%nop2=n2
ELSE IF(l_gamma .and. banddos%ndir .eq. 0) THEN
......@@ -341,7 +341,7 @@
ELSE
CALL julia(&
& sym,cell,input,noco,banddos,&
& kpts,.false.)
& kpts,.false.,.FALSE.)
ENDIF
ELSE
CALL od_kptsgen (kpts%nkpt)
......@@ -381,7 +381,7 @@
noco%l_soc=.false.
CALL julia(&
& sym,cell,input,noco,banddos,&
& kpts,.true.)
& kpts,.true.,.FALSE.)
noco%l_ss=l_tmp(1); noco%l_soc=l_tmp(2)
ENDIF
......
init/julia.f90
View file @ 314e972b
......@@ -3,7 +3,7 @@
CONTAINS
SUBROUTINE julia(&
& sym,cell,input,noco,banddos,&
& kpts,l_q)
& kpts,l_q,l_fillArrays)
!----------------------------------------------------------------------+
! Generate a k-point file with approx. nkpt k-pts or a Monkhorst-Pack |
! set with nmod(i) divisions in i=x,y,z direction. Interface to kptmop |
......@@ -27,7 +27,7 @@
TYPE(t_banddos),INTENT(IN) :: banddos
TYPE(t_kpts),INTENT(INOUT) :: kpts
LOGICAL, INTENT (IN) :: l_q
LOGICAL, INTENT (IN) :: l_q, l_fillArrays
INTEGER, PARAMETER :: nop48 = 48
INTEGER, PARAMETER :: mface = 51
......@@ -103,6 +103,7 @@
! oblique = p-monoclinic ( 1+2 axis ) 6/1
!
!------------------------------------------------------------
IF(l_q) THEN
trias=input%tria
input%tria=.false.
......@@ -246,6 +247,7 @@
ndiv3 = 6*(mkpt+1)
ALLOCATE (vkxyz(3,mkpt),wghtkp(mkpt) )
ALLOCATE ( voltet(ndiv3),vktet(3,mkpt),ntetra(4,ndiv3) )
vkxyz = 0.0
CALL kpttet(&
& iofile,ibfile,iokpt,&
& kpri,ktest,kmidtet,mkpt,ndiv3,&
......@@ -269,6 +271,7 @@
& kpts%nkpt,cell%bmat,input%film,sym%nop,sym%nop2,&
& kpts%nmop)
ENDIF
!
! Now calculate Monkhorst-Pack k-points:
!
......@@ -282,6 +285,7 @@
IF (.not.input%film) mkpt = mkpt*kpts%nmop(3)
ENDIF
ALLOCATE (vkxyz(3,mkpt),wghtkp(mkpt) )
vkxyz = 0.0
CALL kptmop(&
& iofile,iokpt,kpri,ktest,&
......@@ -292,6 +296,7 @@
& kpts%nkpt,divis,vkxyz,nkstar,wghtkp)
ENDIF
!
idivis(1) = int(divis(1))
idivis(2) = int(divis(2))
......@@ -332,29 +337,47 @@
8050 FORMAT (2(f14.10,1x),f14.10)
!
! write k-points file
! write k-points file or write data into arrays
!
OPEN (41,file='kpts',form='formatted',status='new')
IF (input%film) THEN
WRITE (41,FMT=8110) kpts%nkpt,real(idiv),.false.
DO j=kpts%nkpt,1,-1
WRITE (41,FMT=8040) (vkxyz(i,j),i=1,2),wghtkp(j)
ENDDO
IF (l_fillArrays) THEN
IF (ALLOCATED(kpts%bk)) THEN
DEALLOCATE(kpts%bk)
END IF
IF (ALLOCATED(kpts%weight)) THEN
DEALLOCATE(kpts%weight)
END IF
ALLOCATE(kpts%bk(3,kpts%nkpt),kpts%weight(kpts%nkpt))
DO j = 1, kpts%nkpt
kpts%bk(1,j) = vkxyz(1,j) / real(idiv)
kpts%bk(2,j) = vkxyz(2,j) / real(idiv)
kpts%bk(3,j) = vkxyz(3,j) / real(idiv)
kpts%weight(j) = wghtkp(j)
END DO
ELSE
WRITE (41,FMT=8100) kpts%nkpt,real(idiv)
DO j = 1, kpts%nkpt
WRITE (41,FMT=8040) (vkxyz(i,j),i=1,3),wghtkp(j)
ENDDO
IF (input%tria.AND.random) THEN
WRITE (41,'(i5)') ntet
WRITE (41,'(4(4i6,4x))') ((ntetra(i,j),i=1,4),j=1,ntet)
WRITE (41,'(4f20.13)') (ABS(voltet(j)),j=1,ntet)
ENDIF
OPEN (41,file='kpts',form='formatted',status='new')
IF (input%film) THEN
WRITE (41,FMT=8110) kpts%nkpt,real(idiv),.false.
DO j=kpts%nkpt,1,-1
WRITE (41,FMT=8040) (vkxyz(i,j),i=1,2),wghtkp(j)
END DO
ELSE
WRITE (41,FMT=8100) kpts%nkpt,real(idiv)
DO j = 1, kpts%nkpt
WRITE (41,FMT=8040) (vkxyz(i,j),i=1,3),wghtkp(j)
END DO
IF (input%tria.AND.random) THEN
WRITE (41,'(i5)') ntet
WRITE (41,'(4(4i6,4x))') ((ntetra(i,j),i=1,4),j=1,ntet)
WRITE (41,'(4f20.13)') (ABS(voltet(j)),j=1,ntet)
END IF
END IF
8100 FORMAT (i5,f20.10)
8110 FORMAT (i5,f20.10,3x,l1)
8040 FORMAT (4f10.5)
CLOSE (41)
END IF
8100 FORMAT (i5,f20.10)
8110 FORMAT (i5,f20.10,3x,l1)
8040 FORMAT (4f10.5)
CLOSE (41)
DEALLOCATE ( vkxyz,wghtkp )
IF (input%tria.AND..not.input%film) DEALLOCATE ( voltet,vktet,ntetra )
......
inpgen/atom_input.f
View file @ 314e972b
......@@ -59,7 +59,7 @@
INTEGER :: natomst,ncorest,nvalst,z,nlo0
INTEGER :: xmlCoreStateNumber
REAL :: rmt0_def,dx0_def,bmu0_def
REAL :: rmt0,dx0,bmu0,zat0,id
REAL :: rmt0,dx0,bmu0,zat0,id,electronsOnAtom
LOGICAL :: fatalerror, h_atom, h_allatoms
LOGICAL :: idone(ntype)
INTEGER :: lonqn(nlod,ntype),skiplo(ntype),z_int(ntype)
......@@ -365,6 +365,7 @@
write(27,'(i3)') natomst
WRITE (6,*) '----------'
electronsOnAtom = 0
DO i = 1, ncorest
WRITE(6,'(" core :",2i3,f6.1)')
& coreqn(1,i,n),coreqn(2,i,n),coreocc(i,n)
......@@ -427,12 +428,14 @@
END SELECT
xmlCoreOccs(1,xmlCoreStateNumber,n) = up
xmlCoreOccs(2,xmlCoreStateNumber,n) = dn
electronsOnAtom = electronsOnAtom + up + dn
ENDDO
DO i = ncorest+1, natomst
WRITE(6,'(" valence :",2i3,f6.1,i4,a1)')
& coreqn(1,i,n),coreqn(2,i,n),coreocc(i,n),
& coreqn(1,i,n),lotype(lval(i,n))
nel = nel + coreocc(i,n) *neq(n)
electronsOnAtom = electronsOnAtom + coreocc(i,n)
c In d and f shells a magnetic alignment of the spins
c is preferred in the valence bands
......@@ -463,6 +466,15 @@ c in s and p states equal occupation of up and down states
& coreqn(1,i,n),lotype(lval(i,n))
ENDDO
WRITE (6,*) '----------'
5392 FORMAT (' atom type: ',i5,' protons: ',f0.8,' electrons: ',f0.8)
IF (ABS(electronsOnAtom-zatom(n)).GT.1e-13) THEN
WRITE(*,*) 'Note: atom is charged. Is this Intended?'
WRITE(*,5392) n, zatom(n), electronsOnAtom
WRITE(6,*) 'Note: atom is charged. Is this Intended?'
WRITE(6,5392) n, zatom(n), electronsOnAtom
END IF
CLOSE(27)
DO i = natomst,1,-1 ! determine valence states
......
inpgen/element.f
View file @ 314e972b
......@@ -19,7 +19,7 @@
& ele(1:1) = achar( iachar(ele(1:1))-adiff )
z_namat = -1
DO n = 0, size(namat_const)
DO n = 0, size(namat_const)-1
IF ( ele == namat_const(n) ) THEN
z_namat = n
EXIT
......
inpgen/inpgen.f90
View file @ 314e972b
......@@ -20,11 +20,11 @@ PROGRAM inpgen
IMPLICIT NONE
INTEGER natmax,nop48,nline,natin,ngen,i,j
INTEGER nops,no3,no2,na
INTEGER nops,no3,no2,na,numSpecies
INTEGER infh,errfh,bfh,warnfh,symfh,dbgfh,outfh,dispfh
LOGICAL cal_symm,checkinp
LOGICAL cal_symm,checkinp,newSpecies
LOGICAL cartesian,oldfleur,l_hyb ,inistop
REAL aa
REAL aa
REAL a1(3),a2(3),a3(3),scale(3),factor(3)
INTEGER, ALLOCATABLE :: mmrot(:,:,:)
......@@ -32,6 +32,7 @@ PROGRAM inpgen
REAL, ALLOCATABLE :: idlist(:)
INTEGER, ALLOCATABLE :: ntyrep(:) ! these variables are allocated with
INTEGER, ALLOCATABLE :: natype(:),natrep(:),natmap(:) ! or 'nat'
INTEGER, ALLOCATABLE :: speciesRepAtomType(:),atomTypeSpecies(:)
INTEGER, PARAMETER :: xl_buffer=16384 ! maximum length of read record
CHARACTER(len=xl_buffer) :: buffer
......@@ -48,7 +49,7 @@ PROGRAM inpgen
TYPE(t_vacuum) :: vacuum
nop48 = 48
natmax = 5999
natmax = 9999
ngen = 0
infh = 5
errfh = 6 ; warnfh = 6 ; dbgfh = 6 ; outfh = 6
......@@ -146,7 +147,7 @@ PROGRAM inpgen
DO i=1,atoms%nat
atoms%pos(:,i) = matmul( cell%amat , atoms%taual(:,i) )
ENDDO
DEALLOCATE ( ntyrep, natype, natrep, atomid )
!
! --> write a file 'sym.out' with accepted symmetry operations
!
......@@ -157,15 +158,42 @@ PROGRAM inpgen
& 'W',symfh,symfn,nops,cell%bmat,&
& sym%mrot,sym%tau,sym%nop,sym%nop2,sym%symor)
ALLOCATE (atomTypeSpecies(atoms%ntype))
ALLOCATE (speciesRepAtomType(atoms%nat))
numSpecies = 0
speciesRepAtomType = -1
atomTypeSpecies = -1
DO i = 1, atoms%nat
newSpecies = .TRUE.
DO j = 1, i-1
IF(atomid(i).EQ.atomid(j)) THEN
newSpecies = .FALSE.
atomTypeSpecies(natype(i)) = atomTypeSpecies(natype(j))
EXIT
END IF
END DO
IF(newSpecies) THEN
numSpecies = numSpecies + 1
speciesRepAtomType(numSpecies) = natype(i)
atomTypeSpecies(natype(i)) = numSpecies
END IF
END DO
!
! --> set defaults for FLEUR inp-file
!
ALLOCATE ( atoms%rmt(atoms%ntype) )
atoms%nlod=9 ! This fixed dimensioning might have to be made more dynamical!
CALL set_inp(&
& infh,nline,xl_buffer,buffer,l_hyb,&
& atoms,sym,cell,title,idlist,&
& input,vacuum,noco,&
& atomTypeSpecies,speciesRepAtomType,&
& a1,a2,a3)
DEALLOCATE (atomTypeSpecies,speciesRepAtomType)
DEALLOCATE ( ntyrep, natype, natrep, atomid )
!
! --> Structure in povray or xsf-format
!
......
inpgen/set_inp.f90
View file @ 314e972b
......@@ -10,14 +10,23 @@
& infh,nline,xl_buffer,buffer,l_hyb,&
& atoms,sym,cell,title,idlist,&
& input,vacuum,noco,&
& atomTypeSpecies,speciesRepAtomType,&
& a1,a2,a3)
USE iso_c_binding
USE m_chkmt
USE m_constants, ONLY : namat_const
USE m_constants
USE m_atominput
USE m_lapwinput
USE m_rwinp
USE m_winpXML
USE m_types
USE m_juDFT_init
USE m_julia
USE m_kptgen_hybrid
USE m_od_kptsgen
USE m_inv3
IMPLICIT NONE
TYPE(t_input),INTENT(INOUT) :: input
TYPE(t_vacuum),INTENT(INOUT) :: vacuum
......@@ -28,14 +37,16 @@
INTEGER, INTENT (IN) :: infh,xl_buffer
INTEGER, INTENT (INOUT) :: nline
INTEGER, INTENT (IN) :: atomTypeSpecies(atoms%ntype)
INTEGER, INTENT (IN) :: speciesRepAtomType(atoms%nat)
CHARACTER(len=xl_buffer) :: buffer
LOGICAL, INTENT (IN) :: l_hyb
REAL, INTENT (IN) :: idlist(:)
REAL, INTENT (INOUT) :: a1(3),a2(3),a3(3)
CHARACTER(len=80), INTENT (IN) :: title
INTEGER nel,i,j
REAL kmax,dtild,dvac1,n1,n2,gam,kmax0,dtild0,dvac0
INTEGER nel,i,j, nkptOld
REAL kmax,dtild,dvac1,n1,n2,gam,kmax0,dtild0,dvac0,sumWeight
LOGICAL l_test,l_gga,l_exists
REAL dx0(atoms%ntype), rmtTemp(atoms%ntype)
INTEGER div(3)
......@@ -45,9 +56,10 @@
CHARACTER(len=8) :: name(10)
CHARACTER(len=3) :: noel(atoms%ntype)
CHARACTER(len=12) :: relcor
CHARACTER(len=3) :: latnamTemp
INTEGER nu,iofile
INTEGER iggachk
INTEGER n ,iostat
INTEGER n ,iostat, errorStatus
REAL scale,scpos ,zc
REAL el0(0:3,atoms%ntype),ello0(atoms%nlod,atoms%ntype),evac0(2)
......@@ -79,6 +91,14 @@
LOGICAL :: xmlPrintCoreStates(29,atoms%ntype)
REAL :: xmlCoreOccs(2,29,atoms%ntype)
REAL :: xmlCoreRefOccs(29)
interface
function dropInputSchema() bind(C, name="dropInputSchema")
use iso_c_binding
INTEGER(c_int) dropInputSchema
end function dropInputSchema
end interface
DATA xmlCoreRefOccs /2,2,2,4,2,2,4,2,4,6,2,4,2,4,6,2,4,2,6,8,4,&
& 6,2,4,2,6,8,4,6/
xmlCoreStates = .FALSE.
......@@ -316,21 +336,91 @@
nu = 8
input%gw = 0
CALL rw_inp(&
& ch_rw,atoms,obsolete,vacuum,input,stars,sliceplot,banddos,&
& cell,sym,xcpot,noco,jij,oneD,hybrid,kpts,&
& noel,namex,relcor,a1,a2,a3,scale,dtild,name)
iofile = 6
OPEN (iofile,file='inp',form='formatted',status='old',position='append')
IF (kpts%nkpt == 0) THEN ! set some defaults for the k-points
IF (input%film) THEN
cell%area = cell%omtil / vacuum%dvac
kpts%nkpt = nint((3600/cell%area)/sym%nop2)
ELSE
kpts%nkpt = nint((216000/cell%omtil)/sym%nop)
kpts%nkpt = nint((216000/cell%omtil)/sym%nop)
ENDIF
ENDIF
IF(.NOT.juDFT_was_argument("-noXML")) THEN
nkptOld = kpts%nkpt
latnamTemp = cell%latnam
IF(juDFT_was_argument("-explicit")) THEN
! kpts generation
CALL inv3(cell%amat,cell%bmat,cell%omtil)
cell%bmat=tpi_const*cell%bmat
kpts%nmop(:) = div(:)
kpts%l_gamma = l_gamma
IF (.NOT.oneD%odd%d1) THEN
IF (jij%l_J) THEN
n1=sym%nop
n2=sym%nop2
sym%nop=1
sym%nop2=1
CALL julia(sym,cell,input,noco,banddos,kpts,.FALSE.,.TRUE.)
sym%nop=n1
sym%nop2=n2
ELSE IF(kpts%l_gamma .and. banddos%ndir .eq. 0) THEN
STOP 'Error: No kpoint set generation for gamma=T yet!'
CALL kptgen_hybrid(kpts%nmop(1),kpts%nmop(2),kpts%nmop(3),&
kpts%nkpt,sym%invs,noco%l_soc,sym%nop,&
sym%mrot,sym%tau)
ELSE
CALL julia(sym,cell,input,noco,banddos,kpts,.FALSE.,.TRUE.)
END IF
ELSE
STOP 'Error: No kpoint set generation for 1D systems yet!'
CALL od_kptsgen (kpts%nkpt)
END IF
kpts%nkpts = kpts%nkpt
ALLOCATE(kpts%wtkpt(kpts%nkpt))
sumWeight = 0.0
WRITE(*,*) 'nkpt: ', kpts%nkpt
DO i = 1, kpts%nkpt
sumWeight = sumWeight + kpts%weight(i)
END DO
DO i = 1, kpts%nkpt
kpts%weight(i) = kpts%weight(i) / sumWeight
kpts%wtkpt(i) = kpts%weight(i)
END DO
kpts%nkptd = kpts%nkpt
!set latnam to any
cell%latnam = 'any'
END IF
errorStatus = 0
errorStatus = dropInputSchema()
IF(errorStatus.NE.0) THEN
STOP 'Error: Cannot print out FleurInputSchema.xsd'
END IF
CALL w_inpXML(&
& atoms,obsolete,vacuum,input,stars,sliceplot,banddos,&
& cell,sym,xcpot,noco,jij,oneD,hybrid,kpts,div,l_gamma,&
& noel,namex,relcor,a1,a2,a3,scale,dtild,name,&
& xmlCoreStates,xmlPrintCoreStates,xmlCoreOccs,&
& atomTypeSpecies,speciesRepAtomType,&
& el0,ello0,evac0)
kpts%nkpt = nkptOld
cell%latnam = latnamTemp
END IF !xml output
CALL rw_inp(&
& ch_rw,atoms,obsolete,vacuum,input,stars,sliceplot,banddos,&
& cell,sym,xcpot,noco,jij,oneD,hybrid,kpts,&
& noel,namex,relcor,a1,a2,a3,scale,dtild,name)
iofile = 6
OPEN (iofile,file='inp',form='formatted',status='old',position='append')
IF( l_hyb ) THEN
WRITE (iofile,FMT=9999) product(nkpt3),nkpt3,l_gamma
ELSE IF( (div(1) == 0).OR.(div(2) == 0) ) THEN
......
io/w_inpXML.f90 0 → 100644
View file @ 314e972b
This diff is collapsed.
io/xml/dropInputSchema.c 0 → 100644
View file @ 314e972b
#include <stdio.h>
#include "inputSchema.h"
/*
* This method together with the variables defined in inputSchema.h
* writes out the file FleurInputFormat.xsd.
* GM'16
*/
int dropInputSchema()
{
char schemaString[FleurInputFormat_xsd_len + 1];
int i = 0;
int errorCode = 0;
FILE *file;
for (i = 0 ; i < FleurInputFormat_xsd_len ; ++i)
{
schemaString[i] = FleurInputFormat_xsd[i];
}
schemaString[FleurInputFormat_xsd_len] = '\0';
file = fopen("FleurInputSchema.xsd", "w");
errorCode = fprintf(file,"%s", schemaString);
fclose(file);
if(errorCode < 0) return 1;
return 0;
}
/*
* How to create the file inputSchema.h if the XML Schema has to be
* changed:
*
* You have to write it by hand. ;)
* ...But if you prefer an automatic generation just follow this recipe:
*
* 1. Generate the file FleurInputFormat.xsd with the dropInputSchema
* method in this file.
* 2. Change the XML Schema file as desired.
* 3. run: xxd -i FleurInputSchema.xsd inputSchema.h
* (Note that the name of the file FleurInputSchema.xsd determines
* the names of the variables)
* 4. The new inputSchema.h is generated.
*/
io/xml/inputSchema.h 0 → 100644
View file @ 314e972b
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