comp-chem/cp2k
1
0
Fork 0
mirror of https://github.com/cp2k/cp2k.git synced 2026-07-27 13:45:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add file discovery mechanism to xml_parser

Browse source 
svn-origin-rev: 15327
This commit is contained in:
Ole Schütt 2015-05-21 06:56:28 +00:00
parent aafac6e1e9
commit 8d00f99d41
2 changed files with 15 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/common/xml_parser.F
View file

@ -45,6 +45,9 @@
! - simple checking via a table: parent, tag, id, min, max
!
MODULE xml_parser
USE cp_files, ONLY: close_file,&
file_exists,&
open_file
IMPLICIT NONE
@ -266,8 +269,7 @@ SUBROUTINE xml_open( info, fname, mustread )
CHARACTER(len=*), INTENT(in) :: fname
LOGICAL, INTENT(in) :: mustread
INTEGER :: i, ierr, k, kend
LOGICAL :: exists, opend
INTEGER :: ierr, k, kend
info%lun = 10
info%ignore_whitespace = .FALSE.
@ -279,23 +281,16 @@ SUBROUTINE xml_open( info, fname, mustread )
info%level = -1
info%lineno = 0
DO i = 10,99
INQUIRE( unit = i, opened = opend )
IF ( .NOT. opend ) THEN
info%lun = i
INQUIRE( file = fname, exist = exists )
IF ( .NOT. exists .AND. mustread ) THEN
CALL xml_report_errors( 'XML_OPEN: file does not exist:', TRIM(fname))
info%lun = -1
info%error = .TRUE.
ELSE
OPEN( unit = info%lun, file = fname )
CALL xml_report_details( 'XML_OPEN: opened file ', TRIM(fname) )
CALL xml_report_details( 'at LU-number: ', info%lun )
ENDIF
EXIT
ENDIF
ENDDO
IF ( .NOT. file_exists(fname) .AND. mustread ) THEN
CALL xml_report_errors( 'XML_OPEN: file does not exist:', TRIM(fname))
info%lun = -1
info%error = .TRUE.
ELSE
CALL open_file(file_name=fname, unit_number=info%lun)
CALL xml_report_details( 'XML_OPEN: opened file ', TRIM(fname) )
CALL xml_report_details( 'at LU-number: ', info%lun )
ENDIF
IF ( .NOT. info%error .AND. mustread ) THEN
k = 1
DO WHILE ( k .GE. 1 )
@ -341,7 +336,7 @@ END SUBROUTINE xml_open
SUBROUTINE xml_close( info )
TYPE(XML_PARSE), INTENT(inout) :: info
CLOSE( info%lun )
CALL close_file(info%lun)
!
! Only clean up the LU-number, so that the calling program

2
tools/conventions/conventions.supp
View file

@ -743,8 +743,6 @@ xc_xpbe_hole_t_c_lr.F: Unused dummy argument 'epsilon_norm_drho' at (1)
xc_xpbe_hole_t_c_lr.F: Unused dummy argument 'ndrho' at (1)
xc_xwpbe.F: Unused dummy argument 'epsilon_norm_drho' at (1)
xml_parser.F: Copyright banner malformed
xml_parser.F: Found CLOSE statement in procedure "xml_close"
xml_parser.F: Found OPEN statement in procedure "xml_open"
xyz_to_vab_optimised.F: Routine XYZ_TO_VAB called with an implicit interface.
xyz_to_vab_optimised.F: Routine XYZ_TO_VAB_0_0 called with an implicit interface.
xyz_to_vab_optimised.F: Routine XYZ_TO_VAB_0_1 called with an implicit interface.