From 2507cc98d742105c606510722a389790c9f0b85e Mon Sep 17 00:00:00 2001
From: Raphael Luz <luz@ivt.tugraz.at>
Date: Tue, 17 Feb 2015 16:53:47 +0100
Subject: [PATCH] * Fixed error in cycle conversion * Errors if full load curve
is too "short" * Transmission loss extrapolation Errors are now Warnings in
Engineering Mode.
---
VECTO/Input Files/cDRI.vb | 7 +++++++
VECTO/Input Files/cFLD.vb | 8 ++++----
VECTO/MODcalc/cMOD.vb | 6 +++++-
VECTO/VECTO_Global.vb | 2 +-
4 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/VECTO/Input Files/cDRI.vb b/VECTO/Input Files/cDRI.vb
index 899209c01a..1b5c00101a 100644
--- a/VECTO/Input Files/cDRI.vb
+++ b/VECTO/Input Files/cDRI.vb
@@ -913,6 +913,13 @@ lb10:
'Accept New fields
Values = NewValues
+
+ If AuxDef Then
+ For Each AuxKV In NewAuxValues
+ AuxComponents(AuxKV.Key) = AuxKV.Value
+ Next
+ End If
+
tDim = Values(tDriComp.t).Count - 1
Return True
diff --git a/VECTO/Input Files/cFLD.vb b/VECTO/Input Files/cFLD.vb
index 7f125edc3c..ead03040bc 100644
--- a/VECTO/Input Files/cFLD.vb
+++ b/VECTO/Input Files/cFLD.vb
@@ -542,28 +542,28 @@ lbInt:
Nlo = fnUofPfull(0.55 * Pmax, True)
If Nlo < 0 Then
- WorkerMsg(tMsgID.Err, "Failed to calculate Nlo! Check full load curve!", MsgSrc)
+ WorkerMsg(tMsgID.Err, "Failed to calculate Nlo! Expand full load curve!", MsgSrc)
Return False
End If
N95h = fnUofPfull(0.95 * Pmax, False)
If N95h < 0 Then
- WorkerMsg(tMsgID.Err, "Failed to calculate N95h! Check full load curve!", MsgSrc)
+ WorkerMsg(tMsgID.Err, "Failed to calculate N95h! Expand full load curve!", MsgSrc)
Return False
End If
Npref = fNpref(Nidle)
If Npref < 0 Then
- WorkerMsg(tMsgID.Err, "Failed to calculate Npref! Check full load curve!", MsgSrc)
+ WorkerMsg(tMsgID.Err, "Failed to calculate Npref! Expand full load curve!", MsgSrc)
Return False
End If
Nhi = fnUofPfull(0.7 * Pmax, False)
If Nhi < 0 Then
- WorkerMsg(tMsgID.Err, "Failed to calculate Nhi! Check full load curve!", MsgSrc)
+ WorkerMsg(tMsgID.Err, "Failed to calculate Nhi! Expand full load curve!", MsgSrc)
Return False
End If
diff --git a/VECTO/MODcalc/cMOD.vb b/VECTO/MODcalc/cMOD.vb
index 23fc42ae09..448d2008c6 100644
--- a/VECTO/MODcalc/cMOD.vb
+++ b/VECTO/MODcalc/cMOD.vb
@@ -838,7 +838,11 @@ Public Class cMOD
Abort = False
If TrLossMapExtr <> "" Then
- WorkerMsg(tMsgID.Err, "Invalid extrapolation in Transmission Loss Map (" & TrLossMapExtr & ")!", MsgSrc & "/t= " & Second)
+ If Cfg.DeclMode Then
+ WorkerMsg(tMsgID.Err, "Extrapolation of Transmission Loss Map (" & TrLossMapExtr & ")!", MsgSrc & "/t= " & Second)
+ Else
+ WorkerMsg(tMsgID.Warn, "Extrapolation of Transmission Loss Map (" & TrLossMapExtr & ")!", MsgSrc & "/t= " & Second)
+ End If
End If
If AuxMapExtr <> "" Then
diff --git a/VECTO/VECTO_Global.vb b/VECTO/VECTO_Global.vb
index e1a4a4ad24..677ec4f012 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-beta3"
+ Public Const VECTOvers As String = "2.0.4-beta4 test1"
Public Const LicSigAppCode As String = "VECTO-Release-0093C61E0A2E4BFA9A7ED7E729C56AE4"
Public MyAppPath As String
Public MyConfPath As String
--
GitLab