Commit Graph

5234 Commits

Author SHA1 Message Date
Lukas Trippe
4524aca5d9
fix: connection check failing (#1280) 2024-09-11 16:31:19 +02:00
lisazeyen
6f39dc7da1
Merge pull request #1207 from p-glaum/add_methanol_techs
Add methanol techs
2024-09-11 15:43:35 +02:00
lisazeyen
8e068c8a67
Merge branch 'master' into add_methanol_techs 2024-09-11 15:34:28 +02:00
lisazeyen
7acda28ee7
Merge pull request #1255 from PyPSA/fix_building_fec
Use JRC-IDEES thermal energy service instead of FE for buildings heating demand
2024-09-11 15:25:44 +02:00
lisazeyen
d9ab494080 add release note 2024-09-11 15:15:56 +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
13ec268440
Merge branch 'master' into fix_building_fec 2024-09-11 15:07:12 +02:00
lisazeyen
b7bcf3d302 add energy totals year to params 2024-09-11 15:06:32 +02: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
f118d15a4b fix typo 2024-09-10 21:54:24 +02:00
Fabian Neumann
8c57a80379
smk: use storage() only in combination with retrieve rules (#1274)
* smk: use storage() only in combination with retrieve rules

* [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 19:07:13 +00: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
Fabian Neumann
ca9556597e limit powerplantmatching version to below v0.6 due to upcoming breaking changes 2024-09-10 20:40:31 +02:00
lisazeyen
95ac2f5e23
Merge branch 'master' into fix_building_fec 2024-09-10 19:24:15 +02:00
lisazeyen
05634e8f22
Merge pull request #1270 from daniel-rdt/myopic_hydrogen_network_plotting
fix plotting of hydrogen network with myopic foresight.
2024-09-10 18:33:14 +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
Fabian Neumann
a69373b96c
mirror global energy monitor datasets (temporary) (#1265) 2024-09-08 13:00:15 +02:00
Fabian Neumann
2eaa316a6b remove duplicated color for unsustainable solid biomass 2024-09-08 12:00:19 +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
Philipp Glaum
a7bb478865
update nep links to include "Startnetz" ("start network") links (#1263) 2024-09-08 11:51:52 +02:00
Amos Schledorn
4a3e7924d2
Make overdimensioning factor for heating systems specific to central/decentral heating (#1259)
* chore: make overdim_factor heat-system-specific

* doc: update configtables

* doc: update release notes

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

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

* fix: read overdimensioning factor for industrial oil boilers from options

* [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>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-09-08 11:50:25 +02:00
Fabian Neumann
d02984c5a9 add color for unsustainable solid biomass 2024-09-08 11:48:13 +02:00
Micha
9f0e46860c
bugfix: determine bus_carrier locally instead of overwriting n.stores (#1262)
* bugfix: determine bus_carrier locally instead of overwriting n.stores

* add release_note

* [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-08 11:46:09 +02:00
lisazeyen
b32816973f
Merge pull request #1256 from PyPSA/fix_msw
account correctely for msw co2
2024-09-04 08:37:02 +02:00
Philipp Glaum
e940e4b73a
Merge branch 'master' into fix_msw 2024-09-04 08:26:50 +02:00