From bab01dcb7aaca085ae461148999779d3327cf0df Mon Sep 17 00:00:00 2001
From: "Zarb, Glenn" <STC\GZ1>
Date: Fri, 24 Jul 2015 13:57:21 +0000
Subject: [PATCH] git-tfs-id:
[http://tfs00.element.root.com:8080/tfs/TFSCollection]$/VECTO;C2037
---
VECTO/VECTO_Global.vb | 2 +-
.../VectoAuxiliaries/Electrics/CombinedAlternator.vb | 4 ++--
VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb | 10 +++++-----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/VECTO/VECTO_Global.vb b/VECTO/VECTO_Global.vb
index ba51a54b74..d0524ff31b 100644
--- a/VECTO/VECTO_Global.vb
+++ b/VECTO/VECTO_Global.vb
@@ -12,7 +12,7 @@ Imports System.Collections.Generic
Module VECTO_Global
- Public Const VECTOvers As String = "2.0.4-beta"
+ Public Const VECTOvers As String = "2.0.4-AUX.Alpha.3"
Public Const LicSigAppCode As String = "VECTO-Release-0093C61E0A2E4BFA9A7ED7E729C56AE4"
Public MyAppPath As String
Public MyConfPath As String
diff --git a/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternator.vb b/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternator.vb
index 5e0535d3e6..4acfa1268d 100644
--- a/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternator.vb
+++ b/VECTOAux/VectoAuxiliaries/Electrics/CombinedAlternator.vb
@@ -252,9 +252,9 @@ Public Class CombinedAlternator
sb.AppendLine("")
Next
- '4000 - IE Alt1,2000,10,50,3
+ '6000 - IE Alt1,2000,10,50,3
For row = 1 To 3
- amps = alt.InputTable4000(row).Amps : eff = alt.InputTable6000(row).Eff
+ amps = alt.InputTable6000(row).Amps : eff = alt.InputTable6000(row).Eff
sb.Append(alt.AlternatorName + ",6000," + amps.ToString("0.000") + "," + eff.ToString("0.000") + "," + alt.PulleyRatio.ToString("0.000"))
sb.AppendLine("")
Next
diff --git a/VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb b/VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb
index 198b313acb..fb652c6ebe 100644
--- a/VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb
+++ b/VECTOAux/VectoAuxiliaries/Hvac/SSMTOOL.vb
@@ -258,15 +258,15 @@ Namespace Hvac
GenInputs.AH_EngineWasteHeatkW = AverageUseableEngineWasteHeatKW
Dim fba As Single = FuelPerHBaseAdjusted
- Dim FuelFiredWarning As Boolean = fba * GenInputs.BC_AuxHeaterEfficiency * HVACConstants.FuelDensity * GenInputs.BC_GCVDieselOrHeatingOil * 1000 > (AverageUseableEngineWasteHeatKW + GenInputs.AH_FuelFiredHeaterkW)
+ 'Dim FuelFiredWarning As Boolean = fba * GenInputs.BC_AuxHeaterEfficiency * HVACConstants.FuelDensity * GenInputs.BC_GCVDieselOrHeatingOil * 1000 > (AverageUseableEngineWasteHeatKW + GenInputs.AH_FuelFiredHeaterkW)
- If Not FuelFiredHeaterInsufficientWarned AndAlso FuelFiredWarning Then
+ 'If Not FuelFiredHeaterInsufficientWarned AndAlso FuelFiredWarning Then
- FuelFiredHeaterInsufficientWarned = True
+ ' FuelFiredHeaterInsufficientWarned = True
- OnMessage(Me, " HVAC SSM : Fuel fired heater insufficient for heating requirements, run continues assuming it was sufficient.", AdvancedAuxiliaryMessageType.Warning)
+ ' OnMessage(Me, " HVAC SSM : Fuel fired heater insufficient for heating requirements, run continues assuming it was sufficient.", AdvancedAuxiliaryMessageType.Warning)
- End If
+ 'End If
Return fba
--
GitLab