Commit Graph

145 Commits

Author SHA1 Message Date
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
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
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
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
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
Fabian Neumann
84d6634af0
Merge branch 'master' into implement-floating 2024-05-13 10:04:42 +02:00
Fabian Neumann
4dc350cbde use raw not blob github link 2024-05-12 16:10:02 +02:00
Philipp Glaum
da617be276 Merge branch 'master' of github.com:PyPSA/pypsa-eur into implement-floating 2024-05-10 13:29:58 +02:00
Fabian Neumann
991eef6d97 update and reduce databundle size 2024-04-15 14:48:34 +02:00
yerbol-akhmetov
d2584d37b1 update energy totals from Eurostat residential data 2024-04-14 16:28:50 +05:00
LukasFrankenQ
0396828e3a Merge https://github.com/pypsa/pypsa-eur 2024-03-27 00:09:02 +01:00
LukasFrankenQ
46cd9a8274 changed implementation to always use 2020 cost 2024-03-26 23:54:25 +01:00
LukasFrankenQ
97acf2f12e included Lisas PR suggestions 2024-03-19 19:30:23 +01:00
Fabian Neumann
4fbb3c81c4 fix build_district_heat_share and build_transport_demand for multiyear 2024-03-14 16:48:32 +01:00
Fabian Neumann
f695b63732 add more documentation 2024-03-14 14:31:18 +01:00
LukasFrankenQ
09765ad060 Merged https://github.com/pypsa/pypsa-eur 2024-03-14 12:03:56 +01:00
Fabian Neumann
5b5d308bf7 adapt transport data to multiyear setup with new swiss data 2024-03-13 13:42:03 +01:00
Fabian Neumann
7fa6811760 Merge branch 'master' into multiyear 2024-03-13 09:13:31 +01:00
Fabian Neumann
45e955a0d8 add https:// prefix for all storage() calls 2024-03-09 12:07:47 +01:00
Fabian Neumann
105dc6470a replace remaining instances of HTTP.remote 2024-03-08 17:51:02 +01:00
Fabian Neumann
d983d79ed2 Merge branch 'master' into snakemake-8 2024-03-08 17:50:08 +01:00
Fabian Neumann
579cd0c756 Merge branch 'master' into multiyear 2024-03-06 16:34:53 +01:00
Fabian Neumann
c13e0b83cf remove remaining references of eurostat report year 2024-03-05 18:55:59 +01:00
Fabian Neumann
5b513f81db move eurostat into data/eurostat subdirectory from sector-bundle 2024-03-05 18:42:15 +01:00
Fabian Neumann
41f23f9589 change eurostat year in build_industrial_production_per_country 2024-03-05 18:40:06 +01:00
Fabian Neumann
9d913bcb38 smaller fixes and reduction of diff 2024-03-04 19:36:41 +01:00
pre-commit-ci[bot]
7b584f16bb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-04 16:56:00 +00:00
Fabian Neumann
c2011bce49 remove {weather_year} wildcard 2024-03-04 17:48:56 +01:00