Commit Graph

2899 Commits

Author SHA1 Message Date
Philipp Glaum
d4bad07cf4
build_transmission_projects: set s_max_pu to the value according to config (#1323) 2024-09-25 16:58:35 +02:00
Lukas Trippe
24e0ddd5a6
prepare for new n.add (#1316)
* prepare for new `n.add`

* Update scripts/prepare_sector_network.py

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>

---------

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-09-25 15:45:32 +02:00
Toni Seibold
79cea53146
Reduce retrofit potential in myopic optimization (#1258)
* reduce potential of gas network that can be retrofitted to H2 when gas grid is not resolved in myopic optimization

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* adding comment

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-09-25 13:23:50 +02:00
Fabian Neumann
8ed7654294
myopic: ensure all links with capital costs have lifetime (#1319)
* myopic: ensure all links with capital costs have lifetime

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-09-23 15:53:11 +02:00
Fabian Neumann
343aba1db9
Methanol-to-kerosene: correct efficiency and add VOM (#1320)
* MtK: add VOM

* MtK: fix methanol input efficiency
2024-09-23 15:52:57 +02:00
Fabian Neumann
e2be4d730e
bugfix: account for kerosene emissions in methanol-to-kerosene link (#1317)
* bugfix: account for kerosene emissions in methanol-to-kerosene link

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-09-23 11:52:54 +02:00
Fabian Neumann
9e43aa5b88 follow-up to #1312: avoid use of snakemake in industrial_energy_demand_per_country 2024-09-20 09:01:27 +02:00
Koen van Greevenbroek
81da6859ee
Fix industrial demand for ammonia when endogenously modelled (#1312)
* Fix industrial demand for ammonia when endogenously modelled

In calculating industrial energy demand today, demand for ammonia must
be resolved into just "ammonia" when endogenously modelled, or into
electricity and hydrogen if not.

* Add release note
2024-09-20 08:54:19 +02:00
Koen van Greevenbroek
38f2dc7a75
Only add buses in specified countries (#1308)
* Only add buses in specified countries

This is necessary for the new OSM-based base network, where loaded
buses already have a "country" attribute.

* Add release note
2024-09-18 16:29:05 +02:00
Fabian Neumann
08548dc738 remove unnecessary [-4:] from snakemake.wildcards.planning 2024-09-17 07:39:23 +02:00
Fabian Neumann
d8f8a828f9
options: biosng_cc, biomass_to_liquid_cc, 98% capture rate Allam gas,… (#1298)
* options: biosng_cc, biomass_to_liquid_cc, 98% capture rate Allam gas, avoid option.get

* fix duplicated bus port
2024-09-16 15:04:24 +02:00
Philipp Glaum
df71b1a64c
remove MtO as long as there is no HVC bus (#1299) 2024-09-16 15:02:42 +02:00
Fabian Neumann
013b705ee4
Clustering: build renewable profiles and add all assets after clustering (#1201)
* Cluster first: build renewable profiles and add all assets after clustering

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* correction: pass landfall_lengths through functions

* assign landfall_lenghts correctly

* remove parameter add_land_use_constraint

* fix network_dict

* calculate distance to shoreline, remove underwater_fraction

* adjust simplification parameter to exclude Crete from offshore wind connections

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* remove unused geth2015 hydro capacities

* removing remaining traces of {simpl} wildcard

* add release notes and update workflow graphics

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: lisazeyen <lisa.zeyen@web.de>
2024-09-13 15:37:01 +02:00
Bobby Xiong
42f2c37ebf
Updated osm-prebuilt network to v0.4 and added version control to config (#1293)
* Updated base_network script and rules.

* Updated osm-prebuilt to version 0.4 and added version control.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-09-13 14:55:52 +02:00
Fabian Neumann
dbe7f48d6e
update data bundle version (with reduced files) (#1291)
* update data bundle version (with reduced files)

* update data bundle to v0.4.1 with corrected permissions
2024-09-13 11:09:27 +02:00
cpschau
e35f651518
Update NUTS3 shapes (#1286)
* increase nuts3 shape resolution

* retrieve and use shapes with EPSG:4326

* co-retrieve nuts2 shapes; add retries

* added release note

* changed doc/data_sources
2024-09-12 19:20:07 +02:00
Bobby Xiong
16b0f35cd8
Bug fixes in add_existing_baseyear: Defaults and missing empty space (#1289)
* Bug fixes in add_existing baseyear.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: lisazeyen <35347358+lisazeyen@users.noreply.github.com>
2024-09-12 17:53:25 +02:00
lisazeyen
1b97a16bfa
add option to vary parameter (#1244)
* add option to vary parameter

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* remove logger.info

* adjust maybe_adjust_costs_and_potentials

* update configtables

* revert removed cost_factor

* reset build_energy_totals to master

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* add release notes

* Revert "revert removed cost_factor"

This reverts commit b7154f046954bd6de34c2910f3f9f52b44d5f233.

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-09-12 16:02:10 +02:00
cpschau
65054ae903
Simplify integration of unsustainable solid biomass (#1275)
* remove extra bus and link; remove redundant addition of oil carrier_bus

* remove redundant addition of oil carrier buses

* changed PyPSA requirement in envs/environment.yaml
2024-09-11 17:20:00 +02:00
lisazeyen
8e068c8a67
Merge branch 'master' into add_methanol_techs 2024-09-11 15:34:28 +02:00
pre-commit-ci[bot]
a57e39b3e7 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-09-11 13:09:53 +00:00
lisazeyen
6a1438cffd fix heating_system.sector bug 2024-09-11 15:06:17 +02:00
lisazeyen
4315b3a18a fix dropping bug 2024-09-11 14:22:15 +02:00
lisazeyen
c017211700 use snakemake.params 2024-09-11 10:16:09 +02:00
pre-commit-ci[bot]
0bdf90280b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-09-11 07:38:42 +00:00
lisazeyen
82a669635b
removing logging
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-09-11 09:38:21 +02:00
lisazeyen
0ac6a6a1f2
simplify exclude statement
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-09-11 09:38:07 +02:00
pre-commit-ci[bot]
649e48e1a9 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-09-11 07:36:02 +00:00
lisazeyen
163f834481
remove snakemake.config
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-09-11 09:35:50 +02:00
lisazeyen
b90f83a659
simplify drop expression
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-09-11 09:35:31 +02:00
Philipp Glaum
6cb68b191a address Lisa's comments 2024-09-11 09:32:42 +02:00
Fabian Neumann
f8542e7646
Merge branch 'master' into fix_building_fec 2024-09-10 21:03:49 +02:00
Bobby Xiong
ac606c1f67
Build biomass transport costs from pre-extracted .csv instead of pdf (#1272)
* Removed tabula dependency for building biomass transport costs. Instead use pre-extracted .csvs. Updated rule and script accordingly.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Updated script to optionally allow running the script with tabula-py dependency to recreate csv, if needed.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-09-10 20:51:28 +02:00
lisazeyen
95ac2f5e23
Merge branch 'master' into fix_building_fec 2024-09-10 19:24:15 +02:00
lisazeyen
086beb7bd7
Merge branch 'master' into fix_building_fec 2024-09-10 18:29:38 +02:00
lisazeyen
a7c37759e8
Merge branch 'master' into myopic_hydrogen_network_plotting 2024-09-10 17:00:00 +02:00
lisazeyen
424ae3b5e6
Merge branch 'master' into add_methanol_techs 2024-09-10 16:51:52 +02:00
cpschau
8a0b6ba911
Hot fix: Rename reindex transport costs for unsustainable biomass (#1271)
* reindex transport costs for unsus biomass

* change index of potential dataframe for unsustainable solid potentials
2024-09-10 16:21:14 +02:00
pre-commit-ci[bot]
e89027e946 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-09-10 12:04:19 +00:00
Philipp Glaum
3f4a7a1e1e Merge remote-tracking branch 'upstream/master' into add_methanol_techs 2024-09-10 13:52:42 +02:00
daniel.rdt
879c896bea fix bug for plotting of hydrogen network with myopic foresight. 2024-09-10 13:51:34 +02:00
Fabian Neumann
5f45a1be84 build_biomass_transport_costs: do not rename XK to KO 2024-09-10 12:32:42 +02:00
Toni Seibold
9aa9a59bb0
removing scripts. (#1267) 2024-09-09 19:35:15 +02:00
lisazeyen
d9c872031c
Merge branch 'master' into fix_building_fec 2024-09-09 18:32:09 +02:00
pre-commit-ci[bot]
5465d8cc75 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-09-09 16:28:09 +00:00
lisazeyen
861054961a simplify expression 2024-09-09 18:20:30 +02:00
lisazeyen
59984d0600 add function for efficiency 2024-09-09 18:19:18 +02:00
lisazeyen
93ec44de77 use heat_system.sector 2024-09-09 18:10:59 +02:00
Amos Schledorn
5cf706fe4d
Update central heating temperatures based on Euroheat data and AGFW-Hauptbericht (#1264)
* chore: update config.default
Using Euroheat market outlook 2024 and AGFW-Hauptbericht

* feat: extrapolate missing values in central_heating_temperature_profile.run

* update release notes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: map_temperature_dict_to_onshore regions and correct use of extrapolation function

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix: extrapolation_ration in build_central_heating_temperature_profiles.run

* style: remove obsolete time index in min/max fwd, return temperatures

* feat: throw exception if max_fwd_temp < min_fwd_temp or min_fwd_temp < return_temp

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: Amos Schledorn <a.schledorn@tu-berlin.de>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-09-09 14:38:39 +00:00
Fabian Hofmann
0423366db6
prepare_sector_network: fix e_max_pu in unsustainable biomass stores (#1266) 2024-09-09 14:14:16 +02:00