Micha
c50a3770ea
Merge pull request #1144 from PyPSA/restrict_waste_heat
...
Follow-up: Adjusted release note of #1141
2024-07-11 13:25:57 +02:00
pre-commit-ci[bot]
c8021704b6
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-07-11 10:08:56 +00:00
cpschau
7411ae145c
adjusted release note
2024-07-11 11:56:48 +02:00
Micha
4dd0bb8f3a
Merge pull request #1141 from PyPSA/restrict_waste_heat
...
FT and electrolysis waste heat for DH as float
2024-07-11 11:25:41 +02:00
cpschau
530671ec07
add release note
2024-07-09 14:25:33 +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
fe5487e277
adjust parameters in config update from wildcards
2024-07-09 14:05:43 +02: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
b6d11bba6f
build_shapes: default to no tolerance in polygon simplification ( #1137 )
2024-07-09 11:07:15 +02:00
pre-commit-ci[bot]
31753143f5
[pre-commit.ci] pre-commit autoupdate ( #1140 )
...
updates:
- [github.com/fsfe/reuse-tool: v3.1.0a1 → v4.0.3](https://github.com/fsfe/reuse-tool/compare/v3.1.0a1...v4.0.3 )
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-07-09 09:17:17 +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
Fabian Neumann
43c0c3871f
Merge pull request #1120 from fhg-isi/patch-1
...
suggestion to fill missing section in sentence
2024-07-06 12:18:28 +02:00
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
