This site uses cookies. Visit our cookies policy page or click the link in any footer for more information and to change your preferences.

Accept all cookies Accept only essential cookies

Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

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

Pull request #282: Hm/feature/VECTO-1638 rundatafactories and declarationdataadapter for xev 

Merge in VECTO/vecto-dev from VECTO/mq_vecto-dev:hm/feature/VECTO-1638-rundatafactories-and-declarationdataadapter-for-xev to develop

* commit 'eae0a0f7': (38 commits)
  updating version number in release notes
  updating generic P2 vehicle
  fix: battery data adapter: input is in mOhm for XML, in Ohm for CSV
  change in post-processing correction: EC_el_soc/final = 0 for charge depleting simulations
  correcting generic vehicles: internal resistance for batteries in XML files is in mOhm
  deleted console.writeline in LookupData
  update zip name (again)
  changed zip file name of nuget zip
  updated release notes
  bugfix creating relative path with space: remove escape characters (%20)
  bugfix saving declaration job
  update version number
  add missing model properties in testcase
  bugfix postprocessing: lookup vehicle operation only if necessary and mission is set to a declaration mission
  adding output field in vsum file: electric energy consumption considering re-charging losses for CD mode only
  remove generic ihpc jobs
  formatting generic XML declaration jobs, correct em-powermap (values in XML are in Watts), correct model data to avoid warning about negative overload buffer
  removing declaration files which are not needed
  adding generic XML jobs (xEV decl mode)
  combustion engine: only log info in case pt1 cannot be calculated in dryrun
  ...
