diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb index 1d3b914c26a779d1017bd17c2ed917c06aa71e26..b052feb071647189e0901b5f7299cf1e344dd023 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/M14Tests.vb @@ -44,9 +44,9 @@ Namespace UnitTests Public ReadOnly Property EngineWasteHeat As Watt Implements ISSMTOOL.EngineWasteHeat - Public Function AverageAuxHeaterPower(averageUseableEngineWasteHeat As Watt) As Watt Implements ISSMPowerDemand.AverageHeaterPower + Public Function AverageAuxHeaterPower(averageUseableEngineWasteHeat As Watt) As HeaterPower Implements ISSMPowerDemand.AverageHeaterPower - Return (0.5*(averageUseableEngineWasteHeat.Value()*0.835).SI(Unit.SI.Liter.Per.Hour).Value()).SI (of Watt) + Return new HeaterPower With{ .AuxHeaterPower = (0.5*(averageUseableEngineWasteHeat.Value()*0.835).SI(Unit.SI.Liter.Per.Hour).Value()).SI (of Watt)} End Function Public Property SSMInputs As ISSMDeclarationInputs Implements ISSMTOOL.SSMInputs diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb index b05a80f908ec2323edc38b9db4b33d1907323901..c539ab78fa426334ad496dd97a494c3637a18869 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb @@ -153,7 +153,7 @@ Namespace UnitTests If section = "AC-System" Then 'AC-SYSTEM '********* - Assert.AreEqual(HeatPumpType.non_R_744_2_stage, target.ACSystem.HVACCompressorType) + 'Assert.AreEqual(HeatPumpType.non_R_744_2_stage, target.ACSystem.HVACCompressorType) Assert.AreEqual(15.5567, target.ACSystem.HVACMaxCoolingPower.Value()/1000.0, 1e-3) 'Assert.AreEqual(3.5, target.ACSystem.COP) End If diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/Utils.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/Utils.vb index 2d69439f00adab096ea80c2dd3a9fa2b20314908..e15df2d76cd800839cb3109dceef3b943b397aee 100644 --- a/VECTOAux/VectoAuxiliariesTests/UnitTests/Utils.vb +++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/Utils.vb @@ -136,7 +136,6 @@ Public Class Utils .HeatingBoundaryTemperature = 18.0.DegCelsiusToKelvin(), .CoolingBoundaryTemperature = 23.0.DegCelsiusToKelvin(), .SpecificVentilationPower = 0.56.SI(Unit.SI.Watt.Hour.Per.Cubic.Meter).Cast (Of JoulePerCubicMeter), - .HVACCompressorType = HeatPumpType.non_R_744_2_stage, .HVACMaxCoolingPowerPassenger = 18.si(Unit.SI.kilo.watt).Cast (of Watt), .AuxHeaterEfficiency = 0.84, .FuelFiredHeaterPower = 30.SI(Unit.SI.kilo.watt).Cast (Of Watt),