Skip to content

Commit

Permalink
Quick fix for to adapt base_network for changes in voltage rebase (#1008
Browse files Browse the repository at this point in the history
)

* Fix column name

* Increase a voltage range

* Fix a config table

* Update the release notes
  • Loading branch information
ekatef authored Apr 23, 2024
1 parent d89a9a3 commit 956e203
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion config.default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ load_options:

electricity:
base_voltage: 380.
voltages: [220., 300., 380.]
voltages: [132., 220., 300., 380., 500., 750.]
co2limit: 7.75e+7 # European default, 0.05 * 3.1e9*0.5, needs to be adjusted for Africa
co2base: 1.487e+9 # European default, adjustment to Africa necessary
agg_p_nom_limits: data/agg_p_nom_minmax.csv
Expand Down
2 changes: 1 addition & 1 deletion config.tutorial.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ load_options:

electricity:
base_voltage: 380.
voltages: [220., 300., 380.]
voltages: [132., 220., 300., 380., 500., 750.]
co2limit: 1.487e+9
co2base: 1.487e+9
agg_p_nom_limits: data/agg_p_nom_minmax.csv
Expand Down
2 changes: 1 addition & 1 deletion doc/configtables/electricity.csv
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
,Unit,Values,Description
base_voltage, kV, float, "Base voltage to which all lines are simplified/aggregated. Simplification preserves transmission capacities."
voltages, kV, "Any subset of {220., 300., 380.}", "Voltage levels considered."
voltages, kV, "A subset of 'standard' voltages considered to map OSM-extracted voltages into 'standard' linetypes."
co2limit,:math:`t_{CO_2-eq}/a`, float, "Cap on system total annual carbon dioxide equivalent emissions."
co2base,:math:`t_{CO_2-eq}/a`, float, "Reference value of system total annual carbon dioxide equivalent emissions. Used only if relative emission reduction target is specified in ``{opts}`` wildcard."
automatic_emission, bool, "{True, False}", "True: Emissions are obtained from automatic emission extraction procedure. False: Emissions are obtained manually"
Expand Down
4 changes: 2 additions & 2 deletions doc/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ E.g. if a new rule becomes available describe how to use it `snakemake -j1 run_t

**Minor Changes and bug-fixing**

* Minor bug-fixing for GADM_ID format naming. `PR #980 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/980>`__, `PR #986 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/986>`__ and `PR #989 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/989>`__
* Minor bug-fixing to get the generalised line types work for DC lines. `PR #1008 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/1008>`__

* Keep data on the original voltage value when rebasing voltages to the standard values and adjust the transmission capacity accordingly. `PR #898 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/978>`__
* Minor bug-fixing for GADM_ID format naming. `PR #980 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/980>`__, `PR #986 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/986>`__ and `PR #989 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/989>`__

* Fix download_osm_data compatibility for earth-osm v2.1. `PR #954 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/954>`__ and `PR #988 <https://github.com/pypsa-meets-earth/pypsa-earth/pull/988>`__

Expand Down
2 changes: 1 addition & 1 deletion scripts/base_network.py
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ def base_network(
lines_dc = _set_electrical_parameters_links(links_config, lines_dc)
# parse line information into p_nom required for converters
lines_dc["p_nom"] = lines_dc.apply(
lambda x: x["v_nom_original"] * n.line_types.i_nom[x["type"]],
lambda x: x["v_nom"] * n.line_types.i_nom[x["type"]],
axis=1,
result_type="reduce",
)
Expand Down

0 comments on commit 956e203

Please sign in to comment.