diff --git a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricStorageSystemDeclarationInputData.cs b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricStorageSystemDeclarationInputData.cs index 1ce12bf2d3fe80fc7ce3e4b5aea715743d99f0f5..cef46204ca78194289bf90422552a1a87cb7039f 100644 --- a/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricStorageSystemDeclarationInputData.cs +++ b/VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLElectricStorageSystemDeclarationInputData.cs @@ -375,14 +375,14 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider #region Implementation of ISuperCapDeclarationInputData - public Farad Capacity => GetDouble(XMLNames.Capacitor_Capacitance).SI<Farad>(); - public Ohm InternalResistance => GetDouble(XMLNames.Capacitor_InternalResistance).SI(Unit.SI.Milli.Ohm).Cast<Ohm>(); - public Volt MinVoltage => GetDouble(XMLNames.Capacitor_MinVoltage).SI<Volt>(); - public Volt MaxVoltage => GetDouble(XMLNames.Capacitor_MaxVoltage).SI<Volt>(); - public Ampere MaxCurrentCharge => GetDouble(XMLNames.Capacitor_MaxChargingCurrent).SI<Ampere>(); - public Ampere MaxCurrentDischarge => GetDouble(XMLNames.Capacitor_MaxDischargingCurrent).SI<Ampere>(); - - public Kelvin TestingTemperature => + public virtual Farad Capacity => GetDouble(XMLNames.Capacitor_Capacitance).SI<Farad>(); + public virtual Ohm InternalResistance => GetDouble(XMLNames.Capacitor_InternalResistance).SI(Unit.SI.Milli.Ohm).Cast<Ohm>(); + public virtual Volt MinVoltage => GetDouble(XMLNames.Capacitor_MinVoltage).SI<Volt>(); + public virtual Volt MaxVoltage => GetDouble(XMLNames.Capacitor_MaxVoltage).SI<Volt>(); + public virtual Ampere MaxCurrentCharge => GetDouble(XMLNames.Capacitor_MaxChargingCurrent).SI<Ampere>(); + public virtual Ampere MaxCurrentDischarge => GetDouble(XMLNames.Capacitor_MaxDischargingCurrent).SI<Ampere>(); + + public virtual Kelvin TestingTemperature => ElementExists(XMLNames.REESS_TestingTemperature) ? GetDouble(XMLNames.REESS_TestingTemperature).DegCelsiusToKelvin() : null; @@ -408,6 +408,12 @@ namespace TUGraz.VectoCore.InputData.FileIO.XML.Declaration.DataProvider XMLHelper.CombineNamespace(NAMESPACE_URI.NamespaceName, XSD_TYPE); public XMLSuperCapDeclarationInputDataV01(XmlNode componentNode, string sourceFile) : base(componentNode, sourceFile) { } + + #region Overrides of XMLSuperCapDeclarationInputDataV24 + + public override Ohm InternalResistance => null; + + #endregion } //=================== diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFElectricEnergyStorageType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFElectricEnergyStorageType.cs index abc987c8252eca4fad2ccaa595ca2965ff9c588a..f7d2189be8fb1722ea437c86bac62b6bd4543fd3 100644 --- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFElectricEnergyStorageType.cs +++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/PrimaryComponents/VIFElectricEnergyStorageType.cs @@ -65,7 +65,6 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF new XElement(_vif + XMLNames.Component_Date, XmlConvert.ToString(supercap.Date, XmlDateTimeSerializationMode.Utc)), new XElement(_vif + XMLNames.Component_AppVersion, supercap.AppVersion), new XElement(_vif + XMLNames.Capacitor_Capacitance, supercap.Capacity.ToXMLFormat(2)), - new XElement(_vif + XMLNames.Capacitor_InternalResistance, supercap.InternalResistance.AsMilliOhm.ToXMLFormat(2)), new XElement(_vif + XMLNames.Capacitor_MinVoltage, supercap.MinVoltage.ToXMLFormat(2)), new XElement(_vif + XMLNames.Capacitor_MaxVoltage, supercap.MaxVoltage.ToXMLFormat(2)), new XElement(_vif + XMLNames.Capacitor_MaxChargingCurrent, supercap.MaxCurrentCharge.ToXMLFormat(2)), diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd index 2aba7327de58ead2a178bd8951425b1d7a41ae79..82f417ede2ca20f636cec477d30b61cb91953f24 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd @@ -1418,17 +1418,6 @@ </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="InternalResistance" type="v2.3:InternalResistanceType"> - <xs:annotation> - <xs:documentation>P539 - [mOhm]</xs:documentation> - <xs:appinfo> - <!-- <vectoParam:description> - <vectoParam:parameterId component="CapacitorSystem">539</vectoParam:parameterId> - <vectoParam:unit>mOhm</vectoParam:unit> - </vectoParam:description> --> - </xs:appinfo> - </xs:annotation> - </xs:element> <xs:element name="MinVoltage" type="v2.3:CapacitorVoltageType"> <xs:annotation> <xs:documentation>P540 - [V]</xs:documentation>