parents 8f8dc280 eae0a0f7
Branches dev
Tags Build/v0.7.10.2996
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 2296 additions and 3 deletions
.gitignore
+ 1
− 0
View file @ d897f126
......@@ -225,3 +225,4 @@ Documentation/VehiclesReleaseComparisonDeclarationMode/**/*.vsum
/.idea/.idea.VECTO/.idea
/Generic Vehicles/Engineering Mode/GenericIHPC/6SpeedGbx/EM_Maps.xlsx
/Nuget
Directory.Build.props
+ 1
− 1
View file @ d897f126
......@@ -8,7 +8,7 @@
<!--<DefineConstants>CERTIFICATION_RELEASE</DefineConstants>-->
<!-- Global VECTO Version -->
<MainProductVersion>0.7.9</MainProductVersion>
<MainProductVersion>0.7.10</MainProductVersion>
<VersionSuffix>DEV</VersionSuffix>
<!-- The following settings are used as default values for ALL projects -->
......
Directory.Build.targets
+ 24
− 2
View file @ d897f126
......@@ -31,16 +31,21 @@
</Target>
<Target Name="Packaging" AfterTargets="DispatchToInnerBuilds" Condition="('$(Configuration)'=='Deploy') Or ('$(Configuration)' == 'MockupDeploy')">
<Message Text="Packaging in $(Configuration) Configuration" Importance="high" />
<Exec Command="cscript &quot;$(SolutionDir)documentation\user manual source\convertpptxtopdf.vbs&quot; &quot;$(SolutionDir)documentation\user manual source\release notes vecto3.x.pptx&quot; &quot;$(SolutionDir)documentation\user manual source\release notes vecto3.x.pdf&quot;"/>
<PropertyGroup>
<CurrentDate>$([System.DateTime]::Now.ToString(yyy_MM_dd))</CurrentDate>
<DeployPath>$(SolutionDir)Deploy\$(CurrentDate)-VECTO-$(Version)\</DeployPath>
<NuGetPath>$(SolutionDir)Nuget\$(CurrentDate)-VECTO-NuGet-$(Version)\</NuGetPath>
<DeployPath Condition="'$(Configuration)'=='MockupDeploy'">$(SolutionDir)Deploy\$(CurrentDate)-VECTO_MOCKUP-$(Version)\</DeployPath>
<NuGetPath Condition="'$(Configuration)'=='MockupDeploy'"> $(SolutionDir)Nuget\$(CurrentDate)-VECTO_MOCKUP-NuGet-$(Version)\</NuGetPath>
</PropertyGroup>
<RemoveDir Directories="$(SolutionDir)Deploy" Condition="Exists('$(SolutionDir)Deploy')"/>
<RemoveDir Directories="$(NuGetPath)" Condition="Exists('$(NuGetPath)')"/>
<MakeDir Directories="$(DeployPath)"/>
<MakeDir Directories="$(NuGetPath)"/>
<ItemGroup Condition="'$(Configuration)'=='Deploy'">
<!-- All files for net45 -->
......@@ -185,6 +190,7 @@
<GenericVehicles Include="$(SolutionDir)Generic Vehicles\**\*.*" Exclude="$(SolutionDir)**\*.vmod;$(SolutionDir)**\*.vsum;$(SolutionDir)**\*RSLT_*.xml;$(SolutionDir)**\*.pdf"/>
<MissionProfiles Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\MissionCycles\**\*.*"/>
<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**\*.csv" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**\*.md" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**\*.vacc" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**\*.apac" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
<DeclarationData Include="$(SolutionDir)VectoCore\VectoCore\Resources\Declaration\**\*.aenv" Exclude="$(SolutionDir)**\MissionCycles\**\*.*"/>
......@@ -203,7 +209,8 @@
<ReleaseNotes Include="$(SolutionDir)Documentation\User Manual Source\Release Notes Vecto3.x.pdf"/>
</ItemGroup>
<Copy SourceFiles="@(GenericVehicles)" DestinationFiles="@(GenericVehicles->'$(DeployPath)Generic Vehicles\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(DeclarationData)" DestinationFolder="$(DeployPath)Declaration" />
<!-- <Copy SourceFiles="@(DeclarationData)" DestinationFolder="$(DeployPath)Declaration" /> -->
<Copy SourceFiles="@(DeclarationData)" DestinationFiles="@(DeclarationData->'$(DeployPath)Declaration\%(RecursiveDir)%(Filename)%(Extension)')"/>
<Copy SourceFiles="@(MissionProfiles)" DestinationFolder="$(DeployPath)Mission Profiles" />
<Copy SourceFiles="@(VectoXMLExamples)" DestinationFolder="$(DeployPath)XML\Examples" />
<Copy SourceFiles="@(VectoXSD)" DestinationFolder="$(DeployPath)XML\XSD" />
......@@ -213,6 +220,21 @@
<Copy SourceFiles="$(SolutionDir)\Documentation\User Manual Source\README for Mission Profiles Directory.txt" DestinationFiles="$(DeployPath)Mission Profiles\!! README !!.TXT"/>
<Copy SourceFiles="$(SolutionDir)\Documentation\User Manual Source\README for Declaration Directory.txt" DestinationFiles="$(DeployPath)Declaration\!! README !!.TXT"/>
<!-- NuGet Files-->
<ItemGroup Condition="'$(Configuration)'=='Deploy'">
<VectoNuget Include ="$(SolutionDir)VectoCore\VectoCore\bin\Release\*.nupkg" />
<VectoNuget Include ="$(SolutionDir)VectoCommon\VectoCommon\bin\Release\*.nupkg" />
<VectoNuget Include ="$(SolutionDir)VectoCommon\VectoHashing\bin\Release\*.nupkg" />
</ItemGroup>
<Copy SourceFiles="@(VectoNuget)" DestinationFolder ="$(NuGetPath)"/>
<PropertyGroup>
<NugetDestinationZip>$(SolutionDir)$(CurrentDate)-VECTO-NuGet-$(Version).zip</NugetDestinationZip>
<NugetDestinationZip Condition="'$(Configuration)'=='MockupDeploy'">$(SolutionDir)$(CurrentDate)-VECTO_MOCKUP-NuGet-$(Version).zip</NugetDestinationZip>
</PropertyGroup>
<ZipDirectory SourceDirectory="$(NuGetPath)" DestinationFile="$(NugetDestinationZip)" Overwrite="true"/>
<PropertyGroup>
<DestinationZip>$(SolutionDir)$(CurrentDate)-VECTO-$(Version).zip</DestinationZip>
<DestinationZip Condition="'$(Configuration)'=='MockupDeploy'">$(SolutionDir)$(CurrentDate)-VECTO_MOCKUP-$(Version).zip</DestinationZip>
......
Documentation/User Manual Source/Release Notes Vecto3.x.pptx
+ 0
− 0
View file @ d897f126
No preview for this file type
Generic Vehicles/Declaration Mode/PEV/GenericIEPC/Common/GenericBattery_243kWh.vbatr 0 → 100644
+ 3
− 0
View file @ d897f126
SoC, Ri
0, 0.04
100, 0.04
\ No newline at end of file
Generic Vehicles/Declaration Mode/PEV/GenericIEPC/Common/GenericBattery_243kWh.vbatv 0 → 100644
+ 12
− 0
View file @ d897f126
SOC, V
0, 673.5
10, 700.2
20, 715.4
30, 723.6
40, 727.7
50, 730.0
60, 731.6
70, 733.8
80, 737.1
90, 742.2
100, 750.2
\ No newline at end of file
Generic Vehicles/Declaration Mode/PEV/GenericIEPC/Common/GenericBattery_243kWh_750V.vbat 0 → 100644
+ 22
− 0
View file @ d897f126
{
"Header": {
"CreatedBy": "",
"Date": "2023-02-15T16:14:27.5616389Z",
"AppVersion": "3",
"FileVersion": 1
},
"Body": {
"SavedInDeclMode": true,
"REESSType": "Battery",
"Model": "Generic Battery",
"Capacity": 324.0,
"SOC_min": 10.0,
"SOC_max": 90.0,
"MaxCurrentMap": "MaxCurrent.vimax",
"InternalResistanceCurve": "GenericBattery_243kWh.vbatr",
"SoCCurve": "GenericBattery_243kWh.vbatv",
"TestingTemperature": 40.0,
"JunctionboxIncluded": false,
"ConnectorsSubsystemsIncluded": true
}
}
\ No newline at end of file
Generic Vehicles/Declaration Mode/PEV/GenericIEPC/Common/MaxCurrent.vimax 0 → 100644
+ 3
− 0
View file @ d897f126
SOC, I_charge, I_discharge
0, 1620, 1620
100, 1620, 1620
\ No newline at end of file
Generic Vehicles/Declaration Mode/PEV/GenericIEPC/Common/ShiftParameters.vtcu 0 → 100644
+ 14
− 0
View file @ d897f126
{
"Header": {
"CreatedBy": " ()",
"Date": "2016-10-13T15:52:04.0766564Z",
"AppVersion": "3",
"FileVersion": 1
},
"Body": {
"Rating_current_gear": 0.995,
"RatioEarlyUpshiftFC" : 24,
"RatioEarlyDownshiftFC" : 24
}
}
\ No newline at end of file
Generic Vehicles/Declaration Mode/PEV/GenericIEPC/Common/Truck.vacc 0 → 100644
+ 6
− 0
View file @ d897f126
v [km/h],acc [m/s],dec [m/s]
0,1,-1
25,1,-1
50,0.642857143,-1
60,0.5,-0.5
120,0.5,-0.5
Generic Vehicles/Declaration Mode/PEV/GenericIEPC/IEPC_Gbx1Speed+Axle/GenericIEPC_Gbx1Axl.viepc 0 → 100644
+ 53
− 0
View file @ d897f126
{
"Header": {
"CreatedBy": "",
"Date": "2023-02-15T16:06:27.6149994Z",
"AppVersion": "3",
"FileVersion": 1
},
"Body": {
"SavedInDeclMode": true,
"Model": "Generic IEPC",
"ElectricMachineType": "PSM",
"Inertia": 0.5,
"DifferentialIncluded": true,
"DesignTypeWheelMotor": false,
"NrOfDesignTypeWheelMotorMeasured": 1,
"ThermalOverloadRecoveryFactor": 0.0,
"R85RatedPower": 250.0,
"Gears": [
{
"Ratio": 12.276
}
],
"VoltageLevels": [
{
"Voltage": 500.0,
"ContinuousTorque": 13860.59,
"ContinuousTorqueSpeed": 166.99,
"OverloadTorque": 16517.2,
"OverloadTorqueSpeed": 166.01,
"OverloadTime": 312.0,
"FullLoadCurve": "IEPC_Gbx1Axl_FLD_min.viepcp",
"PowerMaps": {
"1": "IEPC_Gbx1Axl.viepco"
}
},
{
"Voltage": 900.0,
"ContinuousTorque": 15015.63,
"ContinuousTorqueSpeed": 168.62,
"OverloadTorque": 17325.73,
"OverloadTorqueSpeed": 170.17,
"OverloadTime": 345.0,
"FullLoadCurve": "IEPC_Gbx1Axl_FLD_max.viepcp",
"PowerMaps": {
"1": "IEPC_Gbx1Axl.viepco"
}
}
],
"DragCurves": {
"1": "IEPC_Gbx1Axl_drag.viepcd"
}
}
}
\ No newline at end of file
Generic Vehicles/Declaration Mode/PEV/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPCVehicle_Gbx1Axl.vveh 0 → 100644
+ 71
− 0
View file @ d897f126
{
"Header": {
"CreatedBy": "",
"Date": "2023-02-15T16:06:33.1846134Z",
"AppVersion": "3",
"FileVersion": 11
},
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
"LegislativeClass": "N3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"MassMax": 11.99,
"Loading": 0.0,
"rdyn": 0.0,
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
"AxleConfig": {
"Type": "4x2",
"Axles": [
{
"Inertia": 6.5,
"Wheels": "265/70 R19.5",
"AxleWeightShare": 0.0,
"TwinTyres": false,
"RRCISO": 0.0065,
"FzISO": 20850.0,
"Type": "VehicleNonDriven"
},
{
"Inertia": 6.5,
"Wheels": "265/70 R19.5",
"AxleWeightShare": 0.0,
"TwinTyres": true,
"RRCISO": 0.0075,
"FzISO": 20850.0,
"Type": "VehicleDriven"
}
]
},
"EngineStopStart": false,
"EcoRoll": "None",
"PredictiveCruiseControl": "None",
"ATEcoRollReleaseLockupClutch": false,
"CdA": 4.83,
"VehicleHeight": 3.0,
"InitialSoC": 80.0,
"PowertrainConfiguration": "IEPC_E",
"IEPC": "GenericIEPC_Gbx1Axl.viepc",
"Batteries": [
{
"NumPacks": 1,
"BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
"StreamId": 0
},
{
"NumPacks": 1,
"BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
"StreamId": 1
}
],
"PTO": {
"Type": "None",
"LossMap": "",
"Cycle": "",
"CycleEPTO": "",
"CycleDriving": ""
}
}
}
\ No newline at end of file
Generic Vehicles/Declaration Mode/PEV/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_max.viepcp 0 → 100644
+ 23
− 0
View file @ d897f126
n_out , T_drive_out , T_recuperation_out
0.00 , 17325.73 , -19570.62
3.34 , 17325.73 , -19570.62
33.72 , 17325.73 , -19570.62
67.45 , 17325.73 , -19570.62
101.09 , 17325.73 , -19570.62
134.82 , 17325.73 , -19570.62
168.54 , 17325.73 , -19570.62
202.26 , 14438.11 , -16308.85
235.99 , 12375.42 , -13978.91
269.63 , 10828.58 , -12231.64
303.36 , 9625.48 , -10872.66
337.08 , 8662.87 , -9785.31
370.80 , 7875.35 , -8895.76
404.53 , 7219.06 , -8154.43
438.17 , 6663.71 , -7527.12
471.90 , 6187.83 , -6989.58
505.62 , 5775.24 , -6523.54
539.35 , 5414.41 , -6115.95
573.07 , 5095.84 , -5756.11
606.71 , 4812.63 , -5436.20
640.44 , 4559.44 , -5150.21
674.16 , 4331.43 , -4892.66
Generic Vehicles/Declaration Mode/PEV/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl_FLD_min.viepcp 0 → 100644
+ 23
− 0
View file @ d897f126
n_out , T_drive_out , T_recuperation_out
0.00 , 17325.73 , -19570.62
3.34 , 17325.73 , -19570.62
33.72 , 17325.73 , -19570.62
67.45 , 17325.73 , -19570.62
101.09 , 17325.73 , -19570.62
134.82 , 17325.73 , -19570.62
168.54 , 17325.73 , -19570.62
202.26 , 14438.11 , -16308.85
235.99 , 12375.42 , -13978.91
269.63 , 10828.58 , -12231.64
303.36 , 9625.48 , -10872.66
337.08 , 8662.87 , -9785.31
370.80 , 7875.35 , -8895.76
404.53 , 7219.06 , -8154.43
438.17 , 6663.71 , -7527.12
471.90 , 6187.83 , -6989.58
505.62 , 5775.24 , -6523.54
539.35 , 5414.41 , -6115.95
573.07 , 5095.84 , -5756.11
606.71 , 4812.63 , -5436.20
640.44 , 4559.44 , -5150.21
674.16 , 4331.43 , -4892.66
Generic Vehicles/Declaration Mode/PEV/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC_Gbx1Axl_drag.viepcd 0 → 100644
+ 23
− 0
View file @ d897f126
n_out , T_drag_out
0.00 , -37.45
3.37 , -38.62
33.71 , -49.58
67.42 , -61.71
101.12 , -73.85
134.83 , -86.11
168.54 , -98.24
202.25 , -110.38
235.96 , -122.51
269.67 , -134.65
303.37 , -146.91
337.08 , -159.04
370.79 , -171.18
404.50 , -183.31
438.21 , -195.45
471.92 , -207.71
505.62 , -219.84
539.33 , -231.98
573.04 , -244.11
606.75 , -256.24
640.46 , -268.51
674.17 , -280.64
Generic Vehicles/Declaration Mode/PEV/GenericIEPC/IEPC_Gbx1Speed+Axle/IEPC__Gbx1Axl.vecto 0 → 100644
+ 43
− 0
View file @ d897f126
{
"Header": {
"CreatedBy": "",
"Date": "2023-02-15T16:06:35.5695734Z",
"AppVersion": "3",
"FileVersion": 12
},
"Body": {
"SavedInDeclMode": true,
"VehicleFile": "IEPCVehicle_Gbx1Axl.vveh",
"Padd_electric": 0.0,
"Aux": [
{
"ID": "STP",
"Type": "Steering pump",
"Technology": [
"Full electric steering gear"
]
},
{
"ID": "AC",
"Type": "HVAC",
"Technology": [
"Default"
]
},
{
"ID": "ES",
"Type": "Electric System",
"Technology": [
"Standard technology"
]
},
{
"ID": "PS",
"Type": "Pneumatic System",
"Technology": [
"Vacuum pump + elec. driven"
]
}
]
}
}
\ No newline at end of file
Generic Vehicles/Declaration Mode/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl1/GenericIEPC_Gbx1Whl1.viepc 0 → 100644
+ 53
− 0
View file @ d897f126
{
"Header": {
"CreatedBy": "",
"Date": "2023-02-15T15:23:50.2192903Z",
"AppVersion": "3",
"FileVersion": 1
},
"Body": {
"SavedInDeclMode": true,
"Model": "Generic IEPC",
"ElectricMachineType": "PSM",
"Inertia": 0.5,
"DifferentialIncluded": false,
"DesignTypeWheelMotor": true,
"NrOfDesignTypeWheelMotorMeasured": 1,
"ThermalOverloadRecoveryFactor": 0.0,
"R85RatedPower": 0.0,
"Gears": [
{
"Ratio": 12.276
}
],
"VoltageLevels": [
{
"Voltage": 500.0,
"ContinuousTorque": 6930.29,
"ContinuousTorqueSpeed": 166.99,
"OverloadTorque": 8258.6,
"OverloadTorqueSpeed": 166.01,
"OverloadTime": 312.0,
"FullLoadCurve": "IEPC_Gbx1Whl1_FLD_min.viepcp",
"PowerMaps": {
"1": "IEPC_Gbx1Whl1.viepco"
}
},
{
"Voltage": 900.0,
"ContinuousTorque": 7507.82,
"ContinuousTorqueSpeed": 168.62,
"OverloadTorque": 8662.87,
"OverloadTorqueSpeed": 170.17,
"OverloadTime": 345.0,
"FullLoadCurve": "IEPC_Gbx1Whl1_FLD_max.viepcp",
"PowerMaps": {
"1": "IEPC_Gbx1Whl1.viepco"
}
}
],
"DragCurves": {
"1": "IEPC_Gbx1Whl1_drag.viepcd"
}
}
}
\ No newline at end of file
Generic Vehicles/Declaration Mode/PEV/GenericIEPC/IEPC_Gbx1Speed-Whl1/IEPCVehicle_Gbx1Whl1.vveh 0 → 100644
+ 71
− 0
View file @ d897f126
{
"Header": {
"CreatedBy": "",
"Date": "2023-02-15T15:51:09.3710211Z",
"AppVersion": "3",
"FileVersion": 11
},
"Body": {
"SavedInDeclMode": true,
"VehCat": "RigidTruck",
"LegislativeClass": "N3",
"CurbWeight": 4670.0,
"CurbWeightExtra": 0.0,
"MassMax": 11.99,
"Loading": 0.0,
"rdyn": 0.0,
"CdCorrMode": "CdofVdecl",
"CdCorrFile": "",
"AxleConfig": {
"Type": "4x2",
"Axles": [
{
"Inertia": 6.5,
"Wheels": "265/70 R19.5",
"AxleWeightShare": 0.0,
"TwinTyres": false,
"RRCISO": 0.0065,
"FzISO": 20850.0,
"Type": "VehicleNonDriven"
},
{
"Inertia": 6.5,
"Wheels": "265/70 R19.5",
"AxleWeightShare": 0.0,
"TwinTyres": true,
"RRCISO": 0.0075,
"FzISO": 20850.0,
"Type": "VehicleDriven"
}
]
},
"EngineStopStart": false,
"EcoRoll": "None",
"PredictiveCruiseControl": "None",
"ATEcoRollReleaseLockupClutch": false,
"CdA": 4.83,
"VehicleHeight": 3.0,
"InitialSoC": 80.0,
"PowertrainConfiguration": "IEPC_E",
"IEPC": "GenericIEPC_Gbx1Whl1.viepc",
"Batteries": [
{
"NumPacks": 1,
"BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
"StreamId": 0
},
{
"NumPacks": 1,
"BatteryFile": "../Common/GenericBattery_243kWh_750V.vbat",
"StreamId": 1
}
],
"PTO": {
"Type": "None",
"LossMap": "",
"Cycle": "",
"CycleEPTO": "",
"CycleDriving": ""
}
}
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about