Commit Graph

4549 Commits

Author SHA1 Message Date
Fabian Neumann
a9333458b3 handle potentially diverging spatial resolutions of HVC 2024-05-13 17:40:10 +02:00
Fabian Neumann
bc42a573ef Merge branch 'landfill_master' of github.com:PyPSA/pypsa-eur into landfill_master 2024-05-13 17:25:28 +02:00
Fabian Neumann
49ca5a4564 add release notes [no ci] 2024-05-13 17:23:15 +02:00
pre-commit-ci[bot]
b529ab1d3c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-13 15:14:35 +00:00
Fabian Neumann
614590b98f Merge branch 'landfill_master' of github.com:PyPSA/pypsa-eur into landfill_master 2024-05-13 17:14:04 +02:00
Fabian Neumann
649e277c7d make waste-to-energy work without regional_oil_demand 2024-05-13 17:13:16 +02:00
pre-commit-ci[bot]
a9d0f295fb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-13 13:41:41 +00:00
Michael Lindner
afa5cc5014 add heating output, correct bus ordering 2024-05-13 15:39:48 +02:00
pre-commit-ci[bot]
1d709913ed [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-13 15:39:37 +02:00
Tom Brown
2055fe68ef add extra bus for HVC, which can either go to air or waste CHP
Here we explicitly add the option to generate energy and/or capture
the CO2 from HVC (i.e. plastics). NB: Since waste CHP is expensive,
it's not built.
2024-05-13 15:39:01 +02:00
pre-commit-ci[bot]
f7dc8a7f22 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-13 15:36:43 +02:00
Tom Brown
ac0d52e1c3 Allow some plastics sequestered in landfill or built environment
I.e. assume some fraction of plastics don't end up being burned or
decaying into air.
2024-05-13 15:36:14 +02:00
Fabian Neumann
27a6f619cd reduce min_part_load_fischer_tropsch to 50% 2024-05-13 15:24:33 +02:00
Fabian Neumann
5b2d4047df Merge branch 'master' of github.com:PyPSA/pypsa-eur 2024-05-13 14:55:07 +02:00
Fabian Neumann
60a2f39bdd Merge branch 'Climact-feature/add-nodal-supply-energy' 2024-05-13 14:54:55 +02:00
Fabian Neumann
e322e21771 Merge branch 'feature/add-nodal-supply-energy' of github.com:Climact/pypsa-eur-climact into Climact-feature/add-nodal-supply-energy 2024-05-13 14:54:49 +02:00
Fabian Neumann
13eda0c69e
Merge pull request #1057 from PyPSA/ppm-0.5.15
bump powerplantmatching to 0.5.15
2024-05-13 14:51:58 +02:00
Fabian Neumann
f7498cdf35
Merge pull request #1058 from PyPSA/abolish-sector-opts-wildcard
stop using `{sector_opts}`  wildcard by default
2024-05-13 14:49:22 +02:00
Fabian Neumann
16b1895011 revert further unintended changes 2024-05-13 14:40:43 +02:00
Fabian Neumann
ed30fa3c94 Merge branch 'abolish-sector-opts-wildcard' of github.com:PyPSA/pypsa-eur into abolish-sector-opts-wildcard 2024-05-13 14:37:49 +02:00
Fabian Neumann
8706f0411e revert use of co2limit_enable for sector-coupled networks 2024-05-13 14:37:07 +02:00
pre-commit-ci[bot]
85a2e97f1e [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-13 08:51:21 +00:00
Fabian Neumann
e023872d44 stop using wildcard by default 2024-05-13 10:50:24 +02:00
Fabian Neumann
4f98a4b32d Merge branch 'Climact-feature/rename-existing-capacities' 2024-05-13 10:09:34 +02:00
Fabian Neumann
22b16d54e9 Merge branch 'feature/rename-existing-capacities' of github.com:Climact/pypsa-eur-climact into Climact-feature/rename-existing-capacities 2024-05-13 10:09:21 +02:00
Fabian Neumann
6afea6ed85
Merge branch 'master' into ppm-0.5.15 2024-05-13 10:05:54 +02:00
Fabian Neumann
430b95dcb3
Merge pull request #773 from p-glaum/implement-floating
Add floating wind technology
2024-05-13 10:04:48 +02:00
Fabian Neumann
84d6634af0
Merge branch 'master' into implement-floating 2024-05-13 10:04:42 +02:00
Fabian Neumann
a16b74f68a
Update config/config.default.yaml 2024-05-13 10:04:05 +02:00
Fabian Neumann
fa7e1d0b92
Merge pull request #1027 from PyPSA/reduced-data-bundle
update and reduce databundle size
2024-05-12 21:27:14 +02:00
Fabian Neumann
2b0303e913 bump powerplantmatching to 0.5.15 2024-05-12 18:06:50 +02:00
Fabian Neumann
a4a5246405 Merge branch 'reduced-data-bundle' of github.com:PyPSA/pypsa-eur into reduced-data-bundle 2024-05-12 16:10:27 +02:00
Fabian Neumann
4dc350cbde use raw not blob github link 2024-05-12 16:10:02 +02:00
pre-commit-ci[bot]
1b1b4528bf [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-12 13:53:38 +00:00
Fabian Neumann
0d9e0f34fd Merge branch 'master' into reduced-data-bundle 2024-05-12 15:53:08 +02:00
Fabian Neumann
45d76e3bff
Merge pull request #1052 from PyPSA/graphics-to-doc-img
move all graphics to doc/img
2024-05-12 15:40:42 +02:00
Fabian Neumann
f21c6f5e9c use master version of workflow graphic 2024-05-12 15:40:20 +02:00
Fabian Neumann
b9a1d79f63 Merge branch 'master' into graphics-to-doc-img 2024-05-12 15:38:41 +02:00
Philipp Glaum
25df71a512 [no ci] add release note 2024-05-10 17:37:42 +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
497797b462
Merge pull request #1054 from joph/fix-hydropower-and-load-bugs
Fix hydropower and load bugs
2024-05-07 10:53:20 +02:00
Fabian Neumann
ff99db5cb5
Update scripts/build_hydro_profile.py 2024-05-07 10:53:07 +02:00
Johannes Schmidt
3b77b4a370
Fix that code works if either ES or PT is present 2024-05-06 18:46:04 +02:00
Johannes Schmidt
a184f159c0
Update release_notes.rst 2024-05-06 13:38:36 +02:00
Johannes Schmidt
9d36d2bc9b
Fix copy_timeslice
copy timeslice would add data although country not present in load
2024-05-06 13:37:32 +02:00
Johannes Schmidt
315f5ef64f
Update release_notes.rst with hydro bugfix 2024-05-06 13:25:13 +02:00
Johannes Schmidt
97035092ac
Fix approximate_missing_eia_stats
Function crasehd when 'ET' or 'PT' not present in list of countries.
2024-05-06 13:20:53 +02:00
Fabian Neumann
c05cfff765
Merge pull request #1045 from Climact/feature/fix-typo
Fix typo
2024-05-06 10:33:19 +02:00
Fabian Neumann
98d54de8e6 simplify image paths 2024-05-06 10:03:46 +02:00
Fabian Neumann
9318dd6b2b Merge remote-tracking branch 'origin/master' into graphics-to-doc-img 2024-05-06 10:03:20 +02:00