Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 72a803aa authored by Franz KOBER josef's avatar Franz KOBER josef
Browse files

removed ACCompressorType and HeatPump from HVACBusAuxiliaries interface

parent 5b77b8df
No related branches found
No related tags found
No related merge requests found
...@@ -869,16 +869,11 @@ namespace TUGraz.VectoCommon.InputData ...@@ -869,16 +869,11 @@ namespace TUGraz.VectoCommon.InputData
HeatPumpType? HeatPumpTypePassengerCompartment { get; } HeatPumpType? HeatPumpTypePassengerCompartment { get; }
HeatPumpMode? HeatPumpModePassengerCompartment { get; } HeatPumpMode? HeatPumpModePassengerCompartment { get; }
ACCompressorType CompressorTypeDriver { get; }//
ACCompressorType CompressorTypePassenger { get; }//
Watt AuxHeaterPower { get; } Watt AuxHeaterPower { get; }
bool DoubleGlazing { get; } bool DoubleGlazing { get; }
bool HeatPump { get; } //
bool AdjustableAuxiliaryHeater { get; } bool AdjustableAuxiliaryHeater { get; }
bool SeparateAirDistributionDucts { get; } bool SeparateAirDistributionDucts { get; }
......
...@@ -183,14 +183,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter ...@@ -183,14 +183,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
var hvacConfiguration = completedVehicle.Components.BusAuxiliaries.HVACAux.SystemConfiguration; var hvacConfiguration = completedVehicle.Components.BusAuxiliaries.HVACAux.SystemConfiguration;
var busAux = completedVehicle.Components.BusAuxiliaries.HVACAux; 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) && if (mission.BusParameter.SeparateAirDistributionDuctsHVACCfg.Contains(hvacConfiguration) &&
!completedVehicle.Components.BusAuxiliaries.HVACAux.SeparateAirDistributionDucts) { !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}'", 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 ...@@ -232,13 +224,7 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
ssmInputs.VentilationRateHeating = DeclarationData.BusAuxiliaries.VentilationRate(hvacConfiguration, true); ssmInputs.VentilationRateHeating = DeclarationData.BusAuxiliaries.VentilationRate(hvacConfiguration, true);
ssmInputs.HVACMaxCoolingPower = coolingPower.Item1 + coolingPower.Item2; 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; return ssmInputs;
} }
...@@ -257,11 +243,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter ...@@ -257,11 +243,6 @@ namespace TUGraz.VectoCore.InputData.Reader.DataObjectAdapter
{ {
onVehicle.Add(item); 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) && if ("Adjustable auxiliary heater".Equals(item.BenefitName, StringComparison.InvariantCultureIgnoreCase) &&
(completedBuxAux?.HVACAux.AdjustableAuxiliaryHeater ?? false)) (completedBuxAux?.HVACAux.AdjustableAuxiliaryHeater ?? false))
{ {
......
...@@ -103,11 +103,8 @@ namespace TUGraz.VectoCore.Tests.XML ...@@ -103,11 +103,8 @@ namespace TUGraz.VectoCore.Tests.XML
var havacAux = components.BusAuxiliaries.HVACAux; var havacAux = components.BusAuxiliaries.HVACAux;
Assert.IsNotNull(havacAux); Assert.IsNotNull(havacAux);
Assert.AreEqual(BusHVACSystemConfiguration.Configuration7, havacAux.SystemConfiguration); 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.AreEqual(0.SI<Watt>(), havacAux.AuxHeaterPower);
Assert.IsTrue(havacAux.DoubleGlazing); Assert.IsTrue(havacAux.DoubleGlazing);
Assert.IsFalse(havacAux.HeatPump);
Assert.IsTrue(havacAux.AdjustableAuxiliaryHeater); Assert.IsTrue(havacAux.AdjustableAuxiliaryHeater);
Assert.IsTrue(havacAux.SeparateAirDistributionDucts); Assert.IsTrue(havacAux.SeparateAirDistributionDucts);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment