Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disaggregate links and stores #629

Merged
merged 35 commits into from
May 23, 2023
Merged

Disaggregate links and stores #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
0a17cac
Call `UniformDisaggregation` with named arguments
gnn Mar 22, 2023
db8232c
Replace `print`s with proper logging
gnn Mar 22, 2023
4716abd
Log more stuff
gnn Mar 22, 2023
d06926b
Make local variable `busflags` an argument
gnn Mar 23, 2023
a8c24ee
Factor `rows` out into a local variable
gnn Mar 23, 2023
7f61dbe
Factor `timeseries` out into a local variable
gnn Mar 23, 2023
ff9c359
Use implicit string joining instead of `+`
gnn Mar 22, 2023
4848efe
Fix typo in comment: "in side" -> "inside"
gnn Mar 23, 2023
aaa0435
Update comment about unfiltered time series
gnn Mar 23, 2023
096f9d3
Replace `DataFrame.append` with `pandas.concat`
gnn Mar 23, 2023
6ae2a45
Improve sanity check's comprehensibility
gnn Mar 24, 2023
4339ebe
Add an error message to sanity checks
gnn Mar 24, 2023
021d83b
Bulk insert disaggregated columns
gnn Mar 24, 2023
f00d49a
Add some information to "etrago/tools/__init__.py"
gnn Mar 24, 2023
4ecd568
Add various ways of doing nothing
gnn Mar 24, 2023
17c5e63
Disable profiling more thorough
gnn Mar 24, 2023
c350ae4
Don't create `disaggregated_network.results`
ClaraBuettner Jan 12, 2023
9db0c2d
Use a shorter way of getting the first index value
gnn Mar 3, 2023
57352b1
Replace older string interpolation with f-strings
gnn Mar 22, 2023
988d19c
Disaggregate "p0" and "p1" of "links"
gnn Mar 24, 2023
b6f42cd
Disaggregate "stores"
ClaraBuettner Jan 11, 2023
f109cec
Transfer `"links"`' and `"stores"`' results
gnn Jan 16, 2023
886211b
Replace infinite values with a large constant
ClaraBuettner Feb 6, 2023
854efd9
Reformat the definition of `timed`
gnn Mar 8, 2023
73b9e3b
Add busmap as type pandas.Series
ClaraBuettner Mar 27, 2023
d806f8b
Un-comment spatial disaggregation
ClaraBuettner Mar 27, 2023
95c22f0
Replace `.busmap` with `.buses.loc[:, "cluster"]`
gnn Apr 20, 2023
0a9c515
Filter links by `bus0` instead of `bus1`
ClaraBuettner Apr 18, 2023
7a5a100
Move `bus == cluster` filtering out of the loop
gnn Apr 21, 2023
a17f05d
Adjust `query` for the special case of `"links"`
ClaraBuettner Apr 18, 2023
e579d20
Use values in cluster columns to define groups
gnn Apr 21, 2023
12a1933
Allow `pnb` to be empty in certain cases
ClaraBuettner Apr 18, 2023
774ee1a
Assert that time series sum matches cluster value
ClaraBuettner Apr 19, 2023
b45c1d3
Make string containing "{expression}" an f-string
gnn Apr 21, 2023
71e2f8c
Add links to "clustered - disaggregated" checks
gnn Apr 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions etrago/appl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
},
},
"network_clustering_ehv": False, # clustering of HV buses to EHV buses.
"disaggregation": None, # None, 'mini' or 'uniform'
"disaggregation": "uniform", # None, 'mini' or 'uniform'
# Temporal Complexity:
"snapshot_clustering": {
"active": False, # choose if clustering is activated
Expand Down Expand Up @@ -517,7 +517,7 @@ def run_etrago(args, json_path):

# spatial disaggregation
# needs to be adjusted for new sectors
# etrago.disaggregation()
etrago.disaggregation()

# calculate central etrago results
etrago.calc_results()
Expand Down
Loading