diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs index f9f46586f381c577a8e211d281fb9343d8352c75..7ca9abe1ea604059df65cde4b182da8f61fe23ef 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/Reader/Impl/XMLDeclarationMultistageInputReader.cs @@ -900,7 +900,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl if (fullCheck) { //use Binary AND to execute all Statements and gather information about missing parameters. return InputComplete(_consolidateBusAuxiliariesData, nameof(_consolidateBusAuxiliariesData)) - & _consolidateBusAuxiliariesData.IsInputDataCompleteFullCheck(jobType); + & (_consolidateBusAuxiliariesData != null && _consolidateBusAuxiliariesData.IsInputDataCompleteFullCheck(jobType)); } return InputComplete(_consolidateBusAuxiliariesData, nameof(_consolidateBusAuxiliariesData)) && _consolidateBusAuxiliariesData.IsInputDataComplete(jobType); @@ -922,6 +922,9 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.Reader.Impl protected override IList<string> GetInvalidEntriesTemplate(VectoSimulationJobType jobType) { + if (_consolidateBusAuxiliariesData == null) { + return new List<string>(); + } return _invalidEntries.Concat(_consolidateBusAuxiliariesData.GetInvalidEntries(jobType)).ToList(); } } diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs index 99899340bc96f64de80050508486193b54e695c3..ed497f42d60050ae3e01c3b32aa85d96c6e5a535 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/XMLMultistageBusReport.cs @@ -393,9 +393,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF { return new XElement(v28 + XMLNames.Component_AirDrag, new XElement(v20 + XMLNames.Report_DataWrap, - new XAttribute(xsi + XMLNames.Component_Type_Attr, XMLNames.AirDrag_Data_Type_Attr), - //new XAttribute("xmlns", v10.NamespaceName), new XAttribute(XNamespace.Xmlns + "v1.0", v10.NamespaceName), + new XAttribute(xsi + XMLNames.Component_Type_Attr, "v1.0:" + XMLNames.AirDrag_Data_Type_Attr), + //new XAttribute("xmlns", v10.NamespaceName), dataNode.Attributes != null && dataNode.Attributes[XMLNames.Component_ID_Attr] != null ? new XAttribute(XMLNames.Component_ID_Attr, dataNode.Attributes[XMLNames.Component_ID_Attr].InnerText) : null, GetElements(dataNode.ChildNodes)