Commit Graph

695 Commits

Author SHA1 Message Date
Philipp Glaum
975716250a add bus0 for methanol-to-kerosene process 2024-08-05 12:00:15 +02:00
Philipp Glaum
8579689f2a Merge remote-tracking branch 'upstream/master' into bio_methanol 2024-08-05 10:11:55 +02:00
Philipp Glaum
acb0a8d7af get methanol to kerosene cost form technology data 2024-08-05 10:08:04 +02:00
pre-commit-ci[bot]
e28c66e43c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-02 13:27:42 +00:00
lisazeyen
2d79673d5e merge master 2024-08-02 15:23:35 +02:00
lisazeyen
eb81cfb714 change units from EJ->TWh and clean up 2024-08-02 15:13:47 +02:00
lisazeyen
8c5cd4be83
Merge branch 'master' into becc_energy_penalty 2024-08-02 14:35:01 +02:00
pre-commit-ci[bot]
c7a186863e [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-02 12:07:18 +00:00
lisazeyen
8bfca9ce69 enable electrobiofuels also without biomass spatially resolved 2024-08-02 14:05:42 +02:00
lisazeyen
8efa832f95 Merge remote-tracking branch 'origin' into ebiofuels 2024-08-02 13:39:02 +02:00
pre-commit-ci[bot]
de3f679f33 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-01 15:54:24 +00:00
lisazeyen
b2d346f02c some simplifications 2024-08-01 17:47:21 +02:00
lisazeyen
dcde6a9f58 Merge remote-tracking branch 'origin' into nofossil 2024-08-01 17:38:57 +02:00
Fabian Neumann
4c1ec3559d
some small adjustments to run as single node model (#1183)
* some small adjustments to run as single node model

* [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-07-31 11:53:20 +02:00
Philipp Glaum
5c1d8178f1 Merge branch 'methanol_to_master' into bio_methanol 2024-07-29 14:51:50 +02:00
Philipp Glaum
d142717563 add methanol techs for master to branch 2024-07-29 14:49:57 +02:00
Micha
f5fe0d062c
Rename ev battery master (#1116)
* rename EV battery

* add release note

* adjust tech colors

* fix for battery renaming in plot_summary

---------

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-07-29 09:50:02 +02:00
Toni Seibold
23ea16dc14
Lifetime of Gas Pipelines (#1162)
* inf lifetime of gas pipelines avoids adding new links each planning horizon

* p_nom_extendable for existing gas pipelines is set false if retrofitting to H2 is not allowed

* [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-07-29 09:47:08 +02:00
lisazeyen
877ca3eb44
change sign sequestration store marginal cost (#1174) 2024-07-22 16:44:26 +02:00
Micha
4c05928766
add marginal cost to preven model degeneracy (#1155) 2024-07-15 16:41:32 +02:00
Micha
d3b24face6
revert to old config keys (#1152)
* revert to old config keys

* [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-07-12 16:22:53 +02:00
pre-commit-ci[bot]
1de4db5f9c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-09 12:08:57 +00:00
cpschau
f19279e7e0 Add other waste heat technologies, and adjust share 2024-07-09 14:02:45 +02:00
cpschau
e932466b05 FT and electrolyis waste heat for DH as float 2024-07-09 12:05:50 +02:00
Fabian Neumann
c3151902f6
Compatibility with geopandas version 1 (#1136)
* address geopandas and pandas deprecations/warnings

* compatibility with geopandas v1

* [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-07-08 08:29:16 +02:00
pre-commit-ci[bot]
5ca27837f3 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-04 09:21:00 +00:00
millingermarkus
5c7bb2bf51 Add option to exclude fossil fuels 2024-07-04 11:16:00 +02:00
pre-commit-ci[bot]
ee6d8b1e42 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-04 08:22:24 +00:00
millingermarkus
c71fa78bfa Added biomass imports to prepare sector network 2024-07-04 10:18:19 +02:00
Markus Millinger
821eb07e98
Correct costs of BtL and BioSNG 2024-07-04 09:59:45 +02:00
pre-commit-ci[bot]
192a8eb14b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-04 07:30:52 +00:00
Markus Millinger
270ce82b9f
Cost correction 2024-07-04 09:30:22 +02:00
pre-commit-ci[bot]
b934653b65 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-03 10:42:07 +00:00
millingermarkus
84ddfea91e Added electrobiofuels 2024-07-03 12:38:16 +02:00
pre-commit-ci[bot]
53328e89f2 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-03 08:07:32 +00:00
millingermarkus
76e15d6862 Carbon capture capital cost for waste CHP 2024-07-03 09:42:15 +02:00
millingermarkus
b5ff1e8f9c Added note on carbon capture for BioSNG and BtL 2024-07-03 09:38:08 +02:00
millingermarkus
c7ce47dffd Energy penalty for solid biomass CHP 2024-07-03 09:22:09 +02:00
Fabian Neumann
6348c904bd
Merge pull request #1103 from PyPSA/methanol-store-capital-cost
non-zero capital_cost for methanol stores
2024-06-17 18:57:35 +02:00
Philipp Glaum
ad38016f6d prepare_sector_network: add floating wind to update cost function 2024-06-17 15:22:33 +02:00
Michael Lindner
b174a53480 non-zero capital_cost for methanol stores 2024-06-14 11:29:59 +02:00
LukasFrankenQ
4752840009 improved docs on EGS cost scaling 2024-06-01 00:32:44 +01: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
422c37827c time_aggregation: handle case without any temporal aggregation 2024-05-25 15:48:48 +02:00
Koen van Greevenbroek
2a6dcc4c12 Minor bugfixes for new time aggregation implementation 2024-05-21 18:09:09 +02:00
Fabian Neumann
d32feb3aae mark downloaded files as ancient rather than protected 2024-05-20 22:37:16 +02:00
Fabian Neumann
00efffcc13 move up methanol for industry, to before shipping 2024-05-20 22:06:31 +02:00
Fabian Neumann
0ad3489d3a Merge branch 'feature/methanol-production' of github.com:Climact/pypsa-eur-climact into Climact-feature/methanol-production 2024-05-20 22:06:15 +02:00
Fabian Neumann
60a26a67a0 simplify check for coal/coke industry demand 2024-05-20 21:08:44 +02:00