Commit Graph

168 Commits

Author SHA1 Message Date
lisazeyen
c017211700 use snakemake.params 2024-09-11 10:16:09 +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
d9c872031c
Merge branch 'master' into fix_building_fec 2024-09-09 18:32:09 +02:00
cpschau
53f84f7eea
Follow-Up: Unsustainable Biomass (#1254)
* add oil bus; extend global biomass limit; set unsustainable potentials to zero for overnight

* keep sustainable potentials for switzerland

* remove potential distinction for overnight; additional global constraint for unsustainable solid biomass

* add unsustainable generator suffix

* added unsustainable solid biomass bus; changed global constraints to equality; removed forced emptying of unsustainable solid biomass store

* restored equality constraint for sustainable solid biomass; restored forced emptying of unsustainable store

* remove directory change for debugger

* added tech_color for unsustainable solid biomass

* modified spatial namespaces and removed suffixes
2024-09-08 11:59:37 +02:00
Tom Brown
0bcb215597 use JRC-IDEES thermal energy service instead of FE for buildings
This change consists of:

- reading the final energy (FE) to thermal energy service (TES)
  efficiency for each each country, seperately for gas and oil (this
  efficiency represents e.g. the losses in older non-condensing
  boilers)

- using TES instead of FE for the n.loads, so that it is pure energy
  service instead of including losses in legacy equipment

- using the stored efficiencies for baseyear equipment in
  add_existing_baseyear

In the baseyear (e.g. 2020) this should have no effect on FE, since
the reduction to TES is conpensated by the lower efficiencies of
existing equipment.

In the future (e.g. 2050) this leads to a reduction in heating demand,
since new equipment is more efficient than existing.
2024-09-02 19:32:13 +02:00
Amos Schledorn
bf2d82a384
Dynamic central heating temperatures (#1206)
* feat: Add rule to build central heating temperature profiles, adjust build_cop_profiles accordingly

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

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

* style: make new config settings prettier

* docs: add file headers

* docs: update configtables and module docstring

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

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

* docs: update release notes

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

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

* chore: use smooth ambient temperature through rolling window; remove default vals in class

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

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

* Update doc/configtables/sector.csv

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Amos Schledorn <a.schledorn@tu-berlin.de>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-08-30 16:01:46 +02:00
Fabian Neumann
3a1b57515a
industry: steel GEM, ammonia, refinery, cement plants non-EU (#1241)
* industry distribution: split EAF + integrated using GEM GSPT, add ammonia plants

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

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

* add release note [no ci]

* add cement plant data for countries not in Hotmaps

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

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

* add refineries data for countries not in Hotmaps

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-08-30 14:53:54 +02:00
Fabian Neumann
1b2ec575bc
retrieve urban population fraction from World Bank API (#1248)
* retrieve urban population fraction from World Bank API

* [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-08-30 10:26:34 +02:00
Fabian Neumann
cab85cbb61
update GEM Europe gas tracker to May 2024 version (#1235) 2024-08-26 13:04:15 +00:00
AmosSchledorn
a017802976 Merge remote-tracking branch 'origin/master' into country-specific-dh-forward-temperatures 2024-08-13 17:07:29 +02:00
lisazeyen
c5256c1f37 add coke oven transformation output 2024-08-09 14:24:12 +02:00
lisazeyen
fe9185ef3f
Merge branch 'master' into jrc-idees-2020 2024-08-09 14:17:25 +02:00
AmosSchledorn
6c9bcae6f0 Merge remote-tracking branch 'origin/master' into country-specific-dh-forward-temperatures 2024-08-08 17:20:23 +02:00
cpschau
f8d0efbe99
Addition of unsustainable biomass potentials (#1139)
* add columns to potential df defined by difference to eurostat

* add network components

* add unsustainable bioliquids

* replaced stores by generators, still infeasible

* remove municipal waste

* remove separate treatment of waste from biomass potential calculation

* phase out unsustainble biomass potentials

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

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

* phase-out unsustainable bioliquids

* remove waste_incineration from build_sector rule

* multiple potential calculation for different planning horizons

* raised costs of unsustainable solid biomass

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

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

* stores instead of generators

* change snakemake inputs

* add phas-eout to config

* add techcolor for unsustainable bioliquids

* add config parameter to disable inclusion of unsustainable bioenergy potentials

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

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

* add biomass to params

* remove call of snakemake object in define_spatial

* Quick resolve of review part 1 (config parameters, if-clause-reduction, bioliquid spatial, fix bioliquid link capacity

* Quick resolve of review part 2 (config table, helper function, fixed build_eurostat, removed dir-change, forced unsustainable usage, reverted overnight distinction in Snakefile)

* Cast of planning_horizon parameter to int type after test run

* added JRC fuel costs for solid and liquid biofuels, BtL VOM

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

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

* clean-up after master merge

* adressed review (increase threads for build_eurostat, fixed e_max_pu of Stores, changed version of technology-data); added release note

---------

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-08-07 15:52:00 +00:00
AmosSchledorn
ac3d797fc1 Merge remote-tracking branch 'origin/master' into country-specific-dh-forward-temperatures 2024-08-07 14:44:26 +02:00
lisazeyen
bab392f378
remove not needed function 2024-08-07 14:14:19 +02:00
AmosSchledorn
80603fda6e update config and script 2024-08-07 13:33:59 +02:00
lisazeyen
5bf36c218c add ch data as csv 2024-08-07 11:49:33 +02:00
lisazeyen
682d53d1b5 remove /bundle 2024-08-07 10:07:52 +02:00
pre-commit-ci[bot]
3c528b7b0a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-06 15:52:01 +00:00
lisazeyen
2c7e30bb17 remove ammonia demand script 2024-08-06 17:46:23 +02:00
pre-commit-ci[bot]
6b924ecfb0 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-02 15:15:11 +00:00
AmosSchledorn
b0150bd65d refactor prepare_sector_network.add_heat using Enums 2024-08-01 11:59:26 +02:00
lisazeyen
52c8037a3e merge master 2024-07-31 16:09:33 +02:00
lisazeyen
b92f0d0c30 update industry sector ratios to new JRC data 2024-07-30 15:26:28 +02:00
pre-commit-ci[bot]
1fe54513cd [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-29 16:33:52 +00:00
AmosSchledorn
29479c50d0 pass heat source/system type to prepare_sector_network and add_existing_baseyear 2024-07-29 18:29:27 +02:00
lisazeyen
2f3fde26d0 update ammonia demand data to 2022 2024-07-29 16:09:38 +02:00
lisazeyen
fb2ab4c50b update ammonia data 2024-07-29 15:44:30 +02:00
lisazeyen
201889424c update industry to new JRC-idees 2024-07-29 15:39:01 +02:00
AmosSchledorn
0edf566e3f attempt to handle heat_pump_sources dynamically 2024-07-29 14:36:30 +02:00
AmosSchledorn
368971f2a6 remove cop_total input from prepare_sector_network 2024-07-24 17:19:42 +02:00
AmosSchledorn
0c2f9b5daa remove rural/urban temperature 2024-07-24 17:05:04 +02:00
AmosSchledorn
b720bd9eca Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-07-24 15:43:34 +02:00
AmosSchledorn
a4847a10ce update build_sector.smk 2024-07-24 15:40:21 +02:00
AmosSchledorn
3fac27ff27 use module structure 2024-07-24 15:03:44 +02:00
Fabian Neumann
eab315291e
remove {scope} wildcard (#1171)
* remove {scope} wildcard

* do not create removed files
2024-07-24 13:19:57 +02:00
pre-commit-ci[bot]
5361facbb7 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-22 13:39:06 +00:00
AmosSchledorn
0c7e7cb46b fix naming, udpate docs 2024-07-19 18:54:19 +02:00
AmosSchledorn
052394fa88 change naming from individual/district heating to denctral/central heating 2024-07-19 15:57:53 +02:00
AmosSchledorn
f3c898f43d build district heating heat pump COPs using approximation from Jensen et al. and values from Pieper et al. 2024-07-19 15:39:16 +02:00
AmosSchledorn
167b056def remove obsolete rural/urban COPs and rename cop_..._total to cop_..._individual_heating 2024-07-19 15:22:50 +02:00
lisazeyen
957176a20d adjustment to build_energy_totals 2024-07-18 15:39:52 +02:00
LukasFrankenQ
2f1d6d20b1 final corrections, improved docs 2024-06-01 00:20:31 +01:00
LukasFrankenQ
2801b00100 Merge https://github.com/pypsa/pypsa-eur 2024-05-26 22:38:03 +01:00
Fabian Neumann
31e41f5f5d time_aggregation: optional rule inputs need [] not None 2024-05-23 21:52:09 +02:00
Fabian Neumann
4e85ddc5c9 Merge branch 'update_households_energy' of github.com:yerbol-akhmetov/pypsa-eur into yerbol-akhmetov-update_households_energy 2024-05-21 19:02:18 +02:00
Fabian Neumann
eb4381be4d update energy balances April 2023 link 2024-05-21 15:59:46 +02:00
Koen van Greevenbroek
354fffe6f0 Split time agg into own rule; same agg for all planning horizons 2024-05-15 13:26:03 +02:00