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

bugfix missing oil generator: remove else clause #1257

Merged
merged 3 commits into from
Sep 3, 2024
Merged

bugfix missing oil generator: remove else clause #1257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34f5d2e
bugfix missing oil generator: remove else clause
lindnemi Sep 3, 2024
0b30aef
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 3, 2024
f100504
add release-note
lindnemi Sep 3, 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
6 changes: 4 additions & 2 deletions doc/release_notes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ Release Notes
.. Upcoming Release
.. ================

* bugfix: The oil generator was incorrectly dropped when the config `oil_refining_emissions` was greater than zero. This was the default behaviour in 0.12.0.

PyPSA-Eur 0.12.0 (30th August 2024)
===================================

Expand Down Expand Up @@ -100,7 +102,7 @@ PyPSA-Eur 0.12.0 (30th August 2024)
share_unsustainable_use_retained`` and ``biomass:
share_sustainable_potential_available``.
(https://github.com/PyPSA/pypsa-eur/pull/1139)

* Added energy penalty for BECC applications.
(https://github.com/PyPSA/pypsa-eur/pull/1130)

Expand Down Expand Up @@ -258,7 +260,7 @@ PyPSA-Eur 0.12.0 (30th August 2024)
:mod:`prepare_sector_network`. (https://github.com/PyPSA/pypsa-eur/pull/1106)

* Fixed PDF encoding in ``build_biomass_transport_costs``.
(https://github.com/PyPSA/pypsa-eur/pull/1219)
(https://github.com/PyPSA/pypsa-eur/pull/1219)

* Dropped ``pycountry`` dependency in favour of ``country_converter``.
(https://github.com/PyPSA/pypsa-eur/pull/1188)
Expand Down
2 changes: 1 addition & 1 deletion doc/tutorial.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ This triggers a workflow of multiple preceding jobs that depend on each rule's i
7 -> 24
26 -> 25
27 -> 25
}
}

|

Expand Down
6 changes: 3 additions & 3 deletions envs/environment.fixed.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: pypsa-eur-20240812
channels:
- http://conda.anaconda.org/gurobi
- conda-forge
- defaults
- http://conda.anaconda.org/gurobi
- conda-forge
- defaults
prefix: /home/fneum/miniconda3/envs/pypsa-eur-20240812
18 changes: 8 additions & 10 deletions scripts/prepare_sector_network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,16 +604,14 @@ def add_carrier_buses(n, carrier, nodes=None):

suffix = " primary"

else:

n.madd(
"Generator",
nodes + suffix,
bus=nodes + suffix,
p_nom_extendable=True,
carrier=carrier + suffix,
marginal_cost=costs.at[carrier, "fuel"],
)
n.madd(
"Generator",
nodes + suffix,
bus=nodes + suffix,
p_nom_extendable=True,
carrier=carrier + suffix,
marginal_cost=costs.at[carrier, "fuel"],
)


# TODO: PyPSA-Eur merge issue
Expand Down
Loading