Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
VILLASdataprocessing
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ACS
Public
VILLASframework
VILLASdataprocessing
Commits
ad4d24e7
Commit
ad4d24e7
authored
7 years ago
by
Bichen Li
Browse files
Options
Downloads
Patches
Plain Diff
Change the name of variables to be consistent with the modelica readin function
parent
48704105
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dataprocessing/readtools.py
+3
-3
3 additions, 3 deletions
dataprocessing/readtools.py
with
3 additions
and
3 deletions
dataprocessing/readtools.py
+
3
−
3
View file @
ad4d24e7
...
@@ -169,7 +169,7 @@ def read_timeseries_NEPLAN_loadflow(file_name, timeseries_names = None, is_regex
...
@@ -169,7 +169,7 @@ def read_timeseries_NEPLAN_loadflow(file_name, timeseries_names = None, is_regex
seq
=
[]
seq
=
[]
value
=
[]
value
=
[]
i
=
0
i
=
0
namelist
=
[
'
U
'
,
'
ANGLEU
'
,
'
P
'
,
'
Q
'
,
'
I
'
,
'
ANGLEI
'
]
namelist
=
[
'
V
'
,
'
Vangel
'
,
'
P
'
,
'
Q
'
,
'
I
'
,
'
Iangle
'
]
timeseries
=
[]
timeseries
=
[]
isfloat
=
re
.
compile
(
r
'
^[-+]?[0-9]+\.[0-9]+$
'
)
isfloat
=
re
.
compile
(
r
'
^[-+]?[0-9]+\.[0-9]+$
'
)
for
line
in
str_tmp
.
readlines
():
for
line
in
str_tmp
.
readlines
():
...
@@ -205,7 +205,7 @@ def read_timeseries_NEPLAN_loadflow(file_name, timeseries_names = None, is_regex
...
@@ -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
(
timeseries
[
check
+
1
].
values
/
180
*
cmath
.
pi
)
+
cmath
.
rect
(
value
[
10
],
value
[
11
]
/
180
*
cmath
.
pi
)
value
[
10
],
value
[
11
]
/
180
*
cmath
.
pi
)
(
timeseries
[
check
].
values
,
timeseries
[
check
+
1
].
values
)
=
cmath
.
polar
(
result
)
(
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
-
1
].
values
+=
value
[
9
]
timeseries
[
check
-
2
].
values
+=
value
[
8
]
timeseries
[
check
-
2
].
values
+=
value
[
8
]
if
check_pass
:
if
check_pass
:
...
@@ -234,4 +234,4 @@ def read_timeseries_NEPLAN_loadflow(file_name, timeseries_names = None, is_regex
...
@@ -234,4 +234,4 @@ def read_timeseries_NEPLAN_loadflow(file_name, timeseries_names = None, is_regex
line_del
.
append
(
rule_check
);
line_del
.
append
(
rule_check
);
for
num_to_del
in
range
(
len
(
line_del
)):
for
num_to_del
in
range
(
len
(
line_del
)):
del
timeseries
[
line_del
[
len
(
line_del
)
-
num_to_del
-
1
]]
del
timeseries
[
line_del
[
len
(
line_del
)
-
num_to_del
-
1
]]
return
timeseries
return
timeseries
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment