From 24f307a7179fad0d5b07c6847d28c7ed3e85f09b Mon Sep 17 00:00:00 2001
From: "VKMTHD\\haraldmartini" <harald.martini@student.tugraz.at>
Date: Wed, 28 Sep 2022 12:50:29 +0200
Subject: [PATCH] added DCDCData to VectoRunData
---
.../Models/Simulation/Data/VectoRunData.cs | 5 +++++
.../Simulation/Impl/PowertrainBuilder.cs | 18 +++++++++---------
.../Data/ElectricComponents/DCDCData.cs | 15 +++++++++++++++
.../VectoCore/OutputData/ModalDataContainer.cs | 1 +
4 files changed, 30 insertions(+), 9 deletions(-)
create mode 100644 VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricComponents/DCDCData.cs
diff --git a/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
index ad008eab16..3f9b180a3b 100644
--- a/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Data/VectoRunData.cs
@@ -48,6 +48,7 @@ using TUGraz.VectoCore.Models.Declaration;
using TUGraz.VectoCore.Models.Simulation.DataBus;
using TUGraz.VectoCore.Models.SimulationComponent.Data;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Battery;
+using TUGraz.VectoCore.Models.SimulationComponent.Data.ElectricComponents;
using TUGraz.VectoCore.Models.SimulationComponent.Data.Gearbox;
using TUGraz.VectoCore.Models.SimulationComponent.Impl;
using TUGraz.VectoCore.Models.SimulationComponent.Strategies;
@@ -72,6 +73,9 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
{
Exempted = false;
JobType = VectoSimulationJobType.ConventionalVehicle;
+ DCDCData = new DCDCData() {
+ DCDCEfficiency = DeclarationData.DCDCEfficiency,
+ };
}
public VectoSimulationJobType JobType { get; internal set; }
@@ -144,6 +148,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Data
public SuperCapData SuperCapData { get; internal set; }
+ public DCDCData DCDCData { get; internal set; }
public SimulationType SimulationType { get; internal set; }
diff --git a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
index a6f947b199..ab56a67483 100644
--- a/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
+++ b/VectoCore/VectoCore/Models/Simulation/Impl/PowertrainBuilder.cs
@@ -506,7 +506,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
busAux.ElectricStorage = electricStorage;
if (data.BusAuxiliaries.ElectricalUserInputsConfig.ConnectESToREESS) {
var dcdc = new DCDCConverter(container,
- data.BusAuxiliaries.ElectricalUserInputsConfig.DCDCEfficiency);
+ data.DCDCData.DCDCEfficiency);
busAux.DCDCConverter = dcdc;
es.Connect(dcdc);
}
@@ -640,7 +640,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
busAux.ElectricStorage = electricStorage;
if (data.BusAuxiliaries.ElectricalUserInputsConfig.ConnectESToREESS) {
var dcdc = new DCDCConverter(container,
- data.BusAuxiliaries.ElectricalUserInputsConfig.DCDCEfficiency);
+ data.DCDCData.DCDCEfficiency);
busAux.DCDCConverter = dcdc;
es.Connect(dcdc);
}
@@ -761,18 +761,18 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
var busAux = new BusAuxiliariesAdapter(container, auxCfg);
var electricStorage = new NoBattery(container);
busAux.ElectricStorage = electricStorage;
- var dcdc = new DCDCConverter(container, data.BusAuxiliaries.ElectricalUserInputsConfig.DCDCEfficiency);
+ var dcdc = new DCDCConverter(container, data.DCDCData.DCDCEfficiency);
busAux.DCDCConverter = dcdc;
es.Connect(dcdc);
em.BusAux = busAux;
} else {
- var dcdc = new DCDCConverter(container, DeclarationData.DCDCEfficiency);
+ var dcdc = new DCDCConverter(container, data.DCDCData.DCDCEfficiency);
es.Connect(dcdc);
var elAux = new ElectricAuxiliaries(container);
- elAux.AddAuxiliaries(data.Aux.Where(x => x.ConnectToREESS && x.ID != Constants.Auxiliaries.IDs.SteeringPump));
- elAux.AddAuxiliary(new SteeringPumpSystem(data.Aux.Where(aux => aux.ID == Constants.Auxiliaries.IDs.SteeringPump).ToArray()));
+ elAux.AddAuxiliaries(data.Aux.Where(x => x.ConnectToREESS && x.ID != Constants.Auxiliaries.IDs.Cond));
+ elAux.AddAuxiliary(new Conditioning(data.Aux.FirstOrDefault(aux => aux.ID == Constants.Auxiliaries.IDs.Cond)));
dcdc.Connect(elAux);
dcdc.Initialize();
}
@@ -939,7 +939,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
var busAux = new BusAuxiliariesAdapter(container, auxCfg);
var electricStorage = new NoBattery(container);
busAux.ElectricStorage = electricStorage;
- var dcdc = new DCDCConverter(container, data.BusAuxiliaries.ElectricalUserInputsConfig.DCDCEfficiency);
+ var dcdc = new DCDCConverter(container, data.DCDCData.DCDCEfficiency);
busAux.DCDCConverter = dcdc;
es.Connect(dcdc);
em.BusAux = busAux;
@@ -1032,7 +1032,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
var busAux = new BusAuxiliariesAdapter(container, auxCfg);
var electricStorage = new NoBattery(container);
busAux.ElectricStorage = electricStorage;
- var dcdc = new DCDCConverter(container, data.BusAuxiliaries.ElectricalUserInputsConfig.DCDCEfficiency);
+ var dcdc = new DCDCConverter(container, data.DCDCData.DCDCEfficiency);
busAux.DCDCConverter = dcdc;
es.Connect(dcdc);
em.BusAux = busAux;
@@ -1338,7 +1338,7 @@ namespace TUGraz.VectoCore.Models.Simulation.Impl
: (ISimpleBattery)new NoBattery(container);
busAux.ElectricStorage = electricStorage;
if (data.BusAuxiliaries.ElectricalUserInputsConfig.ConnectESToREESS) {
- var dcdc = new DCDCConverter(container, data.BusAuxiliaries.ElectricalUserInputsConfig.DCDCEfficiency);
+ var dcdc = new DCDCConverter(container, data.DCDCData.DCDCEfficiency);
busAux.DCDCConverter = dcdc;
es.Connect(dcdc);
}
diff --git a/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricComponents/DCDCData.cs b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricComponents/DCDCData.cs
new file mode 100644
index 0000000000..33e3743bab
--- /dev/null
+++ b/VectoCore/VectoCore/Models/SimulationComponent/Data/ElectricComponents/DCDCData.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TUGraz.VectoCore.Models.SimulationComponent.Data.ElectricComponents
+{
+ public class DCDCData
+ {
+ [Range(0,1)]
+ public double DCDCEfficiency { get; internal set; }
+ }
+}
diff --git a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
index 2883141ba1..63936a6e75 100644
--- a/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
+++ b/VectoCore/VectoCore/OutputData/ModalDataContainer.cs
@@ -651,6 +651,7 @@ namespace TUGraz.VectoCore.OutputData
string.Format(emCol.GetAttribute().Caption, em.GetName())));
}
}
+
dataColumns.AddRange(
new[] {
// TC
--
GitLab