Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 4d7472f7 authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

Update VIF schema: do not write internal resistance of supercap to VIF

Update Reading VIF: do not read internal resistance of supercap from VIF
Update Writing VIF: do not write internal resistance of supercap to VIF
parent 9f3705b5
No related branches found
No related tags found
No related merge requests found
......@@ -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
}
//===================
......
......@@ -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)),
......
......@@ -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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment