From 0b3f722049ef669294bfe0d1e413c9017772192a Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Fri, 22 Jul 2022 20:40:40 +0200
Subject: [PATCH] bugfixes in xml schema (MRF and VIF), harmonizing naming,
correcting sample files
---
.../XSD/VectoOutputManufacturer.0.9.xsd | 2 +
.../XSD/VectoOutputMultistep.0.1.xsd | 405 +++++++++---------
.../CompletedBus/HEV_completedBus_2.xml | 6 +-
.../CompletedBus/IEPC_completedBus_2.xml | 4 +-
.../CompletedBus/PEV_completedBus_2.xml | 6 +-
...ultistage_consolidated_multiple_stages.xml | 2 +-
...solidated_multiple_stages_NGTankSystem.xml | 2 +-
...e_consolidated_multiple_stages_airdrag.xml | 2 +-
..._consolidated_multiple_stages_heatPump.xml | 2 +-
...stage_consolidated_multiple_stages_hev.xml | 2 +-
...stage_consolidated_multiple_stages_vif.xml | 2 +-
...ecto_multistage_consolidated_one_stage.xml | 2 +-
...cto_multistage_consolidated_two_stages.xml | 2 +-
...ge_conventional_final_vif.VIF_Report_1.xml | 2 +-
.../vecto_multistage_primary_vehicle_only.xml | 2 +-
...o_multistage_primary_vehicle_stage_2_3.xml | 2 +-
...tage_primary_vehicle_stage_2_3_group41.xml | 2 +-
...ultistage_primary_vehicle_stage_2_full.xml | 2 +-
...tage_primary_vehicle_stage_2_mandatory.xml | 2 +-
19 files changed, 228 insertions(+), 223 deletions(-)
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd
index 34d6caa271..0d9bd65c52 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputManufacturer.0.9.xsd
@@ -1033,6 +1033,7 @@
<xs:complexType>
<xs:sequence>
<xs:element name="AirDrag" type="mrf:AirdragType"/>
+ <xs:element name="Auxiliaries" type="mrf:HEVCompletedBusAuxOutputType"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -1046,6 +1047,7 @@
<xs:complexType>
<xs:sequence>
<xs:element name="AirDrag" type="mrf:AirdragType"/>
+ <xs:element name="Auxiliaries" type="mrf:PEVCompletedBusAuxOutputType"/>
</xs:sequence>
</xs:complexType>
</xs:element>
diff --git a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd
index 26c5cdc4a4..73685709ea 100644
--- a/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd
+++ b/VectoCore/VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd
@@ -312,17 +312,34 @@
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="AUX_HEV-P_PrimaryBusType">
+ <xs:complexType name="AUX_Convetional_PrimaryBusType">
<xs:complexContent>
- <xs:extension base="vif:Abstract_AUX_HEV-P_PrimaryBusDeclarationType">
+ <xs:extension base="vif:AbstractAuxiliaryDataVIFType">
<xs:sequence>
<xs:element name="Fan">
<xs:complexType>
<xs:sequence>
- <xs:element name="Technology" type="v2.4:AuxFanTechnologyPrimaryBusType">
+ <xs:element name="Technology">
<xs:annotation>
- <xs:documentation>P181 - enum</xs:documentation>
+ <xs:documentation>P181</xs:documentation>
</xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="Crankshaft mounted - Electronically controlled visco clutch"/>
+ <xs:enumeration value="Crankshaft mounted - Bimetallic controlled visco clutch"/>
+ <xs:enumeration value="Crankshaft mounted - Discrete step clutch 2 steps"/>
+ <xs:enumeration value="Crankshaft mounted - Discrete step clutch 3 steps"/>
+ <xs:enumeration value="Crankshaft mounted - On/off clutch"/>
+ <xs:enumeration value="Belt driven or driven via transm. - Electronically controlled visco clutch"/>
+ <xs:enumeration value="Belt driven or driven via transm. - Bimetallic controlled visco clutch"/>
+ <xs:enumeration value="Belt driven or driven via transm. - Discrete step clutch 2 steps"/>
+ <xs:enumeration value="Belt driven or driven via transm. - Discrete step clutch 3 steps"/>
+ <xs:enumeration value="Belt driven or driven via transm. - On/off clutch"/>
+ <xs:enumeration value="Hydraulic driven - Variable displacement pump"/>
+ <xs:enumeration value="Hydraulic driven - Constant displacement pump"/>
+ <xs:enumeration value="Electrically driven - Electronically controlled"/>
+ </xs:restriction>
+ </xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
@@ -332,7 +349,7 @@
<xs:sequence>
<xs:element name="Technology" maxOccurs="4">
<xs:annotation>
- <xs:documentation>P182 - enum</xs:documentation>
+ <xs:documentation>P182</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:simpleContent>
@@ -355,13 +372,100 @@
<xs:element name="ElectricSystem">
<xs:complexType>
<xs:sequence>
- <xs:element name="AlternatorTechnology" type="v2.4:AlternatorTechnology_HEV_Type">
+ <xs:element name="AlternatorTechnology">
<xs:annotation>
<xs:documentation>P294 - enum</xs:documentation>
</xs:annotation>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="v2.4:AlternatorTechnologyType"/>
+ </xs:simpleContent>
+ </xs:complexType>
</xs:element>
- <xs:group ref="vif:BusAuxElectricSystemSupplySequenceGroup" minOccurs="0"/>
- <xs:element name="SupplyFromHEVPossible" type="xs:boolean">
+ <xs:sequence minOccurs="0">
+ <xs:element name="SmartAlternator" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="RatedCurrent" type="xs:integer">
+ <xs:annotation>
+ <xs:documentation>P295 - [A]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="RatedVoltage">
+ <xs:annotation>
+ <xs:documentation>P296 - [V]</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:integer">
+ <xs:enumeration value="12"/>
+ <xs:enumeration value="24"/>
+ <xs:enumeration value="48"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Battery" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="BatteryTechnology">
+ <xs:annotation>
+ <xs:documentation>P296 - enum</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="lead-acid battery – conventional"/>
+ <xs:enumeration value="lead-acid battery – AGM"/>
+ <xs:enumeration value="lead-acid battery – gel"/>
+ <xs:enumeration value="li-ion battery - high power"/>
+ <xs:enumeration value="li-ion battery - high energy"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="RatedCapacity" type="xs:integer">
+ <xs:annotation>
+ <xs:documentation>P299 - [Ah]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="NominalVoltage">
+ <xs:annotation>
+ <xs:documentation>P298 - [V]</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:integer">
+ <xs:enumeration value="12"/>
+ <xs:enumeration value="24"/>
+ <xs:enumeration value="48"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="Capacitor" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="CapacitorTechnology" type="xs:string">
+ <xs:annotation>
+ <xs:documentation>P300 - [-]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="RatedCapacitance" type="xs:integer">
+ <xs:annotation>
+ <xs:documentation>P301 - [F]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="RatedVoltage" type="xs:integer">
+ <xs:annotation>
+ <xs:documentation>P302 - [V]</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:element name="SupplyFromHEVPossible" type="xs:boolean" minOccurs="0">
<xs:annotation>
<xs:documentation>P303 - bool</xs:documentation>
</xs:annotation>
@@ -372,24 +476,39 @@
<xs:element name="PneumaticSystem">
<xs:complexType>
<xs:sequence>
- <xs:group ref="vif:BusAuxPneumaticSystemGen_HEV-Px_SequenceGroup"/>
- <xs:group ref="vif:BusAuxPneumaticSystemConsumerSequenceGroup"/>
+ <xs:element name="SizeOfAirSupply" type="v2.4:PneumaticSystemTechnologyType"/>
+ <xs:element name="CompressorDrive">
+ <xs:annotation>
+ <xs:documentation>P310 - enum</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="mechanically"/>
+ <xs:enumeration value="electrically"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="Clutch" type="v2.4:PneumaticSystemClutchTypeType"/>
+ <xs:element name="CompressorRatio" type="v1.0:Double3"/>
+ <xs:element name="SmartCompressionSystem" type="xs:boolean"/>
+ <xs:element name="SmartRegenerationSystem" type="xs:boolean"/>
+ <xs:element name="AirsuspensionControl">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="mechanically"/>
+ <xs:enumeration value="electronically"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="PneumaticSCRReagentDosing" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="HVAC">
<xs:complexType>
<xs:sequence>
- <xs:element name="AdjustableCoolantThermostat" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>P324 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="EngineWasteGasHeatExchanger" type="xs:boolean">
- <xs:annotation>
- <xs:documentation>P326 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
+ <xs:element name="AdjustableCoolantThermostat" type="xs:boolean"/>
+ <xs:element name="EngineWasteGasHeatExchanger" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -397,9 +516,9 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="AUX_HEV-S_PrimaryBusType">
+ <xs:complexType name="AUX_HEV-P_PrimaryBusType">
<xs:complexContent>
- <xs:extension base="vif:Abstract_AUX_HEV-S_PrimaryBusDeclarationType">
+ <xs:extension base="vif:Abstract_AUX_HEV-P_PrimaryBusDeclarationType">
<xs:sequence>
<xs:element name="Fan">
<xs:complexType>
@@ -421,7 +540,7 @@
</xs:annotation>
<xs:complexType>
<xs:simpleContent>
- <xs:extension base="v2.4:AuxSPTechnology_HEV-S_PrimaryBusType">
+ <xs:extension base="v2.4:AuxSPTechnologyPrimaryBusType">
<xs:attribute name="axleNumber" use="required">
<xs:simpleType>
<xs:restriction base="xs:int">
@@ -440,11 +559,12 @@
<xs:element name="ElectricSystem">
<xs:complexType>
<xs:sequence>
- <xs:element name="AlternatorTechnology" type="v2.4:AlternatorTechnology_HEV-S_Type">
+ <xs:element name="AlternatorTechnology" type="v2.4:AlternatorTechnology_HEV_Type">
<xs:annotation>
<xs:documentation>P294 - enum</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:group ref="vif:BusAuxElectricSystemSupplySequenceGroup" minOccurs="0"/>
<xs:element name="SupplyFromHEVPossible" type="xs:boolean">
<xs:annotation>
<xs:documentation>P303 - bool</xs:documentation>
@@ -456,7 +576,7 @@
<xs:element name="PneumaticSystem">
<xs:complexType>
<xs:sequence>
- <xs:group ref="vif:BusAuxPneumaticSystemGen_HEV-S_SequenceGroup"/>
+ <xs:group ref="vif:BusAuxPneumaticSystemGen_HEV-Px_SequenceGroup"/>
<xs:group ref="vif:BusAuxPneumaticSystemConsumerSequenceGroup"/>
</xs:sequence>
</xs:complexType>
@@ -481,10 +601,21 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="AUX_IEPC_PrimaryBusType">
+ <xs:complexType name="AUX_HEV-S_PrimaryBusType">
<xs:complexContent>
- <xs:extension base="vif:Abstract_AUX_IEPC_PrimaryBusDeclarationType">
+ <xs:extension base="vif:Abstract_AUX_HEV-S_PrimaryBusDeclarationType">
<xs:sequence>
+ <xs:element name="Fan">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="Technology" type="v2.4:AuxFanTechnologyPrimaryBusType">
+ <xs:annotation>
+ <xs:documentation>P181 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
<xs:element name="SteeringPump">
<xs:complexType>
<xs:sequence>
@@ -494,7 +625,7 @@
</xs:annotation>
<xs:complexType>
<xs:simpleContent>
- <xs:extension base="v2.4:AuxSPTechnology_PEV_PrimaryBusType">
+ <xs:extension base="v2.4:AuxSPTechnology_HEV-S_PrimaryBusType">
<xs:attribute name="axleNumber" use="required">
<xs:simpleType>
<xs:restriction base="xs:int">
@@ -510,10 +641,26 @@
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="ElectricSystem">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="AlternatorTechnology" type="v2.4:AlternatorTechnology_HEV-S_Type">
+ <xs:annotation>
+ <xs:documentation>P294 - enum</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="SupplyFromHEVPossible" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P303 - bool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
<xs:element name="PneumaticSystem">
<xs:complexType>
<xs:sequence>
- <xs:group ref="vif:BusAuxPneumaticSystemGen_IEPC_SequenceGroup"/>
+ <xs:group ref="vif:BusAuxPneumaticSystemGen_HEV-S_SequenceGroup"/>
<xs:group ref="vif:BusAuxPneumaticSystemConsumerSequenceGroup"/>
</xs:sequence>
</xs:complexType>
@@ -526,6 +673,11 @@
<xs:documentation>P324 - bool</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="EngineWasteGasHeatExchanger" type="xs:boolean">
+ <xs:annotation>
+ <xs:documentation>P326 - bool</xs:documentation>
+ </xs:annotation>
+ </xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -533,16 +685,16 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="AUX_PEV_PrimaryBusType">
+ <xs:complexType name="AUX_IEPC_PrimaryBusType">
<xs:complexContent>
- <xs:extension base="vif:Abstract_AUX_PEV_PrimaryBusDeclarationType">
+ <xs:extension base="vif:Abstract_AUX_IEPC_PrimaryBusDeclarationType">
<xs:sequence>
<xs:element name="SteeringPump">
<xs:complexType>
<xs:sequence>
<xs:element name="Technology" maxOccurs="4">
<xs:annotation>
- <xs:documentation>P182</xs:documentation>
+ <xs:documentation>P182 - enum</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:simpleContent>
@@ -565,7 +717,7 @@
<xs:element name="PneumaticSystem">
<xs:complexType>
<xs:sequence>
- <xs:group ref="vif:BusAuxPneumaticSystemGen_PEV_SequenceGroup"/>
+ <xs:group ref="vif:BusAuxPneumaticSystemGen_IEPC_SequenceGroup"/>
<xs:group ref="vif:BusAuxPneumaticSystemConsumerSequenceGroup"/>
</xs:sequence>
</xs:complexType>
@@ -585,43 +737,10 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="AuxiliaryComponentVIFType">
- <xs:sequence>
- <xs:element name="Data" type="vif:AbstractAuxiliaryDataVIFType"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="AuxiliaryDataVIFType">
+ <xs:complexType name="AUX_PEV_PrimaryBusType">
<xs:complexContent>
- <xs:extension base="vif:AbstractAuxiliaryDataVIFType">
+ <xs:extension base="vif:Abstract_AUX_PEV_PrimaryBusDeclarationType">
<xs:sequence>
- <xs:element name="Fan">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="Technology">
- <xs:annotation>
- <xs:documentation>P181</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="Crankshaft mounted - Electronically controlled visco clutch"/>
- <xs:enumeration value="Crankshaft mounted - Bimetallic controlled visco clutch"/>
- <xs:enumeration value="Crankshaft mounted - Discrete step clutch 2 steps"/>
- <xs:enumeration value="Crankshaft mounted - Discrete step clutch 3 steps"/>
- <xs:enumeration value="Crankshaft mounted - On/off clutch"/>
- <xs:enumeration value="Belt driven or driven via transm. - Electronically controlled visco clutch"/>
- <xs:enumeration value="Belt driven or driven via transm. - Bimetallic controlled visco clutch"/>
- <xs:enumeration value="Belt driven or driven via transm. - Discrete step clutch 2 steps"/>
- <xs:enumeration value="Belt driven or driven via transm. - Discrete step clutch 3 steps"/>
- <xs:enumeration value="Belt driven or driven via transm. - On/off clutch"/>
- <xs:enumeration value="Hydraulic driven - Variable displacement pump"/>
- <xs:enumeration value="Hydraulic driven - Constant displacement pump"/>
- <xs:enumeration value="Electrically driven - Electronically controlled"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
<xs:element name="SteeringPump">
<xs:complexType>
<xs:sequence>
@@ -631,7 +750,7 @@
</xs:annotation>
<xs:complexType>
<xs:simpleContent>
- <xs:extension base="v2.4:AuxSPTechnologyPrimaryBusType">
+ <xs:extension base="v2.4:AuxSPTechnology_PEV_PrimaryBusType">
<xs:attribute name="axleNumber" use="required">
<xs:simpleType>
<xs:restriction base="xs:int">
@@ -647,146 +766,22 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="ElectricSystem">
+ <xs:element name="PneumaticSystem">
<xs:complexType>
<xs:sequence>
- <xs:element name="AlternatorTechnology">
- <xs:annotation>
- <xs:documentation>P294 - enum</xs:documentation>
- </xs:annotation>
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="v2.4:AlternatorTechnologyType"/>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
- <xs:sequence minOccurs="0">
- <xs:element name="SmartAlternator" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="RatedCurrent" type="xs:integer">
- <xs:annotation>
- <xs:documentation>P295 - [A]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="RatedVoltage">
- <xs:annotation>
- <xs:documentation>P296 - [V]</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:enumeration value="12"/>
- <xs:enumeration value="24"/>
- <xs:enumeration value="48"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="Battery" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="BatteryTechnology">
- <xs:annotation>
- <xs:documentation>P296 - enum</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="lead-acid battery – conventional"/>
- <xs:enumeration value="lead-acid battery – AGM"/>
- <xs:enumeration value="lead-acid battery – gel"/>
- <xs:enumeration value="li-ion battery - high power"/>
- <xs:enumeration value="li-ion battery - high energy"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="RatedCapacity" type="xs:integer">
- <xs:annotation>
- <xs:documentation>P299 - [Ah]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="NominalVoltage">
- <xs:annotation>
- <xs:documentation>P298 - [V]</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:integer">
- <xs:enumeration value="12"/>
- <xs:enumeration value="24"/>
- <xs:enumeration value="48"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="Capacitor" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="CapacitorTechnology" type="xs:string">
- <xs:annotation>
- <xs:documentation>P300 - [-]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="RatedCapacitance" type="xs:integer">
- <xs:annotation>
- <xs:documentation>P301 - [F]</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="RatedVoltage" type="xs:integer">
- <xs:annotation>
- <xs:documentation>P302 - [V]</xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- <xs:element name="SupplyFromHEVPossible" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>P303 - bool</xs:documentation>
- </xs:annotation>
- </xs:element>
+ <xs:group ref="vif:BusAuxPneumaticSystemGen_PEV_SequenceGroup"/>
+ <xs:group ref="vif:BusAuxPneumaticSystemConsumerSequenceGroup"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="PneumaticSystem">
+ <xs:element name="HVAC">
<xs:complexType>
<xs:sequence>
- <xs:element name="SizeOfAirSupply" type="v2.4:PneumaticSystemTechnologyType"/>
- <xs:element name="CompressorDrive">
+ <xs:element name="AdjustableCoolantThermostat" type="xs:boolean">
<xs:annotation>
- <xs:documentation>P310 - enum</xs:documentation>
+ <xs:documentation>P324 - bool</xs:documentation>
</xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="mechanically"/>
- <xs:enumeration value="electrically"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="Clutch" type="v2.4:PneumaticSystemClutchTypeType"/>
- <xs:element name="CompressorRatio" type="v1.0:Double3"/>
- <xs:element name="SmartCompressionSystem" type="xs:boolean"/>
- <xs:element name="SmartRegenerationSystem" type="xs:boolean"/>
- <xs:element name="AirsuspensionControl">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="mechanically"/>
- <xs:enumeration value="electronically"/>
- </xs:restriction>
- </xs:simpleType>
</xs:element>
- <xs:element name="PneumaticSCRReagentDosing" type="xs:boolean"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="HVAC">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="AdjustableCoolantThermostat" type="xs:boolean"/>
- <xs:element name="EngineWasteGasHeatExchanger" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -794,6 +789,11 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
+ <xs:complexType name="AuxiliaryComponentVIFType">
+ <xs:sequence>
+ <xs:element name="Data" type="vif:AbstractAuxiliaryDataVIFType"/>
+ </xs:sequence>
+ </xs:complexType>
<xs:complexType name="AxlegearComponentVIFType">
<xs:sequence>
<xs:element name="Data" type="vif:AbstractAxlegearDataVIFType"/>
@@ -2462,7 +2462,10 @@
<xs:extension base="vif:AbstractVehicleComponentsHEV_Sx_VIFType">
<xs:sequence>
<xs:group ref="vif:Vehicle_HEV-Sx_ComponentsVIFTypeSequenceGroup"/>
- <xs:element name="Axlegear" type="vif:AxlegearComponentVIFType" minOccurs="0"/>
+ <xs:element name="Transmission" type="vif:TransmissionComponentVIFType"/>
+ <xs:element name="TorqueConverter" type="vif:TorqueConverterVIFType" minOccurs="0"/>
+ <xs:element name="Angledrive" type="vif:AngledriveVIFType" minOccurs="0"/>
+ <xs:element name="Axlegear" type="vif:AxlegearComponentVIFType"/>
<xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
<xs:element name="Auxiliaries" type="vif:HEV-S_PrimaryAuxiliariesVIFType"/>
</xs:sequence>
@@ -2474,7 +2477,7 @@
<xs:extension base="vif:AbstractVehicleComponentsHEV_Sx_VIFType">
<xs:sequence>
<xs:group ref="vif:Vehicle_HEV-Sx_ComponentsVIFTypeSequenceGroup"/>
- <xs:element name="Axlegear" type="vif:AxlegearComponentVIFType" minOccurs="0"/>
+ <xs:element name="Axlegear" type="vif:AxlegearComponentVIFType"/>
<xs:element name="AxleWheels" type="vif:AxleWheelsComponentVIFType"/>
<xs:element name="Auxiliaries" type="vif:HEV-S_PrimaryAuxiliariesVIFType"/>
</xs:sequence>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/HEV_completedBus_2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/HEV_completedBus_2.xml
index 0a35e5eda6..d7db72d186 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/HEV_completedBus_2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/HEV_completedBus_2.xml
@@ -23,7 +23,7 @@
<VehicleWidth>2500</VehicleWidth>
<EntranceHeight>2000</EntranceHeight>
<DoorDriveTechnology>electric</DoorDriveTechnology>
- <VehicleDeclarationType>interim</VehicleDeclarationType>
+ <VehicleDeclarationType>final</VehicleDeclarationType>
<ADAS xsi:type="ADAS_HEV_Type">
<EngineStopStart>true</EngineStopStart>
<PredictiveCruiseControl>none</PredictiveCruiseControl>
@@ -63,7 +63,7 @@
</LEDLights>
</ElectricSystem>
<HVAC>
- <SystemConfiguration>0</SystemConfiguration>
+ <SystemConfiguration>1</SystemConfiguration>
<HeatPumpTypeDriverCompartment>
<Cooling>non R-744 2-stage</Cooling>
<Heating>none</Heating>
@@ -75,7 +75,7 @@
<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
<DoubleGlazing>false</DoubleGlazing>
<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
- <SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
+ <SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
<WaterElectricHeater>false</WaterElectricHeater>
<AirElectricHeater>false</AirElectricHeater>
<OtherHeatingTechnology>false</OtherHeatingTechnology>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/IEPC_completedBus_2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/IEPC_completedBus_2.xml
index 656f9a0048..b7e16c60e0 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/IEPC_completedBus_2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/IEPC_completedBus_2.xml
@@ -22,7 +22,7 @@
<VehicleWidth>2500</VehicleWidth>
<EntranceHeight>2000</EntranceHeight>
<DoorDriveTechnology>electric</DoorDriveTechnology>
- <VehicleDeclarationType>interim</VehicleDeclarationType>
+ <VehicleDeclarationType>final</VehicleDeclarationType>
<ADAS xsi:type="ADAS_IEPC_Type">
<PredictiveCruiseControl>none</PredictiveCruiseControl>
</ADAS>
@@ -61,7 +61,7 @@
</LEDLights>
</ElectricSystem>
<HVAC>
- <SystemConfiguration>0</SystemConfiguration>
+ <SystemConfiguration>1</SystemConfiguration>
<HeatPumpTypeDriverCompartment>
<Cooling>non R-744 2-stage</Cooling>
<Heating>none</Heating>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/PEV_completedBus_2.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/PEV_completedBus_2.xml
index b6a025e192..1999950080 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/PEV_completedBus_2.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.4/Distributed/CompletedBus/PEV_completedBus_2.xml
@@ -22,7 +22,7 @@
<VehicleWidth>2500</VehicleWidth>
<EntranceHeight>2000</EntranceHeight>
<DoorDriveTechnology>electric</DoorDriveTechnology>
- <VehicleDeclarationType>interim</VehicleDeclarationType>
+ <VehicleDeclarationType>final</VehicleDeclarationType>
<ADAS xsi:type="ADAS_PEV_Type">
<PredictiveCruiseControl>none</PredictiveCruiseControl>
</ADAS>
@@ -61,7 +61,7 @@
</LEDLights>
</ElectricSystem>
<HVAC>
- <SystemConfiguration>0</SystemConfiguration>
+ <SystemConfiguration>1</SystemConfiguration>
<HeatPumpTypeDriverCompartment>
<Cooling>non R-744 2-stage</Cooling>
<Heating>none</Heating>
@@ -73,7 +73,7 @@
<AuxiliaryHeaterPower>50</AuxiliaryHeaterPower>
<DoubleGlazing>false</DoubleGlazing>
<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
- <SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>
+ <SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
<WaterElectricHeater>false</WaterElectricHeater>
<AirElectricHeater>false</AirElectricHeater>
<OtherHeatingTechnology>false</OtherHeatingTechnology>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
index f843bb2884..01c1e6f85f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages.xml
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Convetional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
index b992d17de2..ffaf8c4770 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_NGTankSystem.xml
@@ -265,7 +265,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Convetional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
index e13e4c4355..4714aa96dd 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_airdrag.xml
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Convetional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
index 5900879dbf..d9d9b6cbd4 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_heatPump.xml
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Convetional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
index 2c7866db5e..4b9391851f 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_hev.xml
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Convetional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
index 35319f8527..62fa892e73 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_multiple_stages_vif.xml
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Convetional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
index bf3cbba29a..c198d59f33 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_one_stage.xml
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Convetional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
index 68be47a295..4154fc6e9b 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_consolidated_two_stages.xml
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Convetional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
index 2f6e511548..eea85b74a2 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_conventional_final_vif.VIF_Report_1.xml
@@ -205,7 +205,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Convetional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
index 0b5f00fb8b..fff71e8884 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_only.xml
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Convetional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
index 3568618bd5..22a89da7df 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3.xml
@@ -263,7 +263,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Convetional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
index 63615f72b2..c6f3e591a1 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_3_group41.xml
@@ -187,7 +187,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Convetional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
index 859174edea..b4cb1f8785 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_full.xml
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Convetional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
index 1d0f4b5250..b890cd97f4 100644
--- a/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
+++ b/VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersionMultistage.0.1/vecto_multistage_primary_vehicle_stage_2_mandatory.xml
@@ -264,7 +264,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataVIFType">
+ <Data xsi:type="AUX_Convetional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
--
GitLab