diff --git a/HVACTOOL/HVACTOOL.vbproj b/HVACTOOL/HVACTOOL.vbproj
index 98326196046d9acae0f432e3e75e017912597a73..7ac46e79eabf7770719929e6b996371288722364 100644
--- a/HVACTOOL/HVACTOOL.vbproj
+++ b/HVACTOOL/HVACTOOL.vbproj
@@ -127,6 +127,9 @@
<Content Include="testSSMTechBenefits.csv">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="SSMTechBenefitsALLON_LIVE.csv">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\VECTOAux\VectoAuxiliaries\VectoAuxiliaries.vbproj">
diff --git a/HVACTOOL/SSMTechBenefitsALLON_LIVE.csv b/HVACTOOL/SSMTechBenefitsALLON_LIVE.csv
new file mode 100644
index 0000000000000000000000000000000000000000..deb9ed2750887268b682129da03e44df926dff19
--- /dev/null
+++ b/HVACTOOL/SSMTechBenefitsALLON_LIVE.csv
@@ -0,0 +1,33 @@
+Category,BenefitName,Units,LowH,LowV,LowC,SemiLowH,SemiLowV,SemiLowC,RaisedH,RaisedV,RaisedC,OnVehicle,LineType,ActiveVH,ActiveVV,ActiveVC
+Insulation,Foils (g-value reduction),fraction,0.01,0,0.01,0.01,0,0.01,0.01,0,0.01,TRUE,0,FALSE,FALSE,FALSE
+Insulation,Double-glazing (g-value reduction- u-value reduction),fraction,0,0,0,0.02,0,0.012,0.02,0,0.025,TRUE,0,FALSE,FALSE,FALSE
+Insulation,Heat insulation glazing (u-value reduction),fraction,0.005,0,0.01,0.01,0,0.028,0.01,0,0.024,TRUE,0,FALSE,FALSE,FALSE
+Insulation,Roof insulation (u-value reduction),fraction,0.02,0,-0.01,-0.01,0,-0.012,-0.01,0,-0.032,TRUE,0,FALSE,FALSE,FALSE
+Insulation,Wall insulation (u-value reduction),fraction,0.01,0,0.02,0.02,0,0.019,0.02,0,0.05,TRUE,0,FALSE,FALSE,FALSE
+Insulation,Floor insulation (u-value reduction),fraction,0,0,0,0.02,0,0.027,0.02,0,0.012,TRUE,0,FALSE,FALSE,FALSE
+Insulation,Door insulation (u-value reduction),fraction,0.01,0,0.02,0.01,0,0.028,0.01,0,0.021,TRUE,0,FALSE,FALSE,FALSE
+Insulation,Clearance between door frame / door leaf (different solutions bristles / rubberseals) (reduced leckage air),fraction,0.01,0,0.02,0.005,0,0.036,0.008,0,0.041,TRUE,0,FALSE,FALSE,FALSE
+Insulation,Insulation of heating and cooling pipes (increase heating efficiency),fraction,0.01,0,0.02,0.01,0,0.024,0.01,0,0.029,TRUE,0,FALSE,FALSE,FALSE
+Insulation,"""Changeable"" glas (g-value)",fraction,0.005,0,0.01,0.01,0,0.025,0.011,0,0.025,TRUE,0,FALSE,FALSE,FALSE
+Insulation,Reflective paintings,fraction,0.005,0,0.005,0.005,0,0.02,0.005,0,0.012,TRUE,0,FALSE,FALSE,FALSE
+Insulation,Insulation of engine compartment,fraction,0,0,0.01,0,0,0.023,0,0,0.02,TRUE,0,FALSE,FALSE,FALSE
+Ventilation,Fan engines (EC- Brush) (efficiency),fraction,0,0.01,0,0,0.03,0,0,0.018,0,TRUE,3,TRUE,TRUE,TRUE
+Ventilation,Fan controll strategy (serial / parallel),fraction,0,0.005,0,0,0.017,0,0,0.02,0,TRUE,3,TRUE,TRUE,TRUE
+Ventilation,Air curtain (reduces air exchange between in-cabin room and environment,fraction,0.01,-0.005,0.01,0,0,0,0,0,0,TRUE,0,FALSE,FALSE,FALSE
+Ventilation,Partial air recirculation,fraction,0.02,0,-0.01,-0.01,0,-0.012,-0.01,0,-0.032,TRUE,0,FALSE,FALSE,FALSE
+Ventilation,Variable fresh air rate (influence on heating / cooling demand),fraction,0,0,0,-0.01,0,-0.012,-0.01,0,-0.032,TRUE,0,FALSE,FALSE,FALSE
+Heating,Engine waste heat recovery (reduces heating demand for auxillary heater) ALREADY IMPLEMENTED,fraction,0.014,0,0,0.024,0,0,0.01,0,0,TRUE,0,FALSE,FALSE,FALSE
+Heating,Heat storage (increase heating efficiency),fraction,0.012,0,0,0.028,0,0,0.005,0,0,TRUE,0,FALSE,FALSE,FALSE
+Heating,Heat pump systems (increase heating efficiency),fraction,0.01,0,0,0.02,0,0,0.005,0,0,TRUE,0,FALSE,FALSE,FALSE
+Heating,Position of heatexchangers in-cabin room (air flow towards walls / windows) [increases heat losses through increased ?T],fraction,0.02,0,0,0.019,0,0,0.03,0,0,TRUE,0,FALSE,FALSE,FALSE
+Heating,Heated surfaces,fraction,-0.01,0,0,-0.012,0,0,-0.032,0,0,TRUE,0,FALSE,FALSE,FALSE
+Heating,Heated seats,fraction,0.01,0,0,0.01,0,0,0.01,0,0,TRUE,0,FALSE,FALSE,FALSE
+Heating,Aux. heater type (heated medium water- air) (efficiency value)(energy source- fuel ptc),fraction,0.02,0,0,0.015,0,0,0.02,0,0,TRUE,0,FALSE,FALSE,FALSE
+Cooling,Adjustable compressorpower (cooling power variable) ALREADY IMPLEMENTED,fraction,0,0,0.01,0,0,0.01,0,0,0.02,TRUE,0,FALSE,FALSE,FALSE
+Cooling,Driver ac-system (mechanical),KW,0,0,-0.2,0,0,-0.3,0,0,-0.4,FALSE,1,FALSE,FALSE,FALSE
+Cooling,Driver ac-system (electrical),KW,0,0,-0.1,0,0,-0.15,0,0,-0.2,TRUE,2,FALSE,FALSE,FALSE
+Cooling,Different sizes of air ducts (pressure loss effects power consumption of the fan engines),fraction,0,-0.01,0,0,-0.012,0,0,-0.032,0,TRUE,3,TRUE,TRUE,TRUE
+Cooling,Low temperature storages / storage vaporizer,fraction,0,0,0.014,0,0,0.012,0,0,0.012,TRUE,0,FALSE,FALSE,FALSE
+Cooling,Speed depending air conditioning,fraction,0,0,0.018,0,0,0.02,0,0,0.021,TRUE,0,FALSE,FALSE,FALSE
+Cooling,Ejector,fraction,0,0,0.023,0,0,0.024,0,0,0.012,TRUE,0,FALSE,FALSE,FALSE
+Cooling,"""Downhill"" savings (determine diff. between effect for mech. & electr. Comp. regarding fuel consumpt.)",fraction,0,0,0.01,0,0,0.028,0,0,0.021,TRUE,0,FALSE,FALSE,FALSE
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb b/VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb
index 1e164152b63cfbe18c230f9dcf11551a75c47e6e..99cf37898d4b37f0674821d800ed7f8949b2bc92 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/SSMCalculate.vb
@@ -1,5 +1,6 @@
Imports System.Text
Imports Microsoft.VisualBasic
+Imports VectoAuxiliaries.Hvac
Namespace Hvac
@@ -440,12 +441,51 @@ Public Class SSMCalculate
End Get
End Property
- #End Region
+ #End Region
- Public Overrides Function ToString() As String
+ Public Overrides Function ToString() As String
Dim sb As New StringBuilder()
+
+
+ sb.AppendLine("")
+ sb.AppendLine("TechList Detail")
+ sb.AppendLine("***********************")
+
+ For Each line As ITechListBenefitLine In ssmTOOL.TechList.TechLines
+
+ With line
+
+ Dim nameLength As integer =15
+ Dim catLength As Integer = 18
+ Dim extraNameSpaces, extraCatSpaces As Integer
+
+ extraNameSpaces = nameLength -.BenefitName.Length
+ extraCatSpaces = catLength - .Category.Length
+
+ Dim catDesc As String = line.Category.Substring(0,Math.Min(line.Category.Length-1,catLength)) + Space( If(extraCatSpaces<0,0,extraCatSpaces)) + vbTab + line.BenefitName.Substring(0,Math.Min(line.BenefitName.Length-1,nameLength)) + Space(If(extraNameSpaces<0,0,extraCatSpaces))
+
+ sb.AppendLine(String.Format( catDesc + " {0}{1}{0}{2}{0}{3}{0}{4}{0}{5}", vbtab + vbtab, .H.ToString("0.000") , .VH.ToString("0.000"), .VV.ToString("0.000"), .VC.ToString("0.000"), .C.ToString("0.000")))
+
+ End With
+
+ Next
+
+ sb.AppendLine("")
+ sb.AppendLine("TechList Totals")
+ sb.AppendLine("***********************")
+
+ With ssmTOOL.TechList
+
+ sb.AppendLine( vbTab + vbTab + "H" +vbTab + "VH" + vbTab + "VV" + vbTab + "VC" + vbTab + "C")
+ sb.AppendLine(String.Format("Base Var % {0}{1}{0}{2}{0}{3}{0}{4}{0}{5}", vbtab, .HValueVariation.ToString("0.000") , .VHValueVariation.ToString("0.000"), .VVValueVariation.ToString("0.000"), .VCValueVariation.ToString("0.000"), .CValueVariation.ToString("0.000")))
+ sb.AppendLine(String.Format("Base Var KW {0}{1}{0}{2}{0}{3}{0}{4}{0}{5}", vbtab, .HValueVariationKW.ToString("0.000") , .VHValueVariationKW.ToString("0.000"), .VVValueVariationKW.ToString("0.000"), .VCValueVariationKW.ToString("0.000"), .CValueVariationKW.ToString("0.000")))
+
+ End With
+
+
+
'Runs
sb.AppendLine( Run1.ToString())
sb.AppendLine( Run2.ToString())
@@ -458,7 +498,8 @@ Public Class SSMCalculate
sb.AppendLine(String.Format("Heating {0}{1}{0}{2}{0}{3}{0}{4}",vbTab + vbtab, BaseHeatingW_Mechanical.ToString("0.000"), BaseHeatingW_ElectricalCoolingHeating.ToString("0.000"), BaseHeatingW_ElectricalVentilation.ToString("0.000"), BaseHeatingW_FuelFiredHeating.ToString("0.000") ))
sb.AppendLine(String.Format("Cooling {0}{1}{0}{2}{0}{3}{0}{4}",vbTab + vbtab, BaseCoolingW_Mechanical.ToString("0.000"), BaseCoolingW_ElectricalCoolingHeating.ToString("0.000"), BaseCoolingW_ElectricalVentilation.ToString("0.000"), BaseCoolingW_FuelFiredHeating.ToString("0.000") ))
sb.AppendLine(String.Format("Ventilate {0}{1}{0}{2}{0}{3}{0}{4}",vbTab + vbtab, BaseVentilationW_Mechanical.ToString("0.000"), BaseVentilationW_ElectricalCoolingHeating.ToString("0.000"), BaseVentilationW_ElectricalVentilation.ToString("0.000"), BaseVentilationW_FuelFiredHeating.ToString("0.000") ))
-
+
+ sb.AppendLine("")
sb.AppendLine("Staging Adjusted Values")
sb.AppendLine("***********************")
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/SSMTechList.vb b/VECTOAux/VectoAuxiliaries/Hvac/SSMTechList.vb
index eb854de9ceea52e3b07f96303c0570209ed32a72..16f99cd90756b2d659e749c64236925e88981870 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/SSMTechList.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/SSMTechList.vb
@@ -144,9 +144,11 @@ End Function
'Public Properties - Outputs Of Class
Public ReadOnly Property CValueVariation As Double Implements ISSMTechList.CValueVariation
Get
- Dim a As double
+ Dim a,b As double
- a= TechLines.Where( Function(x) x.Units="fraction").Sum( Function(s) s.C)
+ a= TechLines.Where( Function(x) x.Units.ToLower="fraction").Sum( Function(s) s.C)
+ b= TechLines.Where( Function(x) x.Units.ToLower="kw").Sum( Function(s) s.C)
+
Return a
End Get
@@ -156,7 +158,7 @@ End Function
Dim a As double
- a= TechLines.Where( Function(x) x.Units="KW").Sum( Function(s) s.C)
+ a= TechLines.Where( Function(x) x.Units.ToLower="kw").Sum( Function(s) s.C)
Return a
@@ -165,49 +167,51 @@ End Function
Public ReadOnly Property HValueVariation As Double Implements ISSMTechList.HValueVariation
Get
- Dim a,b As double
- a = TechLines.Where( Function(x) x.Units="fraction").Sum( Function(s) s.H)
- b = HValueVariationKW
- Return a-b
+ 'Dim a,b As double
+ Return TechLines.Where( Function(x) x.Units="fraction").Sum( Function(s) s.H)
+ ' a =
+ ' b = HValueVariationKW
+ ' Return a-b
End Get
End Property
Public ReadOnly Property HValueVariationKW As Double Implements ISSMTechList.HValueVariationKW
Get
- Return TechLines.Where( Function(x) x.Units="KW").Sum( Function(s) s.H)
+ Return TechLines.Where( Function(x) x.Units.ToLower="kw").Sum( Function(s) s.H)
End Get
End Property
Public ReadOnly Property VCValueVariation As Double Implements ISSMTechList.VCValueVariation
Get
- Return TechLines.Where( Function(x) x.Units="fraction").Sum( Function(s) s.VC) - VCValueVariationKW
+ Return TechLines.Where( Function(x) x.Units.ToLower="fraction").Sum( Function(s) s.VC) '- VCValueVariationKW
End Get
End Property
Public ReadOnly Property VCValueVariationKW As Double Implements ISSMTechList.VCValueVariationKW
Get
- Return TechLines.Where( Function(x) x.Units="KW").Sum( Function(s) s.VC)
+ Return TechLines.Where( Function(x) x.Units.ToLower="kw").Sum( Function(s) s.VC)
End Get
End Property
Public ReadOnly Property VHValueVariation As Double Implements ISSMTechList.VHValueVariation
Get
- Dim a,b As double
+ 'Dim a,b As double
- a=TechLines.Where( Function(x) x.Units="fraction").Sum( Function(s) s.VH)
- b=VHValueVariationKW
- Return a-b
+ Return TechLines.Where( Function(x) x.Units.ToLower="fraction").Sum( Function(s) s.VH)
+ 'a=TechLines.Where( Function(x) x.Units="fraction").Sum( Function(s) s.VH)
+ 'b=VHValueVariationKW
+ ' Return a-b
End Get
End Property
Public ReadOnly Property VHValueVariationKW As Double Implements ISSMTechList.VHValueVariationKW
Get
- Return TechLines.Where( Function(x) x.Units="KW").Sum( Function(s) s.VH)
+ Return TechLines.Where( Function(x) x.Units.ToLower="kw").Sum( Function(s) s.VH)
End Get
End Property
Public ReadOnly Property VVValueVariation As Double Implements ISSMTechList.VVValueVariation
Get
- Return TechLines.Where( Function(x) x.Units="fraction").Sum( Function(s) s.VV)
+ Return TechLines.Where( Function(x) x.Units.ToLower="fraction").Sum( Function(s) s.VV)
End Get
End Property
Public ReadOnly Property VVValueVariationKW As Double Implements ISSMTechList.VVValueVariationKW
Get
- Return TechLines.Where( Function(x) x.Units="KW").Sum( Function(s) s.VV) - VVValueVariationKW
+ Return TechLines.Where( Function(x) x.Units.ToLower="kw").Sum( Function(s) s.VV)' - VVValueVariationKW
End Get
End Property
@@ -300,13 +304,23 @@ End Function
Public Function Modify( originalItem As ITechListBenefitLine, newItem As ITechListBenefitLine, ByRef feedback As String) As Boolean Implements ISSMTechList.Modify
Dim fi As TechListBenefitLine = TechLines.Find( Function(f) (f.Category= originalitem.Category) AndAlso f.BenefitName= originalitem.BenefitName )
+ Dim originalUnits As String =fi.Units
If( Not fi is Nothing ) then
try
fi.CloneFrom( newItem )
-
+
+ 'The lines below are to assist in testing. The KW units are being excluded, but for benchmarking against the spreadsheet model
+ 'Two KW entries are left in. There is no provision for adding KW units in so we check if the original entry was KW and
+ 'force it back to KW if it was already so. There shoud be no need to remove this as newly created lists will not match this
+ 'Phenomenon.
+ If( originalUnits.ToLower= "kw") then
+ fi.Units=originalUnits
+ newItem.Units=originalUnits
+ End If
+
If newItem = fi then
'This succeeded
_dirty=true
diff --git a/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.Designer.vb b/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.Designer.vb
index 5d3b7def87ef92ac8608fcb06269c735f3f92fe5..625cca940ce8d8676482cad7552bf7ae3c5e97d0 100644
--- a/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.Designer.vb
+++ b/VECTOAux/VectoAuxiliaries/UI/frmHVACTool.Designer.vb
@@ -129,6 +129,8 @@ Partial Class frmHVACTool
Me.lblSolarClouding = New System.Windows.Forms.Label()
Me.tabGeneralInputsOther = New System.Windows.Forms.TabPage()
Me.grpAuxHeater = New System.Windows.Forms.GroupBox()
+ Me.lblUnitsAH_FuelFiredHeater = New System.Windows.Forms.Label()
+ Me.lblUnitstxtAHEngineWasteHeat = New System.Windows.Forms.Label()
Me.txtAH_EngineWasteHeatkW = New System.Windows.Forms.TextBox()
Me.lbltxtAH_EngineWasteHeatkW = New System.Windows.Forms.Label()
Me.txtAH_FuelFiredHeaterkW = New System.Windows.Forms.TextBox()
@@ -1397,6 +1399,8 @@ Partial Class frmHVACTool
'grpAuxHeater
'
Me.grpAuxHeater.BackColor = System.Drawing.Color.Transparent
+ Me.grpAuxHeater.Controls.Add(Me.lblUnitsAH_FuelFiredHeater)
+ Me.grpAuxHeater.Controls.Add(Me.lblUnitstxtAHEngineWasteHeat)
Me.grpAuxHeater.Controls.Add(Me.txtAH_EngineWasteHeatkW)
Me.grpAuxHeater.Controls.Add(Me.lbltxtAH_EngineWasteHeatkW)
Me.grpAuxHeater.Controls.Add(Me.txtAH_FuelFiredHeaterkW)
@@ -1411,6 +1415,28 @@ Partial Class frmHVACTool
Me.grpAuxHeater.TabStop = false
Me.grpAuxHeater.Text = "Aux Heater"
'
+ 'lblUnitsAH_FuelFiredHeater
+ '
+ Me.lblUnitsAH_FuelFiredHeater.AutoSize = true
+ Me.lblUnitsAH_FuelFiredHeater.Font = New System.Drawing.Font("Microsoft Sans Serif", 9!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ Me.lblUnitsAH_FuelFiredHeater.Location = New System.Drawing.Point(352, 62)
+ Me.lblUnitsAH_FuelFiredHeater.Name = "lblUnitsAH_FuelFiredHeater"
+ Me.lblUnitsAH_FuelFiredHeater.Size = New System.Drawing.Size(24, 15)
+ Me.lblUnitsAH_FuelFiredHeater.TabIndex = 27
+ Me.lblUnitsAH_FuelFiredHeater.Text = "Kw"
+ Me.ToolTip1.SetToolTip(Me.lblUnitsAH_FuelFiredHeater, "Kilo Watts")
+ '
+ 'lblUnitstxtAHEngineWasteHeat
+ '
+ Me.lblUnitstxtAHEngineWasteHeat.AutoSize = true
+ Me.lblUnitstxtAHEngineWasteHeat.Font = New System.Drawing.Font("Microsoft Sans Serif", 9!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0,Byte))
+ Me.lblUnitstxtAHEngineWasteHeat.Location = New System.Drawing.Point(352, 33)
+ Me.lblUnitstxtAHEngineWasteHeat.Name = "lblUnitstxtAHEngineWasteHeat"
+ Me.lblUnitstxtAHEngineWasteHeat.Size = New System.Drawing.Size(24, 15)
+ Me.lblUnitstxtAHEngineWasteHeat.TabIndex = 26
+ Me.lblUnitstxtAHEngineWasteHeat.Text = "Kw"
+ Me.ToolTip1.SetToolTip(Me.lblUnitstxtAHEngineWasteHeat, "Kilo Watts")
+ '
'txtAH_EngineWasteHeatkW
'
Me.txtAH_EngineWasteHeatkW.Font = New System.Drawing.Font("Microsoft Sans Serif", 9!)
@@ -1435,7 +1461,6 @@ Partial Class frmHVACTool
Me.txtAH_FuelFiredHeaterkW.Font = New System.Drawing.Font("Microsoft Sans Serif", 9!)
Me.txtAH_FuelFiredHeaterkW.Location = New System.Drawing.Point(218, 59)
Me.txtAH_FuelFiredHeaterkW.Name = "txtAH_FuelFiredHeaterkW"
- Me.txtAH_FuelFiredHeaterkW.ReadOnly = true
Me.txtAH_FuelFiredHeaterkW.Size = New System.Drawing.Size(97, 21)
Me.txtAH_FuelFiredHeaterkW.TabIndex = 1
'
@@ -1487,6 +1512,7 @@ Partial Class frmHVACTool
'cboVEN_VentilationDuringHeating
'
Me.cboVEN_VentilationDuringHeating.FormattingEnabled = true
+ Me.cboVEN_VentilationDuringHeating.Items.AddRange(New Object() {"High", "Low"})
Me.cboVEN_VentilationDuringHeating.Location = New System.Drawing.Point(216, 150)
Me.cboVEN_VentilationDuringHeating.Name = "cboVEN_VentilationDuringHeating"
Me.cboVEN_VentilationDuringHeating.Size = New System.Drawing.Size(75, 24)
@@ -2130,10 +2156,11 @@ Partial Class frmHVACTool
'
'txtDiagnostics
'
- Me.txtDiagnostics.Location = New System.Drawing.Point(77, 41)
+ Me.txtDiagnostics.Location = New System.Drawing.Point(77, 17)
Me.txtDiagnostics.Multiline = true
Me.txtDiagnostics.Name = "txtDiagnostics"
- Me.txtDiagnostics.Size = New System.Drawing.Size(744, 501)
+ Me.txtDiagnostics.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
+ Me.txtDiagnostics.Size = New System.Drawing.Size(744, 584)
Me.txtDiagnostics.TabIndex = 0
'
'ErrorProvider1
@@ -2220,7 +2247,7 @@ Partial Class frmHVACTool
Me.Controls.Add(Me.btnSave)
Me.Controls.Add(Me.tabMain)
Me.Name = "frmHVACTool"
- Me.Text = "frmHVACTool"
+ Me.Text = "SSM HVAC Model ( Excel Model V04 )"
Me.tabMain.ResumeLayout(false)
Me.tabGeneralInputsBP.ResumeLayout(false)
Me.GroupBox1.ResumeLayout(false)
@@ -2440,4 +2467,6 @@ End Sub
Friend WithEvents Timer1 As System.Windows.Forms.Timer
Friend WithEvents tabDiagnostics As System.Windows.Forms.TabPage
Friend WithEvents txtDiagnostics As System.Windows.Forms.TextBox
+ Friend WithEvents lblUnitsAH_FuelFiredHeater As System.Windows.Forms.Label
+ Friend WithEvents lblUnitstxtAHEngineWasteHeat As System.Windows.Forms.Label
End Class
diff --git a/VECTOAux/VectoAuxiliariesTests/TestFiles/testSSMTechBenefitsALLON_LIVE.csv b/VECTOAux/VectoAuxiliariesTests/TestFiles/testSSMTechBenefitsALLON_LIVE.csv
new file mode 100644
index 0000000000000000000000000000000000000000..deb9ed2750887268b682129da03e44df926dff19
--- /dev/null
+++ b/VECTOAux/VectoAuxiliariesTests/TestFiles/testSSMTechBenefitsALLON_LIVE.csv
@@ -0,0 +1,33 @@
+Category,BenefitName,Units,LowH,LowV,LowC,SemiLowH,SemiLowV,SemiLowC,RaisedH,RaisedV,RaisedC,OnVehicle,LineType,ActiveVH,ActiveVV,ActiveVC
+Insulation,Foils (g-value reduction),fraction,0.01,0,0.01,0.01,0,0.01,0.01,0,0.01,TRUE,0,FALSE,FALSE,FALSE
+Insulation,Double-glazing (g-value reduction- u-value reduction),fraction,0,0,0,0.02,0,0.012,0.02,0,0.025,TRUE,0,FALSE,FALSE,FALSE
+Insulation,Heat insulation glazing (u-value reduction),fraction,0.005,0,0.01,0.01,0,0.028,0.01,0,0.024,TRUE,0,FALSE,FALSE,FALSE
+Insulation,Roof insulation (u-value reduction),fraction,0.02,0,-0.01,-0.01,0,-0.012,-0.01,0,-0.032,TRUE,0,FALSE,FALSE,FALSE
+Insulation,Wall insulation (u-value reduction),fraction,0.01,0,0.02,0.02,0,0.019,0.02,0,0.05,TRUE,0,FALSE,FALSE,FALSE
+Insulation,Floor insulation (u-value reduction),fraction,0,0,0,0.02,0,0.027,0.02,0,0.012,TRUE,0,FALSE,FALSE,FALSE
+Insulation,Door insulation (u-value reduction),fraction,0.01,0,0.02,0.01,0,0.028,0.01,0,0.021,TRUE,0,FALSE,FALSE,FALSE
+Insulation,Clearance between door frame / door leaf (different solutions bristles / rubberseals) (reduced leckage air),fraction,0.01,0,0.02,0.005,0,0.036,0.008,0,0.041,TRUE,0,FALSE,FALSE,FALSE
+Insulation,Insulation of heating and cooling pipes (increase heating efficiency),fraction,0.01,0,0.02,0.01,0,0.024,0.01,0,0.029,TRUE,0,FALSE,FALSE,FALSE
+Insulation,"""Changeable"" glas (g-value)",fraction,0.005,0,0.01,0.01,0,0.025,0.011,0,0.025,TRUE,0,FALSE,FALSE,FALSE
+Insulation,Reflective paintings,fraction,0.005,0,0.005,0.005,0,0.02,0.005,0,0.012,TRUE,0,FALSE,FALSE,FALSE
+Insulation,Insulation of engine compartment,fraction,0,0,0.01,0,0,0.023,0,0,0.02,TRUE,0,FALSE,FALSE,FALSE
+Ventilation,Fan engines (EC- Brush) (efficiency),fraction,0,0.01,0,0,0.03,0,0,0.018,0,TRUE,3,TRUE,TRUE,TRUE
+Ventilation,Fan controll strategy (serial / parallel),fraction,0,0.005,0,0,0.017,0,0,0.02,0,TRUE,3,TRUE,TRUE,TRUE
+Ventilation,Air curtain (reduces air exchange between in-cabin room and environment,fraction,0.01,-0.005,0.01,0,0,0,0,0,0,TRUE,0,FALSE,FALSE,FALSE
+Ventilation,Partial air recirculation,fraction,0.02,0,-0.01,-0.01,0,-0.012,-0.01,0,-0.032,TRUE,0,FALSE,FALSE,FALSE
+Ventilation,Variable fresh air rate (influence on heating / cooling demand),fraction,0,0,0,-0.01,0,-0.012,-0.01,0,-0.032,TRUE,0,FALSE,FALSE,FALSE
+Heating,Engine waste heat recovery (reduces heating demand for auxillary heater) ALREADY IMPLEMENTED,fraction,0.014,0,0,0.024,0,0,0.01,0,0,TRUE,0,FALSE,FALSE,FALSE
+Heating,Heat storage (increase heating efficiency),fraction,0.012,0,0,0.028,0,0,0.005,0,0,TRUE,0,FALSE,FALSE,FALSE
+Heating,Heat pump systems (increase heating efficiency),fraction,0.01,0,0,0.02,0,0,0.005,0,0,TRUE,0,FALSE,FALSE,FALSE
+Heating,Position of heatexchangers in-cabin room (air flow towards walls / windows) [increases heat losses through increased ?T],fraction,0.02,0,0,0.019,0,0,0.03,0,0,TRUE,0,FALSE,FALSE,FALSE
+Heating,Heated surfaces,fraction,-0.01,0,0,-0.012,0,0,-0.032,0,0,TRUE,0,FALSE,FALSE,FALSE
+Heating,Heated seats,fraction,0.01,0,0,0.01,0,0,0.01,0,0,TRUE,0,FALSE,FALSE,FALSE
+Heating,Aux. heater type (heated medium water- air) (efficiency value)(energy source- fuel ptc),fraction,0.02,0,0,0.015,0,0,0.02,0,0,TRUE,0,FALSE,FALSE,FALSE
+Cooling,Adjustable compressorpower (cooling power variable) ALREADY IMPLEMENTED,fraction,0,0,0.01,0,0,0.01,0,0,0.02,TRUE,0,FALSE,FALSE,FALSE
+Cooling,Driver ac-system (mechanical),KW,0,0,-0.2,0,0,-0.3,0,0,-0.4,FALSE,1,FALSE,FALSE,FALSE
+Cooling,Driver ac-system (electrical),KW,0,0,-0.1,0,0,-0.15,0,0,-0.2,TRUE,2,FALSE,FALSE,FALSE
+Cooling,Different sizes of air ducts (pressure loss effects power consumption of the fan engines),fraction,0,-0.01,0,0,-0.012,0,0,-0.032,0,TRUE,3,TRUE,TRUE,TRUE
+Cooling,Low temperature storages / storage vaporizer,fraction,0,0,0.014,0,0,0.012,0,0,0.012,TRUE,0,FALSE,FALSE,FALSE
+Cooling,Speed depending air conditioning,fraction,0,0,0.018,0,0,0.02,0,0,0.021,TRUE,0,FALSE,FALSE,FALSE
+Cooling,Ejector,fraction,0,0,0.023,0,0,0.024,0,0,0.012,TRUE,0,FALSE,FALSE,FALSE
+Cooling,"""Downhill"" savings (determine diff. between effect for mech. & electr. Comp. regarding fuel consumpt.)",fraction,0,0,0.01,0,0,0.028,0,0,0.021,TRUE,0,FALSE,FALSE,FALSE
diff --git a/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb b/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
index d986c4cce7086cf7294ef3a119e70a24b3598e53..90aee41212d78a9efb7486d01223a580a351df12 100644
--- a/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
+++ b/VECTOAux/VectoAuxiliariesTests/UnitTests/SSMTOOLTests.vb
@@ -182,6 +182,9 @@ Public Sub Instantiate_TechListTestALLON()
Dim target As ISSMTechList = New SSMTechList( GOODTechListALLON , gen)
+ Dim v As Double = target.CValueVariation
+
+
Assert.IsTrue(target.Initialise())
Assert.AreEqual(0.142 ,Math.Round(target.HValueVariation,3))
Assert.AreEqual(0.006 ,Math.Round(target.VHValueVariation,3))
diff --git a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
index 5f55740e108652554c593638583e870e0bb181ac..98e35dc1300ede59984c2bef9f6cdab262a2995d 100644
--- a/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
+++ b/VECTOAux/VectoAuxiliariesTests/VectoAuxiliariesTests.vbproj
@@ -280,6 +280,9 @@
<Content Include="TestFiles\testSSMTechBenefitsEmptyList.csv">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="TestFiles\testSSMTechBenefitsALLON_LIVE.csv">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<None Include="TestFiles\testAlternatorMapAsymetricalXYPairsCombined.aalt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>