Skip to content

Adapt eesyplan parameters names #484

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

Draft
Bachibouzouk wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Adapt eesyplan parameters names #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions app/projects/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,7 @@ def __init__(self, *args, **kwargs):
)
self.fields["efficiency"].label = _(
"Electrical efficiency with no heat extraction"
)
) # Electrical efficiency with maximal heat extraction

self.fields[
"efficiency"
Expand All @@ -785,7 +785,9 @@ def __init__(self, *args, **kwargs):
"Thermal efficiency with maximal heat extraction"
)

self.fields["thermal_loss_rate"].label = _("Power loss index")
self.fields["thermal_loss_rate"].label = _(
"Power loss index"
) # Electrical efficiency with no heat extraction

if self.asset_type_name == "chp_fixed_ratio":
self.fields["efficiency"].label = _("Efficiency gas to electricity")
Expand Down
17 changes: 12 additions & 5 deletions app/projects/models/base_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,18 +1057,25 @@ def to_datapackage(self):
profile_resource_rec[col] = value.values
value = col

if self.asset_type.asset_type in ("ess", "hess", "gess", "h2ess"):
if field == "efficiency":
field = "efficiency_charge"

if field == "crate":
field = "c_rate_charge"

if self.asset_type.asset_type == "chp_fixed_ratio":
if field == "efficiency":
field = "conversion_factor_to_electricity"
field = "efficiency_electricity_chp"
elif field == "efficiency_multiple":
field = "conversion_factor_to_heat"
field = "efficiency_heat_chp"
elif self.asset_type.asset_type == "chp":
if field == "thermal_loss_rate":
field = "beta"
field = "efficiency_electricity_full_condensation" # "beta"
elif field == "efficiency":
field = "conversion_factor_to_electricity"
field = "efficiency_electricity_chp"
elif field == "efficiency_multiple":
field = "conversion_factor_to_heat"
field = "efficiency_heat_chp"
elif self.asset_type.asset_type == "heat_pump":
if field == "efficiency":
field = "cop"
Expand Down
Loading