mirror of https://gitlab.com/QEF/q-e.git
prevent run_nscf from trying to write unitialized elements of the qexsd schema. Changed the name of the <<input>> variable of qexsd_module into the less equivocal name qexsd_input_obj
git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@12435 c92efa57-630b-4861-b058-cf58834340f0
This commit is contained in:
parent
ccd3cf5ba4
commit
e9c532cec4
|
@ -62,7 +62,7 @@ MODULE qexsd_module
|
|||
!
|
||||
CHARACTER(iotk_attlenx) :: attr
|
||||
!
|
||||
TYPE (input_type) :: input
|
||||
TYPE (input_type) :: qexsd_input_obj
|
||||
TYPE (general_info_type) :: general_info
|
||||
TYPE (parallel_info_type) :: parallel_info
|
||||
TYPE (berryPhaseOutput_type) :: qexsd_bp_obj
|
||||
|
@ -77,7 +77,7 @@ MODULE qexsd_module
|
|||
PUBLIC :: qexsd_current_version, qexsd_default_version
|
||||
PUBLIC :: qexsd_current_version_init
|
||||
!
|
||||
PUBLIC :: input
|
||||
PUBLIC :: qexsd_input_obj
|
||||
!
|
||||
PUBLIC :: qexsd_init_schema, qexsd_openschema, qexsd_closeschema
|
||||
!
|
||||
|
@ -178,8 +178,8 @@ CONTAINS
|
|||
CALL qes_reset_parallel_info(parallel_info)
|
||||
IF ( check_file_exst(input_xml_schema_file) ) THEN
|
||||
CALL qexsd_cp_line_by_line(ounit,input_xml_schema_file, spec_tag="input")
|
||||
ELSE
|
||||
CALL qes_write_input(ounit,input)
|
||||
ELSE IF ( TRIM(qexsd_input_obj%tagname) == "input") THEN
|
||||
CALL qes_write_input(ounit,qexsd_input_obj)
|
||||
END IF
|
||||
IF (ALLOCATED(steps) ) THEN
|
||||
len_steps= step_counter
|
||||
|
@ -254,17 +254,19 @@ CONTAINS
|
|||
CHARACTER(len=17) :: subname = 'qexsd_closeschema'
|
||||
INTEGER :: ierr
|
||||
!
|
||||
CALL qes_write_status(ounit, exit_status)
|
||||
CALL qexsd_set_closed()
|
||||
CALL iotk_write_begin(ounit, "cputime", attr="",new_line=.FALSE.)
|
||||
IF (TRIM(exit_status%tagname) == "status") THEN
|
||||
CALL qes_write_status(ounit, exit_status)
|
||||
CALL qexsd_set_closed()
|
||||
CALL iotk_write_begin(ounit, "cputime", attr="",new_line=.FALSE.)
|
||||
!
|
||||
WRITE(ounit, '(I0)', advance = 'no' ) nint(get_clock('PWSCF'))
|
||||
CALL iotk_write_end(ounit, "cputime",indentation=.FALSE.)
|
||||
CALL qes_write_closed(ounit, qexsd_closed_element)
|
||||
CALL iotk_close_write(ounit, IERR=ierr)
|
||||
WRITE(ounit, '(I0)', advance = 'no' ) nint(get_clock('PWSCF'))
|
||||
CALL iotk_write_end(ounit, "cputime",indentation=.FALSE.)
|
||||
CALL qes_write_closed(ounit, qexsd_closed_element)
|
||||
CALL iotk_close_write(ounit, IERR=ierr)
|
||||
!
|
||||
CALL errore(subname, 'closing xml input file', ierr)
|
||||
CALL errore(subname, 'closing xml input file', ierr)
|
||||
!
|
||||
END IF
|
||||
END SUBROUTINE qexsd_closeschema
|
||||
!
|
||||
!
|
||||
|
|
|
@ -292,7 +292,7 @@ SUBROUTINE iosys()
|
|||
USE input_parameters, ONLY : deallocate_input_parameters
|
||||
USE wyckoff, ONLY : nattot, sup_spacegroup
|
||||
#ifdef __XSD
|
||||
USE qexsd_module, ONLY : input
|
||||
USE qexsd_module, ONLY : qexsd_input_obj
|
||||
USE qes_types_module, ONLY: input_type
|
||||
!
|
||||
IMPLICIT NONE
|
||||
|
@ -1539,7 +1539,7 @@ SUBROUTINE iosys()
|
|||
! ... End of reading input parameters
|
||||
!
|
||||
#ifdef __XSD
|
||||
CALL pw_init_qexsd_input(input,obj_tagname="input")
|
||||
CALL pw_init_qexsd_input(qexsd_input_obj, obj_tagname="input")
|
||||
#endif
|
||||
CALL deallocate_input_parameters ()
|
||||
!
|
||||
|
|
Loading…
Reference in New Issue