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

Fix/sankey diagramm dso #278

Merged
merged 4 commits into from
Dec 17, 2024
Merged

Fix/sankey diagramm dso #278

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cab3946
Get flow from dso directly at source, not via transformer for sankey
Bachibouzouk Oct 7, 2024
be8d9e7
Do not show nodes with 0 flow in sankey diagram
Bachibouzouk Oct 7, 2024
6814ff4
Make chp_fixed_ratio inflow display as demand on stacked graphs
Bachibouzouk Oct 7, 2024
0fbdf52
Add stacked timeseries graph also for chp
Bachibouzouk Oct 7, 2024
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
58 changes: 50 additions & 8 deletions app/dashboard/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,9 @@ def graph_timeseries_stacked(simulations, y_variables, energy_vector):
When(Q(oemof_type="sink"), then=Value("none")),
When(Q(oemof_type="storage") & Q(direction="out"), then=Value("none")),
When(
Q(asset_type="heat_pump") & Q(direction="out"), then=Value("none")
Q(asset_type__in=("heat_pump", "chp_fixed_ratio", "chp"))
& Q(direction="out"),
then=Value("none"),
),
default=Value("tonexty"),
),
Expand All @@ -959,7 +961,9 @@ def graph_timeseries_stacked(simulations, y_variables, energy_vector):
Q(oemof_type="storage") & Q(direction="out"), then=Value("demand")
),
When(
Q(asset_type="heat_pump") & Q(direction="out"), then=Value("demand")
Q(asset_type__in=("heat_pump", "chp_fixed_ratio", "chp"))
& Q(direction="out"),
then=Value("demand"),
),
When(
Q(oemof_type="sink"), # & Q(asset_type__contains="demand"),
Expand All @@ -974,7 +978,9 @@ def graph_timeseries_stacked(simulations, y_variables, energy_vector):
then=Value("lines"),
),
When(
Q(asset_type="heat_pump") & Q(direction="out"), then=Value("lines")
Q(asset_type__in=("heat_pump", "chp_fixed_ratio", "chp"))
& Q(direction="out"),
then=Value("lines"),
),
default=Value("none"),
),
Expand Down Expand Up @@ -1230,6 +1236,7 @@ def graph_costs(
).get()
)
elif qs_asset_results.count() > 1:
# TODO bug here online with Lübben
raise ValueError("should not have too much labels")
records.append(el)

Expand Down Expand Up @@ -1381,6 +1388,10 @@ def graph_costs(


def graph_sankey(simulation, energy_vector, timestep=None):

# for DSO results
dso_period_suffix = "_period (@)"

ts = timestep
if isinstance(energy_vector, list) is False:
energy_vector = [energy_vector]
Expand Down Expand Up @@ -1418,6 +1429,22 @@ def graph_sankey(simulation, energy_vector, timestep=None):
).values_list("asset", "flow_data")

for component_label, val in asset_to_bus_names:

if dso_period_suffix in component_label:
component_label = component_label.replace(dso_period_suffix, "")
if ts is None:
val = (
qs.filter(asset=component_label)
.values_list("total_flow")
.get()[0]
)
else:
val = (
qs.filter(asset=component_label)
.values_list("flow_data")
.get()[0]
)

# draw link from the component to the bus
if component_label not in labels:
labels.append(component_label)
Expand All @@ -1433,8 +1460,8 @@ def graph_sankey(simulation, energy_vector, timestep=None):
if component_label in chp_in_flow:
chp_in_flow[component_label]["value"] += val

if val == 0:
val = 1e-9
# if val == 0:
# val = 1e-9
values.append(val)
if ts is None:
bus_to_asset_names = qs.filter(
Expand All @@ -1445,9 +1472,24 @@ def graph_sankey(simulation, energy_vector, timestep=None):
bus=bus.name, direction="out"
).values_list("asset", "flow_data")

# TODO potentially rename feedin period and consumption period
for component_label, val in bus_to_asset_names:
# draw link from the bus to the component

if dso_period_suffix in component_label:
component_label = component_label.replace(dso_period_suffix, "")
if ts is None:
val = (
qs.filter(asset=component_label)
.values_list("total_flow")
.get()[0]
)
else:
val = (
qs.filter(asset=component_label)
.values_list("flow_data")
.get()[0]
)

if component_label not in labels:
labels.append(component_label)
colors.append("red")
Expand All @@ -1462,8 +1504,8 @@ def graph_sankey(simulation, energy_vector, timestep=None):
val = json.loads(val)
val = val[ts]

if val == 0:
val = 1e-9
# if val == 0:
# val = 1e-9
values.append(val)

# TODO display the installed capacity, max capacity and optimized_add_capacity on the nodes if applicable
Expand Down
Loading