From 72a803aa7addd29dbb9def37a4a221e6c032c6cb Mon Sep 17 00:00:00 2001
From: "VKMTHD\\franzjosefkober" <franz.josef.kober@ivt.tugraz.at>
Date: Wed, 3 Mar 2021 18:28:02 +0100
Subject: [PATCH] removed ACCompressorType and HeatPump from HVACBusAuxiliaries
interface
---
.../InputData/DeclarationInputData.cs | 5 -----
...larationDataAdapterCompletedBusSpecific.cs | 21 +------------------
.../XML/XMLCompleteBusReaderTest.cs | 3 ---
3 files changed, 1 insertion(+), 28 deletions(-)
diff --git a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
index f5601dd153..be9a99da79 100644
--- a/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
+++ b/VectoCommon/VectoCommon/InputData/DeclarationInputData.cs
@@ -869,16 +869,11 @@ namespace TUGraz.VectoCommon.InputData
HeatPumpType? HeatPumpTypePassengerCompartment { get; }
HeatPumpMode? HeatPumpModePassengerCompartment { get; }
-
- ACCompressorType CompressorTypeDriver { get; }//
- ACCompressorType CompressorTypePassenger { get; }//
Watt AuxHeaterPower { get; }
bool DoubleGlazing { get; }
- bool HeatPump { get; } //
-
bool AdjustableAuxiliaryHeater { get; }
bool SeparateAirDistributionDucts { get; }
diff --git a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs
index 96c59b6579..68c53a2b46 100644
--- a/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs
+++ b/VectoCore/VectoCore/InputData/Reader/DataObjectAdapter/DeclarationDataAdapterCompletedBusSpecific.cs
@@ -183,14 +183,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
var hvacConfiguration = completedVehicle.Components.BusAuxiliaries.HVACAux.SystemConfiguration;
var busAux = completedVehicle.Components.BusAuxiliaries.HVACAux;
- if (hvacConfiguration.RequiresDriverAC() && (busAux.CompressorTypeDriver == ACCompressorType.None || busAux.CompressorTypeDriver == ACCompressorType.Unknown)) {
- throw new VectoException("HVAC System Configuration {0} requires DriverAC Technology", hvacConfiguration);
- }
-
- if (hvacConfiguration.RequiresPassengerAC() && (busAux.CompressorTypePassenger == ACCompressorType.None || busAux.CompressorTypePassenger == ACCompressorType.Unknown)) {
- throw new VectoException("HVAC System Configuration {0} requires PassengerAC Technology", hvacConfiguration);
- }
-
if (mission.BusParameter.SeparateAirDistributionDuctsHVACCfg.Contains(hvacConfiguration) &&
!completedVehicle.Components.BusAuxiliaries.HVACAux.SeparateAirDistributionDucts) {
throw new VectoException("Input parameter 'separate air distribution ducts' has to be set to 'true' for vehicle group '{0}' and HVAC configuration '{1}'",
@@ -232,13 +224,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
ssmInputs.VentilationRateHeating = DeclarationData.BusAuxiliaries.VentilationRate(hvacConfiguration, true);
ssmInputs.HVACMaxCoolingPower = coolingPower.Item1 + coolingPower.Item2;
- ssmInputs.HVACCompressorType = busAux.CompressorTypePassenger; // use passenger compartment
- ssmInputs.HVACTechnology = string.Format(
- "{0} ({1})", busAux.SystemConfiguration.GetName(),
- string.Join(", ", new[] { busAux.CompressorTypePassenger.GetName(), busAux.CompressorTypeDriver.GetName() })); ;
- ssmInputs.COP = DeclarationData.BusAuxiliaries.CalculateCOP(
- coolingPower.Item1, busAux.CompressorTypeDriver, coolingPower.Item2, busAux.CompressorTypePassenger,
- floorType);
+
return ssmInputs;
}
@@ -257,11 +243,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
{
onVehicle.Add(item);
}
- if ("Heat pump systems".Equals(item.BenefitName, StringComparison.InvariantCultureIgnoreCase) &&
- (completedBuxAux?.HVACAux.HeatPump ?? false))
- {
- onVehicle.Add(item);
- }
if ("Adjustable auxiliary heater".Equals(item.BenefitName, StringComparison.InvariantCultureIgnoreCase) &&
(completedBuxAux?.HVACAux.AdjustableAuxiliaryHeater ?? false))
{
diff --git a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
index a01ff46e64..2e76958784 100644
--- a/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
+++ b/VectoCore/VectoCoreTest/XML/XMLCompleteBusReaderTest.cs
@@ -103,11 +103,8 @@ namespace TUGraz.VectoCore.Tests.XML
var havacAux = components.BusAuxiliaries.HVACAux;
Assert.IsNotNull(havacAux);
Assert.AreEqual(BusHVACSystemConfiguration.Configuration7, havacAux.SystemConfiguration);
- Assert.AreEqual(ACCompressorType.TwoStage, havacAux.CompressorTypeDriver);
- Assert.AreEqual(ACCompressorType.FourStage, havacAux.CompressorTypePassenger);
Assert.AreEqual(0.SI<Watt>(), havacAux.AuxHeaterPower);
Assert.IsTrue(havacAux.DoubleGlazing);
- Assert.IsFalse(havacAux.HeatPump);
Assert.IsTrue(havacAux.AdjustableAuxiliaryHeater);
Assert.IsTrue(havacAux.SeparateAirDistributionDucts);
}
--
GitLab