Commit Graph

2592 Commits

Author SHA1 Message Date
Fabian Neumann
cac724fee0 merge master 2022-12-28 13:55:36 +01:00
Fabian Neumann
642b3fa47a
Merge pull request #278 from PyPSA/methanol
methanol in shipping
2022-12-28 13:51:16 +01:00
Fabian Neumann
8bab9300ec add release note 2022-12-28 13:50:55 +01:00
Fabian Neumann
b9c1fdb65e include methanolisation in PtL 2022-12-28 13:46:31 +01:00
Fabian Neumann
c471785448 add colors for methanolisation 2022-12-28 13:45:57 +01:00
Fabian Neumann
292ec9d5a1 fix computation of shipping demands 2022-12-28 13:45:42 +01:00
Fabian Neumann
f645d13743 Merge branch 'master' into methanol 2022-12-28 12:51:59 +01:00
Fabian Neumann
138d151c8b only compute solar thermal profiles if technology is included 2022-12-28 12:48:51 +01:00
Fabian Neumann
38fd51fca9 Merge branch 'master' into methanol 2022-12-28 12:22:01 +01:00
Fabian Neumann
d37ffddd4f build_solar_thermal_profiles: parallelize 2022-12-28 12:21:46 +01:00
Fabian Neumann
494d3010eb build_heat_demand: parallelize 2022-12-28 12:21:00 +01:00
Fabian Neumann
097d054f06 build_temperatur_profiles: parallelize 2022-12-28 12:20:34 +01:00
Fabian Neumann
3999afdb5a fixes to methanol implementation 2022-12-28 12:19:20 +01:00
Fabian Neumann
c17ae85f9b HVDC links Sweden Germany parameter correction 2022-12-28 12:15:17 +01:00
Fabian Neumann
8b363fe108 env: remove pygeos dependency 2022-12-28 11:21:52 +01:00
Fabian Neumann
67b3c964d4 env: add pygeos dependency >= 0.11 2022-12-28 11:11:13 +01:00
Fabian Neumann
9e1eec9c9d env: add pygeos dependency 2022-12-28 11:10:19 +01:00
Fabian Neumann
5360eb0a2e Merge branch 'master' of https://github.com/pypsa/pypsa-eur 2022-12-28 09:35:15 +01:00
Fabian Neumann
a08c20d7c8 build_shapes: cleanup shape union of RS and KV 2022-12-28 09:35:11 +01:00
Fabian Neumann
bb5c5bd143 simplify_networks: add control for removing stubs II 2022-12-28 09:34:28 +01:00
Fabian Neumann
780834ad87 tyndp: add greenlink and celtic interconnector 2022-12-28 09:33:36 +01:00
Fabian Neumann
e9f3d20432 simplify_networks: add control for removing stubs 2022-12-28 09:33:08 +01:00
Fabian Neumann
27d4af8e65 entsoegridkit: additional parameter corrections 2022-12-28 09:31:48 +01:00
Fabian Neumann
bb1b37e8ef address pandas iteritems deprecation 2022-12-27 13:16:05 +01:00
Fabian Neumann
2aa67bdf9f add atlite control for progressbar to configs 2022-12-27 13:03:12 +01:00
Fabian Neumann
69a33e3698 increase resource requirements of some rules 2022-12-27 12:16:02 +01:00
Fabian Neumann
c025e87b6d
Merge pull request #457 from PyPSA/update-env
update pypsa 0.21.3, vresutils master, lift fiona version restriction
2022-12-27 11:51:24 +01:00
Fabian Neumann
70cea4aea3 revert to shapely<2.0 2022-12-27 11:51:01 +01:00
Fabian Neumann
e14382239e try shapely 2.0 2022-12-27 11:43:02 +01:00
Fabian Neumann
70d07d561f address pandas deprecations 2022-12-27 11:42:32 +01:00
Fabian Neumann
8bd840c252 limit numpy < 1.24 2022-12-27 11:30:33 +01:00
Fabian Neumann
3d7c354d2b merge master 2022-12-27 11:16:39 +01:00
Fabian Neumann
99343b1221
Merge pull request #277 from PyPSA/int-ports
distribute international shipping by port trade volumes
2022-12-27 10:57:01 +01:00
Fabian Neumann
bab7c3128d
Merge branch 'master' into update-env 2022-12-27 10:51:49 +01:00
Fabian Neumann
06bee06d56 update pypsa, vresutils master, lift fione restriction 2022-12-27 10:51:02 +01:00
Fabian Neumann
63de3e5f88
Merge pull request #456 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-12-27 07:48:45 +01:00
pre-commit-ci[bot]
09d89130b5
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/PyCQA/isort: v5.11.3 → 5.11.4](https://github.com/PyCQA/isort/compare/v5.11.3...5.11.4)
- [github.com/snakemake/snakefmt: v0.7.0 → v0.8.0](https://github.com/snakemake/snakefmt/compare/v0.7.0...v0.8.0)
2022-12-26 21:14:52 +00:00
Fabian Hofmann
bff0ae2f0f
Merge pull request #453 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-12-20 09:49:27 +01:00
pre-commit-ci[bot]
d36a44f23c
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/PyCQA/isort: 5.11.0 → v5.11.3](https://github.com/PyCQA/isort/compare/5.11.0...v5.11.3)
- [github.com/PyCQA/docformatter: v1.5.0 → v1.5.1](https://github.com/PyCQA/docformatter/compare/v1.5.0...v1.5.1)
2022-12-19 20:31:18 +00:00
Max Parzen
545a734b7b
Merge branch 'master' into pz-max-patch-2 2022-12-16 12:20:58 +00:00
Fabian Neumann
a22dc9238d
Merge pull request #451 from PyPSA/pz-max-patch-1
Fix load variable in reserve constraint
2022-12-16 13:18:57 +01:00
Max Parzen
17a8bc3c39
Update release_notes.rst 2022-12-16 11:06:36 +00:00
Max Parzen
9e61e30ff4
Fix EQ constraint in case no hydro exist 2022-12-16 11:00:39 +00:00
Max Parzen
3dac13ac3b
Update release_notes.rst 2022-12-16 10:58:24 +00:00
Max Parzen
b7899787cf
Fix load variable in reserve constraint 2022-12-16 10:50:20 +00:00
virio-andreyana
1a7dd850f2 remove excel file Europe-Gas-Tracker-August-2022 2022-12-15 12:34:11 +01:00
virio-andreyana
e1776518c0 Merge remote-tracking branch 'origin/update-lng-ports' into update-lng-ports 2022-12-15 12:20:05 +01:00
virio-andreyana
55ff725e3b Final edit to update LNG ports. Remove unused files 2022-12-15 11:42:21 +01:00
Fabian Neumann
bc8ac24c33
Merge pull request #449 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
2022-12-15 10:52:10 +01:00
virio-andreyana
d37cd49f7d add script for retrieving lng terminals 2022-12-14 12:26:16 +01:00