Commit Graph

5258 Commits

Author SHA1 Message Date
pre-commit-ci[bot]
e42b36e83d [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-04 11:40:21 +00:00
millingermarkus
fbacb76e9c Minor edits to MSW 2024-07-04 13:34:05 +02:00
millingermarkus
c81d208da2 Remove redundant Waste CHP addition 2024-07-04 11:59:32 +02:00
Markus Millinger
521cf0e753
Merge branch 'PyPSA:master' into msw_incineration 2024-07-04 11:53:00 +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
Martha Frysztacki
02abc99c60
Merge pull request #1127 from PyPSA/fix_env
restrict geopandas until conflicts are resolved
2024-07-03 11:17:47 +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
Martha Frysztacki
358561a619
Update envs/environment.yaml
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-07-03 08:33:03 +02:00
Martha Frysztacki
061fd00bd1
Merge branch 'master' into fix_env 2024-07-01 15:10:18 +02:00
martacki
bba4857025 restrict geopandas until conflicts are resolved 2024-07-01 15:07:20 +02:00
Fabian Neumann
54009e7af8 increase mem_mb for build_powerplants rule 2024-07-01 13:33:29 +01:00
pre-commit-ci[bot]
ab8df855bd [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-06-27 10:21:04 +00:00
fhg-isi
6f260bed76
suggestion to fill missing section in sentence 2024-06-27 12:19:25 +02:00
Fabian Neumann
299a8ed65b
Merge pull request #1112 from bobbyxng/master
Fixed mock_snakemake for snakemake v.8.14: All snakemake settings moved
2024-06-21 12:26:04 +02:00
bobbyxng
6962ba0cfb Fixed mock_snakemake for snakemake v.8.14: All snakemake settings moved to snakemake.settings.types. 2024-06-20 15:46:14 +02:00
Fabian Neumann
8455c2e8ce
Merge pull request #1109 from PyPSA/snakemake-8-14
compatibility with snakemake 8.14 closes #1108
2024-06-20 15:15:40 +02:00
Fabian Neumann
14b8de8348 compatibility with snakemake 8.14 closes #1108 2024-06-20 14:38:04 +02:00
Fabian Neumann
450f75a989 bugfix: correctly read threshold capacity in add_brownfield 2024-06-19 15:54:23 +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
Fabian Neumann
0ead0dc6a4
Merge pull request #1105 from PyPSA/document-heat-rules
Document heating rules
2024-06-17 18:56:52 +02:00
Fabian Neumann
b6e4bb8e91
Merge pull request #1106 from PyPSA/fix_float_bug
prepare_sector_network: add floating wind to update cost function
2024-06-17 18:55:34 +02:00
Philipp Glaum
ad38016f6d prepare_sector_network: add floating wind to update cost function 2024-06-17 15:22:33 +02:00
AmosSchledorn
c787437350 correct typos in heating rule docs 2024-06-17 11:47:55 +02:00
pre-commit-ci[bot]
4a1933f49a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-06-17 09:44:05 +00:00
AmosSchledorn
d2018e1088 Document heating rules 2024-06-17 11:38:23 +02:00
Michael Lindner
b174a53480 non-zero capital_cost for methanol stores 2024-06-14 11:29:59 +02:00
lisazeyen
72af49a78d
Merge pull request #1102 from PyPSA/fix-grouping-logic-again-master
Fix grouping logic again
2024-06-13 15:46:57 +02:00
Micha
37bbbc6225 Fix grouping logic again 2024-06-13 15:03:08 +02:00
lisazeyen
f2014c231a
Merge pull request #1098 from bobbyxng/plot_summary_fix
Bug-fix: plot_summary script generating empty pdfs.
2024-06-11 15:51:27 +02:00
Bobby Xiong
1b0ef5ebd5 Bug fix Snakefile: rule all input updated to 'graphs/costs.svg'. 2024-06-11 15:36:51 +02:00
Bobby Xiong
0db78a93e6 Fixed bug which generated empty pdfs when calling plot_summary from CI or snakemake. Using .svg exports instead. 2024-06-11 15:10:12 +02:00
lisazeyen
8438153638
Merge pull request #1094 from PyPSA/fix-p_nom-existing-renewables
Hotfix for n.statistics.installed_capacity
2024-06-10 15:25:21 +02:00
Michael Lindner
a4a048f129 add release note 2024-06-10 11:21:43 +02:00
Micha
b052a5e54a
Merge branch 'master' into fix-p_nom-existing-renewables 2024-06-10 10:59:49 +02:00
Micha
24b50e83e0
Merge pull request #1092 from PyPSA/revert-hotfix-myopic-res-capacities
revert hotfix for doubled renewable capacity
2024-06-10 10:57:47 +02:00
pre-commit-ci[bot]
5168b3fe0b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-06-07 16:02:02 +00:00
Michael Lindner
c24b7f657b set generator baseyear p_nom to p_nom_min 2024-06-07 17:59:43 +02:00
pre-commit-ci[bot]
47889d728f [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-06-07 12:34:51 +00:00
Michael Lindner
bcef24f913 add release note 2024-06-07 14:32:14 +02:00