From 5aa2b3c9df1c0b77ddce76d5e5179cfa220ca84b Mon Sep 17 00:00:00 2001 From: "VKMTHD\\haraldmartini" <harald.martini@student.tugraz.at> Date: Thu, 6 Oct 2022 11:59:50 +0200 Subject: [PATCH] changed OCV to OVC in Mockup results --- .../CIF_MockupResults_OVC-HEV_Bus.xml | 16 ++++++++-------- .../CIF_MockupResults_OVC-HEV_Lorry.xml | 16 ++++++++-------- .../CIF_MockupResults_non-OVC-HEV_Bus.xml | 8 ++++---- .../CIF_MockupResults_non-OVC-HEV_Lorry.xml | 8 ++++---- .../MockupResults/MRF_MockupResults_Conv_Bus.xml | 4 ++-- .../MRF_MockupResults_Conv_Lorry.xml | 4 ++-- .../MRF_MockupResults_OVC-HEV_Bus.xml | 5 ++--- .../MRF_MockupResults_OVC-HEV_Lorry.xml | 4 ++-- .../MRF_MockupResults_non-OVC-HEV_Bus.xml | 6 +++--- .../MRF_MockupResults_non-OVC-HEV_Lorry.xml | 6 +++--- 10 files changed, 38 insertions(+), 39 deletions(-) diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Bus.xml index 6b91ea6281..7e3165853f 100644 --- a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Bus.xml +++ b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Bus.xml @@ -4,15 +4,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputCustomer.0.9.xsd"> <Results> <Status>success</Status> - <!-- OCV HEV (and OCV FCV in future) Bus --> - <Result status="success" xsi:type="ResultSuccessOCVHEVType"> + <!-- OVC HEV (and OVC FCV in future) Bus --> + <Result status="success" xsi:type="ResultSuccessOVCHEVType"> <Mission>Long Haul</Mission> <SimulationParameters> <TotalVehicleMass unit="kg">17200</TotalVehicleMass> <MassPassengers unit="kg">2600</MassPassengers> <PassengerCount>13.75</PassengerCount> </SimulationParameters> - <OCVMode type="charge depleting"> + <OVCMode type="charge depleting"> <AverageSpeed unit="km/h">1.0</AverageSpeed> <Fuel type="Diesel CI"><!-- repeat for every fuel used --> <FuelConsumption unit="g/km">3.1</FuelConsumption> @@ -30,8 +30,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec </ElectricEnergy> <CO2 unit="g/km">5.1</CO2> <CO2 unit="g/p-km">5.2</CO2> - </OCVMode> - <OCVMode type="charge sustaining"> + </OVCMode> + <OVCMode type="charge sustaining"> <AverageSpeed unit="km/h">1.2</AverageSpeed> <Fuel type="Diesel CI"><!-- repeat for every fuel used --> <FuelConsumption unit="g/km">6.1</FuelConsumption> @@ -43,7 +43,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec </Fuel> <CO2 unit="g/km">8.1</CO2> <CO2 unit="g/p-km">8.2</CO2> - </OCVMode> + </OVCMode> <Total> <AverageSpeed unit="km/h">1.2</AverageSpeed> <Fuel type="Diesel CI"><!-- repeat for every fuel used --> @@ -68,8 +68,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec <UtilityFactor>0.345</UtilityFactor> </Total> </Result> - <!-- END OCV HEV (and OCV FCV in future) Bus --> - <Summary xsi:type="ResultSummaryOCVHEVType"> + <!-- END OVC HEV (and OVC FCV in future) Bus --> + <Summary xsi:type="ResultSummaryOVCHEVType"> <AveragePassengerCount>3.141</AveragePassengerCount> <Fuel type="Diesel CI"><!-- repeat for every fuel used --> <FuelConsumption unit="g/km">6.1</FuelConsumption> diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Lorry.xml b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Lorry.xml index db265ed792..cbb5153cbb 100644 --- a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Lorry.xml +++ b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_OVC-HEV_Lorry.xml @@ -4,14 +4,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputCustomer.0.9.xsd"> <Results> <Status>success</Status> - <!-- OCV HEV (and OCV FCV in future) Lorry --> - <Result status="success" xsi:type="ResultSuccessOCVHEVType"> + <!-- OVC HEV (and OVC FCV in future) Lorry --> + <Result status="success" xsi:type="ResultSuccessOVCHEVType"> <Mission>Long Haul</Mission> <SimulationParameters> <TotalVehicleMass unit="kg">17200</TotalVehicleMass> <Payload unit="kg">2600</Payload> </SimulationParameters> - <OCVMode type="charge depleting"> + <OVCMode type="charge depleting"> <AverageSpeed unit="km/h">1.0</AverageSpeed> <Fuel type="Diesel CI"><!-- repeat for every fuel used --> <FuelConsumption unit="g/km">3.1</FuelConsumption> @@ -35,8 +35,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec <CO2 unit="g/km">5.1</CO2> <CO2 unit="g/t-km">5.3</CO2> <CO2 unit="g/m³-km">5.4</CO2> - </OCVMode> - <OCVMode type="charge sustaining"> + </OVCMode> + <OVCMode type="charge sustaining"> <AverageSpeed unit="km/h">1.2</AverageSpeed> <Fuel type="Diesel CI"><!-- repeat for every fuel used --> <FuelConsumption unit="g/km">6.1</FuelConsumption> @@ -52,7 +52,7 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec <CO2 unit="g/km">8.1</CO2> <CO2 unit="g/t-km">8.3</CO2> <CO2 unit="g/m³-km">8.4</CO2> - </OCVMode> + </OVCMode> <Total> <AverageSpeed unit="km/h">1.2</AverageSpeed> <Fuel type="Diesel CI"><!-- repeat for every fuel used --> @@ -83,8 +83,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec <UtilityFactor>0.345</UtilityFactor> </Total> </Result> - <!-- END OCV HEV (and OCV FCV in future) Lorry --> - <Summary xsi:type="ResultSummaryOCVHEVType"> + <!-- END OVC HEV (and OVC FCV in future) Lorry --> + <Summary xsi:type="ResultSummaryOVCHEVType"> <AveragePayload unit="t">3.141</AveragePayload> <!-- repeat for every fuel used --> <Fuel type="Diesel CI"> diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Bus.xml index 337f5ef774..d38849abfa 100644 --- a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Bus.xml +++ b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Bus.xml @@ -4,8 +4,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputCustomer.0.9.xsd"> <Results> <Status>success</Status> - <!-- non-OCV HEV Bus --> - <Result status="success" xsi:type="ResultSuccessNonOCVHEVType"> + <!-- non-OVC HEV Bus --> + <Result status="success" xsi:type="ResultSuccessNonOVCHEVType"> <Mission>Long Haul</Mission> <SimulationParameters> <TotalVehicleMass unit="kg">17200</TotalVehicleMass> @@ -26,8 +26,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec <CO2 unit="g/p-km">8.2</CO2> </Total> </Result> - <!-- END non-OCV HEV Bus --> - <Summary xsi:type="ResultSummaryNonOCVHEVType"> + <!-- END non-OVC HEV Bus --> + <Summary xsi:type="ResultSummaryNonOVCHEVType"> <AveragePassengerCount>3.141</AveragePassengerCount> <Fuel type="Diesel CI"><!-- repeat for every fuel used --> <FuelConsumption unit="g/km">6.1</FuelConsumption> diff --git a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Lorry.xml b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Lorry.xml index 6b6c0a8ffb..5c8ba64ac9 100644 --- a/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Lorry.xml +++ b/VectoMockup/VectoMockup/MockupResults/CIF_MockupResults_non-OVC-HEV_Lorry.xml @@ -4,8 +4,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputCustomer.0.9.xsd"> <Results> <Status>success</Status> - <!-- non-OCV HEV Lorry --> - <Result status="success" xsi:type="ResultSuccessNonOCVHEVType"> + <!-- non-OVC HEV Lorry --> + <Result status="success" xsi:type="ResultSuccessNonOVCHEVType"> <Mission>Long Haul</Mission> <SimulationParameters> <TotalVehicleMass unit="kg">17200</TotalVehicleMass> @@ -29,8 +29,8 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:CustomerOutput:v0.9 V:\VectoCore\Vec <CO2 unit="g/m³-km">8.4</CO2> </Total> </Result> - <!-- END non-OCV HEV Lorry --> - <Summary xsi:type="ResultSummaryNonOCVHEVType"> + <!-- END non-OVC HEV Lorry --> + <Summary xsi:type="ResultSummaryNonOVCHEVType"> <AveragePayload unit="t">3.141</AveragePayload> <Fuel type="Diesel CI"><!-- repeat for every fuel used --> <FuelConsumption unit="g/km">6.1</FuelConsumption> diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Bus.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Bus.xml index 89a9d9c2b6..761358d65f 100644 --- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Bus.xml +++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Bus.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputManufacturer.0.9.xsd"> <Results> <Status>success</Status> - <!-- ICE only, non-OCV HEV (and H2 only ICE in future) Bus --> + <!-- ICE only, non-OVC HEV (and H2 only ICE in future) Bus --> <Result status="success" xsi:type="ResultSuccessConventionalType"> <Mission>Long Haul</Mission> <Distance unit="km">100.185</Distance> @@ -44,6 +44,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\ <CO2 unit="g/p-km">8.2</CO2> </Total> </Result> - <!-- END ICE only, non-OCV HEV (and H2 only ICE in future) Bus --> + <!-- END ICE only, non-OVC HEV (and H2 only ICE in future) Bus --> </Results> </VectoMockResults> \ No newline at end of file diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Lorry.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Lorry.xml index 8cbd3114a6..7cc3c1534b 100644 --- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Lorry.xml +++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_Conv_Lorry.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputManufacturer.0.9.xsd"> <Results> <Status>success</Status> - <!-- ICE only, non-OCV HEV (and H2 only ICE in future) Lorry --> + <!-- ICE only, non-OVC HEV (and H2 only ICE in future) Lorry --> <Result status="success" xsi:type="ResultSuccessConventionalType"> <Mission>Long Haul</Mission> <Distance unit="km">100.185</Distance> @@ -46,6 +46,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\ <CO2 unit="g/m³-km">8.4</CO2> </Total> </Result> - <!-- ICE only, non-OCV HEV (and H2 only ICE in future) Lorry --> + <!-- ICE only, non-OVC HEV (and H2 only ICE in future) Lorry --> </Results> </VectoMockResults> \ No newline at end of file diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml index 0b8151ad2b..c68905f44d 100644 --- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml +++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Bus.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputManufacturer.0.9.xsd"> <Results> <Status>success</Status> - <!-- OCV HEV (and OCV FCV in future) Bus --> + <!-- OVC HEV (and OVC FCV in future) Bus --> <Result status="success" xsi:type="ResultSuccessOVCHEVType"> <Mission>Long Haul</Mission> <Distance unit="km">100.185</Distance> @@ -105,7 +105,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\ <UtilityFactor>0.345</UtilityFactor> </Total> </Result> - <!-- END OCV HEV (and OCV FCV in future) Bus --> + <!-- END OVC HEV (and OVC FCV in future) Bus --> </Results> </VectoMockResults> - diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml index e3f1c79e9d..eb56bfb26b 100644 --- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml +++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_OVC-HEV_Lorry.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputManufacturer.0.9.xsd"> <Results> <Status>success</Status> - <!-- OCV HEV (and OCV FCV in future) Lorry --> + <!-- OVC HEV (and OVC FCV in future) Lorry --> <Result status="success" xsi:type="ResultSuccessOVCHEVType"> <Mission>Long Haul</Mission> <Distance unit="km">100.185</Distance> @@ -119,6 +119,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\ <UtilityFactor>0.345</UtilityFactor> </Total> </Result> - <!-- END OCV HEV (and OCV FCV in future) Lorry --> + <!-- END OVC HEV (and OVC FCV in future) Lorry --> </Results> </VectoMockResults> \ No newline at end of file diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml index 44dba2fad0..4c30b196ee 100644 --- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml +++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Bus.xml @@ -4,8 +4,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputManufacturer.0.9.xsd"> <Results> <Status>success</Status> - <!-- ICE only, non-OCV HEV (and H2 only ICE in future) Bus --> - <Result status="success" xsi:type="ResultSuccessNonOCVHEVType"> + <!-- ICE only, non-OVC HEV (and H2 only ICE in future) Bus --> + <Result status="success" xsi:type="ResultSuccessNonOVCHEVType"> <Mission>Long Haul</Mission> <Distance unit="km">100.185</Distance> <SimulationParameters> @@ -44,6 +44,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\ <CO2 unit="g/p-km">8.2</CO2> </Total> </Result> - <!-- END ICE only, non-OCV HEV (and H2 only ICE in future) Bus --> + <!-- END ICE only, non-OVC HEV (and H2 only ICE in future) Bus --> </Results> </VectoMockResults> \ No newline at end of file diff --git a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Lorry.xml b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Lorry.xml index 3294c2ec5e..23ea0409ba 100644 --- a/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Lorry.xml +++ b/VectoMockup/VectoMockup/MockupResults/MRF_MockupResults_non-OVC-HEV_Lorry.xml @@ -4,8 +4,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\VectoCore\Resources\XSD\VectoOutputManufacturer.0.9.xsd"> <Results> <Status>success</Status> - <!-- ICE only, non-OCV HEV (and H2 only ICE in future) Lorry --> - <Result status="success" xsi:type="ResultSuccessNonOCVHEVType"> + <!-- ICE only, non-OVC HEV (and H2 only ICE in future) Lorry --> + <Result status="success" xsi:type="ResultSuccessNonOVCHEVType"> <Mission>Long Haul</Mission> <Distance unit="km">100.185</Distance> <SimulationParameters> @@ -46,6 +46,6 @@ xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationOutput:v0.9 V:\VectoCore\ <CO2 unit="g/m³-km">8.4</CO2> </Total> </Result> - <!-- ICE only, non-OCV HEV (and H2 only ICE in future) Lorry --> + <!-- ICE only, non-OVC HEV (and H2 only ICE in future) Lorry --> </Results> </VectoMockResults> \ No newline at end of file -- GitLab