diff --git a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd index 7d6590cec787bbb1a7ba7193dbee9ee54bb8ee8d..c88ddcc9df49511bb2c878657779c9997db4c5e7 100644 --- a/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd +++ b/VectoCore/VectoCore/Resources/XSD/VectoDeclarationDefinitions.2.4.xsd @@ -90,6 +90,11 @@ </xs:complexContent> </xs:complexType> <xs:complexType name="AbstractElectricMotorVehicleTorqueLimitsDeclarationType" abstract="true"/> + <xs:complexType name="AbstractElectricMotorVehicleTorqueLimitsSerialHybridDeclarationType" abstract="true"> + <xs:complexContent> + <xs:extension base="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType"/> + </xs:complexContent> + </xs:complexType> <xs:complexType name="AbstractPTODataType" abstract="true"> <xs:complexContent> <xs:extension base="v2.0:AbstractPTODataType"/> @@ -1374,11 +1379,40 @@ <xs:element name="ADC" type="v2.3:ADCComponentDeclarationType" minOccurs="0"/> </xs:sequence> </xs:complexType> + <xs:complexType name="ElectricMachineTorqueLimitsSerialHybridType"> + <xs:complexContent> + <xs:extension base="v2.4:AbstractElectricMotorVehicleTorqueLimitsSerialHybridDeclarationType"> + <xs:sequence> + <xs:element name="ElectricMachine" maxOccurs="2"> + <xs:complexType> + <xs:sequence> + <xs:element name="Position" type="v2.4:PowertrainPositionType"/> + <xs:element name="VoltageLevel" minOccurs="2" maxOccurs="unbounded"> + <xs:complexType> + <xs:sequence> + <xs:element name="Voltage"> + <xs:simpleType> + <xs:restriction base="xs:int"> + <xs:minExclusive value="0"/> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="MaxTorqueCurve" type="v2.3:ElectricMachineSystemMaxTorqueCurveType"/> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> <xs:complexType name="ElectricMachineTorqueLimitsType"> <xs:complexContent> <xs:extension base="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType"> <xs:sequence> - <xs:element name="ElectricMachine" maxOccurs="unbounded"> + <xs:element name="ElectricMachine"> <xs:complexType> <xs:sequence> <xs:element name="Position" type="v2.4:PowertrainPositionType"/> @@ -2081,7 +2115,7 @@ <xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/> <xs:element name="ADAS" type="v2.4:Abstract_ADAS_HEVType"/> <xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/> - <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0" maxOccurs="2"/> + <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsSerialHybridDeclarationType" minOccurs="0"/> <xs:element name="Components" type="v2.4:Abstract_Components_HEV-Sx_LorryDeclarationType"/> </xs:sequence> </xs:extension> @@ -2106,7 +2140,7 @@ <xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/> <xs:element name="ADAS" type="v2.4:Abstract_ADAS_HEVType"/> <xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/> - <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0" maxOccurs="2"/> + <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsSerialHybridDeclarationType" minOccurs="0"/> <xs:element name="Components" type="v2.4:Abstract_Components_HEV-Sx_LorryDeclarationType"/> </xs:sequence> </xs:extension> @@ -2141,7 +2175,7 @@ <xs:group ref="v2.4:Vehicle_xEV-Parameters_SequenceGroup"/> <xs:element name="ADAS" type="v2.4:Abstract_ADAS_HEVType"/> <xs:element name="TorqueLimits" type="v2.0:AbstractTorqueLimitsType" minOccurs="0"/> - <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsDeclarationType" minOccurs="0" maxOccurs="2"/> + <xs:element name="ElectricMotorTorqueLimits" type="v2.4:AbstractElectricMotorVehicleTorqueLimitsSerialHybridDeclarationType" minOccurs="0"/> <xs:element name="Components" type="v2.4:Abstract_Components_HEV-Sx_PrimaryBusDeclarationType"/> </xs:sequence> </xs:extension> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml index 144e02970abb0da4b4ef33e37cb05767b1f319e7..a239e6825cf089e215eb4d54385cdc763e15a3e7 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_AMT_S2.xml @@ -34,7 +34,7 @@ <!-- optional --> <v2.0:Entry gear="9" maxTorque="2000"/> </TorqueLimits> - <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"> + <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsSerialHybridType"> <!-- optional --> <ElectricMachine> <Position>2</Position> @@ -53,8 +53,6 @@ </MaxTorqueCurve> </VoltageLevel> </ElectricMachine> - </ElectricMotorTorqueLimits> - <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"> <!-- optional --> <ElectricMachine> <Position>GEN</Position> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S3.xml index 12524b9c8abeaae7833c9dff87366a12864f6846..cb9cfbff3f17e2ec4f2b507a59c9f3efe1fd6f56 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S3.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S3.xml @@ -34,7 +34,7 @@ <!-- optional --> <v2.0:Entry gear="9" maxTorque="2000"/> </TorqueLimits> - <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"> + <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsSerialHybridType"> <!-- optional --> <ElectricMachine> <Position>3</Position> @@ -53,8 +53,6 @@ </MaxTorqueCurve> </VoltageLevel> </ElectricMachine> - </ElectricMotorTorqueLimits> - <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"> <!-- optional --> <ElectricMachine> <Position>GEN</Position> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S4.xml index 0e0407f3d12aa5f8b574fe8bf42f89bfb03007a9..ca7327394b7a067787baa8031c4865aa98aa0f34 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S4.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/HeavyLorry/HEV-S_heavyLorry_S4.xml @@ -34,7 +34,7 @@ <!-- optional --> <v2.0:Entry gear="9" maxTorque="2000"/> </TorqueLimits> - <ElectricMotorTorqueLimits xsi:type="v2.4:ElectricMachineTorqueLimitsType"> + <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsSerialHybridType"> <!-- optional --> <ElectricMachine> <Position>4</Position> @@ -53,8 +53,6 @@ </MaxTorqueCurve> </VoltageLevel> </ElectricMachine> - </ElectricMotorTorqueLimits> - <ElectricMotorTorqueLimits xsi:type="v2.4:ElectricMachineTorqueLimitsType"> <!-- optional --> <ElectricMachine> <Position>GEN</Position> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_AMT_S2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_AMT_S2.xml index 40178220ff9ca1278eec1b24e52e1d2941c52834..2a93fae8d440344c0566375819491f34b9799885 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_AMT_S2.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_AMT_S2.xml @@ -30,7 +30,7 @@ <!-- optional --> <v2.0:Entry gear="9" maxTorque="2000"/> </TorqueLimits> - <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"> + <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsSerialHybridType"> <!-- optional --> <ElectricMachine> <Position>2</Position> @@ -49,8 +49,6 @@ </MaxTorqueCurve> </VoltageLevel> </ElectricMachine> - </ElectricMotorTorqueLimits> - <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"> <!-- optional --> <ElectricMachine> <Position>GEN</Position> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S3.xml index 97f8be8d0f98dc71457d0295f5fdf212cd72dd26..44bf8d19d8342e73549531333b410bb024ea78f3 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S3.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S3.xml @@ -30,7 +30,7 @@ <!-- optional --> <v2.0:Entry gear="9" maxTorque="2000"/> </TorqueLimits> - <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"> + <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsSerialHybridType"> <!-- optional --> <ElectricMachine> <Position>3</Position> @@ -49,8 +49,6 @@ </MaxTorqueCurve> </VoltageLevel> </ElectricMachine> - </ElectricMotorTorqueLimits> - <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"> <!-- optional --> <ElectricMachine> <Position>GEN</Position> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S4.xml index 49eac0f15727f5a7a6a129cb1c97c39241629b72..195d02d9c70119a8551e06a734a36792aeacee1e 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S4.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/MediumLorry/HEV-S_mediumLorry_S4.xml @@ -30,7 +30,7 @@ <!-- optional --> <v2.0:Entry gear="9" maxTorque="2000"/> </TorqueLimits> - <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"> + <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsSerialHybridType"> <!-- optional --> <ElectricMachine> <Position>4</Position> @@ -49,8 +49,6 @@ </MaxTorqueCurve> </VoltageLevel> </ElectricMachine> - </ElectricMotorTorqueLimits> - <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"> <!-- optional --> <ElectricMachine> <Position>GEN</Position> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_AMT_S2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_AMT_S2.xml index 0c6661425ab6afc8c72fdad88e16e142b6e8ca5c..5ec6b24a7d655e7959b1b7757e8da6521858772c 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_AMT_S2.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_AMT_S2.xml @@ -30,7 +30,7 @@ <v2.0:Entry gear="1" maxTorque="2500"/> <v2.0:Entry gear="12" maxTorque="1900"/> </TorqueLimits> - <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"> + <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsSerialHybridType"> <!-- optional --> <ElectricMachine> <Position>2</Position> @@ -49,8 +49,6 @@ </MaxTorqueCurve> </VoltageLevel> </ElectricMachine> - </ElectricMotorTorqueLimits> - <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"> <!-- optional --> <ElectricMachine> <Position>GEN</Position> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S3.xml index f1aeb455c611824eb7a241cb3105af1cf4e7d398..7c2883114d056e926858875e4a1a1b74eb81bf83 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S3.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S3.xml @@ -26,7 +26,7 @@ <!-- optional --> <v2.0:Entry gear="9" maxTorque="2000"/> </TorqueLimits> - <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"> + <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsSerialHybridType"> <!-- optional --> <ElectricMachine> <Position>3</Position> @@ -45,8 +45,6 @@ </MaxTorqueCurve> </VoltageLevel> </ElectricMachine> - </ElectricMotorTorqueLimits> - <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"> <!-- optional --> <ElectricMachine> <Position>GEN</Position> diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S4.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S4.xml index 19774aabcf6eec9a3132478a8fe68f5391f9564e..8b7795992b84a16dd2a62e7703a632418ca4c444 100644 --- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S4.xml +++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/PrimaryBus/HEV-S_primaryBus_S4.xml @@ -26,7 +26,7 @@ <!-- optional --> <v2.0:Entry gear="9" maxTorque="2000"/> </TorqueLimits> - <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"> + <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsSerialHybridType"> <!-- optional --> <ElectricMachine> <Position>4</Position> @@ -45,8 +45,6 @@ </MaxTorqueCurve> </VoltageLevel> </ElectricMachine> - </ElectricMotorTorqueLimits> - <ElectricMotorTorqueLimits xsi:type="ElectricMachineTorqueLimitsType"> <!-- optional --> <ElectricMachine> <Position>GEN</Position>