From ad4d24e73d051f0e873d9333da550fcd44a01bb2 Mon Sep 17 00:00:00 2001
From: Bichen Li <bichen.li@eonerc.rwth-aachen.de>
Date: Wed, 28 Mar 2018 09:24:29 +0200
Subject: [PATCH] Change the name of variables to be consistent with the
modelica readin function
---
dataprocessing/readtools.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dataprocessing/readtools.py b/dataprocessing/readtools.py
index 177c9a8..d52d265 100644
--- a/dataprocessing/readtools.py
+++ b/dataprocessing/readtools.py
@@ -169,7 +169,7 @@ def read_timeseries_NEPLAN_loadflow(file_name, timeseries_names = None, is_regex
seq = []
value = []
i = 0
- namelist = ['U', 'ANGLEU', 'P', 'Q', 'I', 'ANGLEI']
+ namelist = ['V', 'Vangel', 'P', 'Q', 'I', 'Iangle']
timeseries = []
isfloat = re.compile(r'^[-+]?[0-9]+\.[0-9]+$')
for line in str_tmp.readlines():
@@ -205,7 +205,7 @@ def read_timeseries_NEPLAN_loadflow(file_name, timeseries_names = None, is_regex
timeseries[check + 1].values / 180 * cmath.pi) + cmath.rect(
value[10], value[11] / 180 * cmath.pi)
(timeseries[check].values, timeseries[check + 1].values) = cmath.polar(result)
- timeseries[check + 1].values = timeseries[check + 1].values / cmath.pi * 180
+ #timeseries[check + 1].values = timeseries[check + 1].values / cmath.pi * 180
timeseries[check - 1].values += value[9]
timeseries[check - 2].values += value[8]
if check_pass:
@@ -234,4 +234,4 @@ def read_timeseries_NEPLAN_loadflow(file_name, timeseries_names = None, is_regex
line_del.append(rule_check);
for num_to_del in range(len(line_del)):
del timeseries[line_del[len(line_del) - num_to_del - 1]]
- return timeseries
+ return timeseries
\ No newline at end of file
--
GitLab