diff --git a/VECTO/VECTO_Global.vb b/VECTO/VECTO_Global.vb index ba51a54b74e0ef9c43e89e0f0cc4665b2c9712dd..d0524ff31b9362976ffb0307755ebf3acd57e7e2 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 5e0535d3e637cf46aaf3581fd57659617cc5ac2f..4acfa1268d4fe1bdd3f5c94769d17d500f8cfef6 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 198b313acb616bdc6114ad25a64c1f4748b08129..fb652c6ebe372bd5ba424578b632042a91bf0a1f 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