From 63213f8a1b49271eb46c85d6aafe232060a3b0ad Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Mon, 19 Sep 2022 15:51:19 +0200
Subject: [PATCH] set input data in vecto run data instance, correct writing
airdrag in vif
---
...clarationModeCompletedMultistageBusVectoRunDataFactory.cs | 1 +
.../Impl/DeclarationModeMultistageBusVectoRunDataFactory.cs | 2 +-
VectoCore/VectoCore/Models/Simulation/Impl/ExemptedRun.cs | 3 ++-
.../InterimComponents/InterimAirdragType.cs | 5 +++--
VectoCore/VectoCore/VectoCore.csproj | 1 +
5 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
index 7d9a3523e5..389ea812c8 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeCompletedMultistageBusVectoRunDataFactory.cs
@@ -274,6 +274,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
SimulationType = SimulationType.DistanceCycle,
VehicleDesignSpeed = _segmentCompletedBus.DesignSpeed,
GearshiftParameters = _gearshiftData,
+ InputData = InputDataProvider
};
simulationRunData.EngineData.FuelMode = 0;
simulationRunData.VehicleData.VehicleClass = _segmentCompletedBus.VehicleClass;
diff --git a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeMultistageBusVectoRunDataFactory.cs b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeMultistageBusVectoRunDataFactory.cs
index c2c3e20b12..661ce186de 100644
--- a/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeMultistageBusVectoRunDataFactory.cs
+++ b/VectoCore/VectoCore/InputData/Reader/Impl/DeclarationModeMultistageBusVectoRunDataFactory.cs
@@ -32,7 +32,7 @@ namespace TUGraz.VectoCore.InputData.Reader.Impl
Report = Report,
Mission = new Mission { MissionType = MissionType.ExemptedMission },
VehicleData = CreateVehicleData(InputDataProvider.MultistageJobInputData.JobInputData.PrimaryVehicle.Vehicle),
- MultistageVIFInputData = InputDataProvider
+ MultistageVIFInputData = InputDataProvider,
};
}
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/ExemptedRun.cs b/VectoCore/VectoCore/Models/Simulation/Impl/ExemptedRun.cs
index 8b58372438..4d58646be0 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/ExemptedRun.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/ExemptedRun.cs
@@ -35,7 +35,8 @@ using TUGraz.VectoCommon.Models;
using TUGraz.VectoCore.Models.Connector.Ports.Impl;
using TUGraz.VectoCore.OutputData;
-namespace TUGraz.VectoCore.Models.Simulation.Impl {
+namespace TUGraz.VectoCore.Models.Simulation.Impl
+{
internal class ExemptedRun : VectoRun
{
private Action<ModalDataContainer> _writeSumData;
diff --git a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimAirdragType.cs b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimAirdragType.cs
index 03c65264aa..2c4d5a6fe1 100644
--- a/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimAirdragType.cs
+++ b/VectoCore/VectoCore/OutputData/XML/DeclarationReports/VehicleInformationFile/VehicleInformationFile_0_1/InterimComponents/InterimAirdragType.cs
@@ -49,8 +49,9 @@ namespace TUGraz.VectoCore.OutputData.XML.DeclarationReports.VehicleInformationF
protected XElement GetAirdragElement(XMLDeclarationAirdragDataProviderV20 airdrag)
{
- var retVal = new XElement(v24 + XMLNames.Component_AirDrag,
- new XAttribute("xmlns", v20.NamespaceName));
+ var retVal = new XElement(v24 + XMLNames.Component_AirDrag//,
+ //new XAttribute("xmlns", v20.NamespaceName)
+ );
var tmp = XElement.Load(airdrag.XMLSource.CreateNavigator().ReadSubtree());
retVal.Add(tmp.Elements());
return retVal;
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 03aa0b455d..80cadb5fad 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/VectoCore/VectoCore/VectoCore.csproj
@@ -101,6 +101,7 @@
<InternalsVisibleTo Include="VectoAuxiliariesTests" />
<InternalsVisibleTo Include="VECTO3" />
<InternalsVisibleTo Include="VECTOMultistage" />
+ <InternalsVisibleTo Include="VectoMockup"/>
<InternalsVisibleTo Include="Vecto3GUI2020Test" />
</ItemGroup>
--
GitLab