diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b.vecto
index cbcb20b77e871d7ee9719574922a9842de0200d8..3f9e32ac9914645a30ca31022b3cf426a3e75717 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b.vecto
@@ -7,6 +7,7 @@
},
"Body": {
"CompletedVehicle": "vecto_vehicle-completed_heavyBus_41.xml",
- "PrimaryVehicleResults": "primary_heavyBus group41.RSLT_VIF.xml"
+ "PrimaryVehicleResults": "primary_heavyBus group41.RSLT_VIF.xml",
+ "RunSimulation": true
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_AT-P.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_AT-P.vecto
index ef9fb71e6f09ed6e3519bb086836b06256c77da2..09797121a8e2c8c6735eeb0791b3765dd62ca392 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_AT-P.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_AT-P.vecto
@@ -7,6 +7,7 @@
},
"Body": {
"CompletedVehicle": "vecto_vehicle-completed_heavyBus_41.xml",
- "PrimaryVehicleResults": "primary_heavyBus group41_AT-P.RSLT_VIF.xml"
+ "PrimaryVehicleResults": "primary_heavyBus group41_AT-P.RSLT_VIF.xml",
+ "RunSimulation": true
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_ES-AUX.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_ES-AUX.vecto
index 481cc289a49135414334eb77eb34dd80db2712eb..5b975c0bde969756a0e37a95586b9003ba7e06b5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_ES-AUX.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_ES-AUX.vecto
@@ -7,6 +7,7 @@
},
"Body": {
"CompletedVehicle": "vecto_vehicle-completed_heavyBus_41.xml",
- "PrimaryVehicleResults": "vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml"
+ "PrimaryVehicleResults": "vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml",
+ "RunSimulation": true
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_ES-AUX_mixed.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_ES-AUX_mixed.vecto
index 644fabc36c86156d12deee7ab51669bdccf0d0c8..4bf0a4caf7cffed1d6f56b06b89d3ccad319780e 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_ES-AUX_mixed.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_41-32b_ES-AUX_mixed.vecto
@@ -7,6 +7,7 @@
},
"Body": {
"CompletedVehicle": "vecto_vehicle-completed_heavyBus_41_mixed.xml",
- "PrimaryVehicleResults": "vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml"
+ "PrimaryVehicleResults": "vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml",
+ "RunSimulation": true
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_42-33b.vecto b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_42-33b.vecto
index c9a897687648d7b2d104d176e2bc5638172321ca..1a06242a266625c2e51cb09f19177291b070fa93 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_42-33b.vecto
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/CompletedBus_42-33b.vecto
@@ -7,6 +7,7 @@
},
"Body": {
"CompletedVehicle": "vecto_vehicle-completed_heavyBus_42.xml",
- "PrimaryVehicleResults": "primary_heavyBus group42_SmartPS.RSLT_VIF.xml"
+ "PrimaryVehicleResults": "primary_heavyBus group42_SmartPS.RSLT_VIF.xml",
+ "RunSimulation": true
}
}
\ No newline at end of file
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
index 6a587688490a2f7a3b6d136bf63e19de42075882..7c2653ee3a3353128c066d2de6d0f1d784ea65cd 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41.RSLT_VIF.xml
@@ -5,7 +5,7 @@ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
-xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 ./../../../../../VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
<Data xsi:type="PrimaryVehicleDataType" id="PIF-4121ae4751874cefa376">
<Vehicle xsi:type="VehiclePIFType">
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml
index 6705787dfde9bb453036f6c3410b59645f40bc9c..88e2a5358582b465bc575f69254268c9073fcb15 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_AT-P.RSLT_VIF.xml
@@ -1,10 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+ xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 ./../../../../../VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
- <Data xsi:type="PrimaryVehicleDataType" id="PIF-04fd187f166a4d89aa84">
- <Vehicle xsi:type="VehiclePIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Data xsi:type="PrimaryVehicleDataType" id="VIF-04fd187f166a4d89aa84">
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model</Model>
<VIN>VEH-1234567890_nonSmart</VIN>
<Date>2017-02-15T11:00:00Z</Date>
@@ -30,7 +36,7 @@
</TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic primary bus 41 Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -68,14 +74,14 @@
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>AT 6 Gear</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>APT-P</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>1.350</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -93,7 +99,7 @@
</Data>
</Transmission>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic primary bus 41 AxleGear</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -104,7 +110,7 @@
</Data>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<Axles>
<vif0.1:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<AxleType>VehicleNonDriven</AxleType>
@@ -164,7 +170,7 @@
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
@@ -216,7 +222,7 @@
<Results>
<Status>success</Status>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
@@ -227,10 +233,10 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">22.31983</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1636.09</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
@@ -241,10 +247,10 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">26.95463</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1975.83</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
@@ -255,10 +261,10 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">17.92708</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1314.09</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
@@ -269,10 +275,10 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">21.70502</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1591.02</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
@@ -283,10 +289,10 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">15.43924</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1131.73</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
@@ -297,10 +303,10 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">18.60503</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1363.79</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">12854.90</TotalVehicleMass>
@@ -311,10 +317,10 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.13927</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">963.14</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15494.61</TotalVehicleMass>
@@ -325,10 +331,10 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">14.79162</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1084.26</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
@@ -339,10 +345,10 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">23.49056</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1721.91</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
@@ -353,10 +359,10 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">28.74258</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">2106.89</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
@@ -367,10 +373,10 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">18.83855</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1380.91</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
@@ -381,10 +387,10 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">23.12983</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1695.47</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
@@ -395,10 +401,10 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">16.15304</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1184.05</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
@@ -409,10 +415,10 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">19.66023</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1441.14</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P32SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">14225.44</TotalVehicleMass>
@@ -423,10 +429,10 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">13.51319</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">990.55</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P32SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16669.61</TotalVehicleMass>
@@ -437,10 +443,10 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">15.04580</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1102.89</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P32SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">14244.99</TotalVehicleMass>
@@ -451,10 +457,10 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.27604</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">826.56</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P32SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15887.48</TotalVehicleMass>
@@ -465,10 +471,10 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.75632</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">861.76</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P32DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">14662.82</TotalVehicleMass>
@@ -479,10 +485,10 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">14.03138</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1028.53</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P32DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">17609.41</TotalVehicleMass>
@@ -493,10 +499,10 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">15.76592</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1155.67</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P32DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">14747.01</TotalVehicleMass>
@@ -507,10 +513,10 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">11.77104</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">862.84</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P32DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16767.53</TotalVehicleMass>
@@ -521,7 +527,7 @@
<Fuel type="Diesel CI">
<EnergyConsumption unit="MJ/km">12.34058</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">904.59</CO2>
+
</Result>
</Results>
<ApplicationInformation>
@@ -530,7 +536,7 @@
</ApplicationInformation>
</Data>
<Signature>
- <di:Reference URI="#PIF-04fd187f166a4d89aa84">
+ <di:Reference URI="#VIF-04fd187f166a4d89aa84">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml
index e7407b8a112453950acd3890e4045eb8806f3f07..2741bd56dcb31e75250f372bcde8ddec9b9b5827 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart.xml
@@ -7,7 +7,7 @@ xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob ..\..\..\..\..\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml
index d8f8622df505c2bed7a448fed7c8ebdaea3fe3ff..5592266c18c3f69ab81d0e688430e3959401fb72 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group41_nonSmart_AT-P.xml
@@ -7,7 +7,7 @@ xmlns:v2.4="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
xmlns:di="http://www.w3.org/2000/09/xmldsig#"
-xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob V:\VectoCore\VectoCore\Resources\XSD/VectoDeclarationJob.xsd">
+xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationJob ..\..\..\..\..\VectoCore\Resources\XSD\VectoDeclarationJob.xsd">
<v2.0:Vehicle id="VEH-PrimaryBus_nonSmart_ATP" xsi:type="Vehicle_Conventional_PrimaryBusDeclarationType">
<Manufacturer>Generic Truck Manufacturer</Manufacturer>
<ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
index 885a68d120869ff7139f0beb4ce399def5396f12..e77658ae1ee8072e1c51c5039cb30883e8ec02f2 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
@@ -1,10 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistep xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
+<VectoOutputMultistep xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+ xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+ xmlns:v2.8="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.4"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 ./../../../../../VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
<PrimaryVehicle>
<Data id="VEH-dda89003b1894b738e01" xsi:type="PrimaryVehicleDataType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1">
- <Vehicle xsi:type="VehiclePIFType">
- <ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
- <ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
+ <Manufacturer>Generic Truck Manufacturer</Manufacturer>
+ <ManufacturerAddress>Street, ZIP City</ManufacturerAddress>
<Model>Generic Model Primary</Model>
<VIN>VEH-1234567890_SmartPS</VIN>
<Date>2017-02-15T11:00:00Z</Date>
@@ -31,7 +38,7 @@
</vif0.1:TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer Primary</Manufacturer>
<Model>Bus 6x2 Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -67,14 +74,14 @@
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer Primary</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox Primary</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -128,7 +135,7 @@
</Data>
</Transmission>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear Primary</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -139,7 +146,7 @@
</Data>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<Axles>
<Axle axleNumber="1" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xsi:type="v2.0:AxleDataDeclarationType">
<v2.0:AxleType>VehicleNonDriven</v2.0:AxleType>
@@ -226,7 +233,7 @@
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType" >
<Fan>
<Technology>Hydraulic driven - Constant displacement pump</Technology>
</Fan>
diff --git a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
index 5611315b7bd2bcf95759b92719429c86ece3f0e2..85b6fdbe8b653d755076db116aed27c1aa40a3a5 100644
--- a/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
+++ b/VectoCore/VectoCoreTest/TestData/Integration/Buses/FactorMethod/vecto_vehicle-primary_heavyBus_ESS_electricFanSTP.RSLT_VIF.xml
@@ -1,8 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
-<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xmlns:di="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0" xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1" xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3" xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 V:\VectoCore\VectoCore\Resources\XSD/VectoOutputMultistep.0.1.xsd">
+<VectoOutputMultistep xmlns="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+ xmlns:di="http://www.w3.org/2000/09/xmldsig#"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:v2.0="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0"
+ xmlns:v2.1="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.1"
+ xmlns:v2.3="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.3"
+ xmlns:vif0.1="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1"
+ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:VehicleInterimFile:v0.1 ./../../../../../VectoCore/Resources/XSD/VectoOutputMultistep.0.1.xsd">
<PrimaryVehicle>
- <Data xsi:type="PrimaryVehicleDataType" id="PIF-65de7efe65ee4b4cac4c">
- <Vehicle xsi:type="VehiclePIFType">
+ <Data xsi:type="PrimaryVehicleDataType" id="VIF-65de7efe65ee4b4cac4c">
+ <Vehicle xsi:type="ConventionalVehicleVIFType">
<ManufacturerPrimaryVehicle>Generic Truck Manufacturer</ManufacturerPrimaryVehicle>
<ManufacturerAddressPrimaryVehicle>Street, ZIP City</ManufacturerAddressPrimaryVehicle>
<Model>Generic Model</Model>
@@ -31,7 +38,7 @@
</TorqueLimits>
<Components xsi:type="Vehicle_Conventional_ComponentsVIFType">
<Engine>
- <Data xsi:type="EngineDataPIFType">
+ <Data xsi:type="EngineDataVIFType">
<Manufacturer>Generic Engine Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Engine</Model>
<CertificationNumber>e12*0815/8051*2017/05E0000*00</CertificationNumber>
@@ -67,14 +74,14 @@
</Data>
</Engine>
<Transmission>
- <Data xsi:type="TransmissionDataPIFType">
+ <Data xsi:type="TransmissionDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck Gearbox</Model>
<MainCertificationMethod>Standard values</MainCertificationMethod>
<Date>2017-01-11T11:00:00Z</Date>
<AppVersion>3.0.1</AppVersion>
<TransmissionType>AMT</TransmissionType>
- <Gears xsi:type="TransmissionGearsPIFType">
+ <Gears xsi:type="TransmissionGearsVIFType">
<Gear number="1">
<Ratio>14.930</Ratio>
<MaxTorque>1900</MaxTorque>
@@ -128,7 +135,7 @@
</Data>
</Transmission>
<Axlegear>
- <Data xsi:type="AxlegearDataPIFType">
+ <Data xsi:type="AxlegearDataVIFType">
<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
<Model>Generic 40t Long Haul Truck AxleGear</Model>
<CertificationMethod>Standard values</CertificationMethod>
@@ -139,7 +146,7 @@
</Data>
</Axlegear>
<AxleWheels>
- <Data xsi:type="AxleWheelsDataPIFType">
+ <Data xsi:type="AxleWheelsDataVIFType">
<Axles>
<vif0.1:Axle axleNumber="1" xsi:type="AxleDataDeclarationType" xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v2.0">
<AxleType>VehicleNonDriven</AxleType>
@@ -199,7 +206,7 @@
</Data>
</AxleWheels>
<Auxiliaries>
- <Data xmlns:aux="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:DEV:v2.6" xsi:type="AuxiliaryDataPIFType">
+ <Data xsi:type="AUX_Conventional_PrimaryBusType">
<Fan>
<Technology>Electrically driven - Electronically controlled</Technology>
</Fan>
@@ -251,7 +258,7 @@
<Results>
<Status>success</Status>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
@@ -262,10 +269,10 @@
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">17.81185</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">998.21</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
@@ -276,10 +283,10 @@
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">21.37501</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1197.89</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
@@ -290,10 +297,10 @@
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">14.37972</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">805.86</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
@@ -304,10 +311,10 @@
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">17.36588</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">973.21</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13098.63</TotalVehicleMass>
@@ -318,10 +325,10 @@
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">12.72559</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">713.16</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31SD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">17593.16</TotalVehicleMass>
@@ -332,10 +339,10 @@
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">15.58182</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">873.23</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
@@ -346,10 +353,10 @@
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">18.89946</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1059.16</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Heavy Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
@@ -360,10 +367,10 @@
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">22.89746</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1283.21</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
@@ -374,10 +381,10 @@
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">15.23384</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">853.73</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Urban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
@@ -388,10 +395,10 @@
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">18.56793</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">1040.58</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">13543.34</TotalVehicleMass>
@@ -402,10 +409,10 @@
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">13.41841</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">751.99</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P31DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P31DD</PrimaryVehicleSubgroup>
<Mission>Suburban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">18316.69</TotalVehicleMass>
@@ -416,10 +423,10 @@
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">16.61045</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">930.88</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P32SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">14029.90</TotalVehicleMass>
@@ -430,10 +437,10 @@
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">10.88604</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">610.07</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P32SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16669.61</TotalVehicleMass>
@@ -444,10 +451,10 @@
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">12.24260</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">686.10</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P32SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">14244.99</TotalVehicleMass>
@@ -458,10 +465,10 @@
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">8.63290</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">483.80</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P32SD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32SD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">15887.48</TotalVehicleMass>
@@ -472,10 +479,10 @@
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">9.09409</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">509.65</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P32DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">14452.35</TotalVehicleMass>
@@ -486,10 +493,10 @@
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">11.25244</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">630.61</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P32DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
<Mission>Interurban</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">17609.41</TotalVehicleMass>
@@ -500,10 +507,10 @@
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">12.91147</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">723.58</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P32DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">14747.01</TotalVehicleMass>
@@ -514,10 +521,10 @@
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">9.09497</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">509.70</CO2>
+
</Result>
<Result status="success">
- <VehicleGroup>P32DD</VehicleGroup>
+ <PrimaryVehicleSubgroup>P32DD</PrimaryVehicleSubgroup>
<Mission>Coach</Mission>
<SimulationParameters>
<TotalVehicleMass unit="kg">16767.53</TotalVehicleMass>
@@ -528,7 +535,7 @@
<Fuel type="NG CI">
<EnergyConsumption unit="MJ/km">9.65550</EnergyConsumption>
</Fuel>
- <CO2 unit="g/km">541.11</CO2>
+
</Result>
</Results>
<ApplicationInformation>
@@ -537,7 +544,7 @@
</ApplicationInformation>
</Data>
<Signature>
- <di:Reference URI="#PIF-65de7efe65ee4b4cac4c">
+ <di:Reference URI="#VIF-65de7efe65ee4b4cac4c">
<di:Transforms>
<di:Transform Algorithm="urn:vecto:xml:2017:canonicalization"/>
<di:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>