Commit 059393a6 authored by Gregor Michalicek's avatar Gregor Michalicek

Adjusted io/xml/FleurOutputSchema.xsd to new changes in out.xml

...also renamed everything new in out.xml.
@Daniel: Sorry, could not resist. ;)
parent 386efe29
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
<xsd:complexType name="ProgramVersionType"> <xsd:complexType name="ProgramVersionType">
<xsd:all> <xsd:all>
<xsd:element maxOccurs="1" minOccurs="0" name="compilationInfo" type="CompilationInfoType"/>
<xsd:element maxOccurs="1" minOccurs="0" name="gitInfo" type="GitInfoType"/>
<xsd:element maxOccurs="1" minOccurs="0" name="targetComputerArchitectures" type="xsd:string"/> <xsd:element maxOccurs="1" minOccurs="0" name="targetComputerArchitectures" type="xsd:string"/>
<xsd:element maxOccurs="1" minOccurs="0" name="precision" type="PrecisionType"/> <xsd:element maxOccurs="1" minOccurs="0" name="precision" type="PrecisionType"/>
<xsd:element maxOccurs="1" minOccurs="0" name="targetStructureClass" type="TargetStructureClassType"/> <xsd:element maxOccurs="1" minOccurs="0" name="targetStructureClass" type="TargetStructureClassType"/>
...@@ -25,6 +27,17 @@ ...@@ -25,6 +27,17 @@
<xsd:attribute name="version" type="xsd:string" use="required"/> <xsd:attribute name="version" type="xsd:string" use="required"/>
</xsd:complexType> </xsd:complexType>
<xsd:complexType name="CompilationInfoType">
<xsd:attribute name="date" type="xsd:string" use="required"/>
<xsd:attribute name="user" type="xsd:string" use="required"/>
<xsd:attribute name="host" type="xsd:string" use="required"/>
</xsd:complexType>
<xsd:complexType name="GitInfoType">
<xsd:attribute name="version" type="xsd:string" use="required"/>
<xsd:attribute name="lastCommitHash" type="xsd:string" use="required"/>
</xsd:complexType>
<xsd:complexType name="PrecisionType"> <xsd:complexType name="PrecisionType">
<xsd:attribute name="type" type="xsd:string" use="required"/> <xsd:attribute name="type" type="xsd:string" use="required"/>
</xsd:complexType> </xsd:complexType>
...@@ -33,7 +46,7 @@ ...@@ -33,7 +46,7 @@
<xsd:list itemType="xsd:string"/> <xsd:list itemType="xsd:string"/>
</xsd:simpleType> </xsd:simpleType>
<xsd:simpleType name="AdditionalCompilerFlagType"> <xsd:simpleType name="AdditionalCompilerFlagsType">
<xsd:list itemType="xsd:string"/> <xsd:list itemType="xsd:string"/>
</xsd:simpleType> </xsd:simpleType>
......
...@@ -76,8 +76,8 @@ MODULE m_xmlOutput ...@@ -76,8 +76,8 @@ MODULE m_xmlOutput
WRITE (xmlOutputUnit,'(a)') '<fleurOutput fleurOutputVersion="0.27">' WRITE (xmlOutputUnit,'(a)') '<fleurOutput fleurOutputVersion="0.27">'
CALL openXMLElement('programVersion',(/'version'/),(/version_const/)) CALL openXMLElement('programVersion',(/'version'/),(/version_const/))
CALL get_compile_desc(gitdesc,githash,compile_date,compile_user,compile_host) CALL get_compile_desc(gitdesc,githash,compile_date,compile_user,compile_host)
CALL writeXMLElement('Compiled',(/'date','user','host'/),(/compile_date,compile_user,compile_host/)) CALL writeXMLElement('compilationInfo',(/'date','user','host'/),(/compile_date,compile_user,compile_host/))
CALL writeXMLElement('Git',(/'version','hash '/),(/gitdesc,githash/)) CALL writeXMLElement('gitInfo',(/'version ','lastCommitHash'/),(/gitdesc,githash/))
CALL getComputerArchitectures(flags, numFlags) CALL getComputerArchitectures(flags, numFlags)
IF (numFlags.EQ.0) THEN IF (numFlags.EQ.0) THEN
numFlags = 1 numFlags = 1
......
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