Fabian
ae825d82dc
prepare_sector_network: reorder buses for dac components
2024-01-26 12:10:39 +01:00
Fabian Neumann
3f112f0e95
incorporate network plots in rule
2024-01-25 20:37:33 +01:00
Fabian Neumann
ffd4e1f1af
plot_network: split into separate scripts for power, hydrogen, gas
2024-01-25 20:34:59 +01:00
Fabian Neumann
c4b305bfbe
Merge branch 'master' into fneum/ariadne2
2024-01-25 16:52:46 +01:00
Koen van Greevenbroek
03c914bef1
Make projection selection flexible by reading directly from config
2024-01-25 14:34:03 +01:00
Koen van Greevenbroek
9aa154bd04
Add several map projection options
2024-01-25 10:44:24 +01:00
pre-commit-ci[bot]
9843397b5a
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-01-24 10:48:55 +00:00
Koen van Greevenbroek
3e32dbccb5
Add support for the linopy io_api option
2024-01-24 11:23:56 +01:00
Fabian Neumann
7ac2169ea2
Merge branch 'master' into air-hp-rural
2024-01-23 18:42:44 +01:00
Fabian Neumann
2d12f7ddd0
add air-sourced heat pumps to rural areas
2024-01-23 18:41:52 +01:00
Fabian Neumann
eeb3d0789b
correctly read number of solver threads in rule definition
2024-01-23 18:03:14 +01:00
Fabian Neumann
d3cf329456
correctly read number of solver threads in rule definition
2024-01-22 09:28:51 +01:00
Fabian Neumann
2183e742b2
add release notes, minor code improvements
2024-01-22 09:18:26 +01:00
Fabian Neumann
b0e23652cd
Merge branch 'master' into reformulate-co2-constraint
2024-01-18 19:34:27 +01:00
Fabian Neumann
333e99ed3b
add release note
2024-01-18 19:33:57 +01:00
Fabian Neumann
6d2f2ccec7
Merge pull request #878 from Tomkourou/fix-validation-plots
...
🐛 fix key_error in validation plots
2024-01-18 18:26:03 +01:00
Fabian Neumann
511f5f0d8c
Merge branch 'master' into feat/stacktrace-logging
2024-01-18 18:16:19 +01:00
Thomas Kouroughli
4d74be9588
📝 add release notes for PR.
2024-01-18 17:12:39 +00:00
Fabian Neumann
682d3d857b
cluster heat buses by default
2024-01-18 17:25:05 +01:00
euronion
ecb0a1f79f
Log unhandled exceptions stacktraces in log files
2024-01-18 14:12:17 +01:00
Fabian Neumann
59a92f686b
Merge branch 'feature/warning-bev-profile' of github.com:Climact/pypsa-eur-climact into Climact-feature/warning-bev-profile
2024-01-17 10:07:21 +01:00
Fabian Neumann
a74c7b69c8
add release note
2024-01-17 10:02:51 +01:00
pre-commit-ci[bot]
68421e6aab
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-01-15 18:14:34 +00:00
pre-commit-ci[bot]
0bac08934a
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-01-12 20:34:57 +00:00
Thomas Gilon
cd8001116d
Add warning when negative bev availability profile values
2024-01-11 14:11:25 +01:00
Fabian Neumann
a6edce58fb
remove wave energy generator
2024-01-11 09:47:09 +01:00
pre-commit-ci[bot]
33edb0b516
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-01-08 08:40:46 +00:00
euronion
4d1b301f82
Update release_notes.rst
2024-01-08 09:33:01 +01:00
euronion
01f201743d
Implement everywhere_powerplants
2024-01-08 09:30:21 +01:00
Fabian Neumann
b98f1ef9dc
documentation fixes
2024-01-05 17:33:32 +01:00
Fabian Neumann
66c9513fbd
prepare release notes and amend documentation
2024-01-05 17:20:52 +01:00
Fabian Neumann
6dd9d6a9c1
Merge branch 'fneum/services_heat'
2024-01-05 14:39:29 +01:00
Fabian Neumann
de2f9cf46d
add release notes
2024-01-05 14:38:15 +01:00
Fabian Neumann
558763e40c
add release notes
2024-01-05 14:32:37 +01:00
Fabian Neumann
becba42a88
add release notes
2024-01-04 20:15:00 +01:00
Fabian Neumann
a0f43aeeb7
config: increase default solar deployment density to 5.1 MW/km2
2024-01-04 19:22:26 +01:00
Fabian Neumann
a67c5ea3b7
default to full land transport electrification by 2050
2024-01-04 19:03:34 +01:00
Fabian Neumann
29a95dc997
default to approximating transmission losses in HVAC lines
2024-01-04 16:02:02 +01:00
Fabian Neumann
f451e28f58
add release notes and documentation
2024-01-04 11:42:24 +01:00
Fabian Neumann
2096131b03
Merge pull request #842 from PyPSA/luisa-2
...
add option to use LUISA land coverage data
2024-01-04 09:32:55 +01:00
Fabian Neumann
b4fb395158
Merge branch 'master' into custom-extra-functionality
2024-01-04 08:32:29 +01:00
Fabian Neumann
cd3eddcc3a
Merge pull request #739 from PyPSA/complete-losses
...
Lossy bidirectional links
2024-01-03 16:54:02 +01:00
Fabian Neumann
ecd85d23d3
add option to use LUISA land coverage data
2024-01-03 15:01:43 +01:00
Fabian Neumann
2acddb6a7c
add release note
2024-01-03 13:48:34 +01:00
Fabian Neumann
9d939fa635
remove helmeth option
2024-01-03 10:12:43 +01:00
Fabian Neumann
1245c93264
Merge branch 'master' into complete-losses
2024-01-03 09:29:55 +01:00
Fabian Neumann
4db59eddc2
Merge branch 'master' into complete-losses
2024-01-03 09:29:14 +01:00
Fabian Neumann
075ffb5c04
add release notes and documentation
2024-01-03 09:26:08 +01:00
Fabian Neumann
838ee4d913
Merge pull request #835 from PyPSA/gas-storage
...
add locations, capacities and costs of existing gas storage
2024-01-03 09:05:19 +01:00
Fabian Neumann
b5ad0f11ee
Merge pull request #834 from PyPSA/all-waste-heat-min-part-load
...
extended waste heat from PtX, revised minimum part loads
2024-01-03 08:21:57 +01:00
Fabian Neumann
00a8ff5e4a
Merge pull request #833 from PyPSA/biomass-boiler-pelletizing
...
add biomass boiler pelletizing cost
2024-01-03 08:21:11 +01:00
Fabian Neumann
4983a2e021
add release note
2024-01-03 08:19:52 +01:00
Fabian Neumann
872c92d1c0
extended waste heat from PtX, revised minimum part loads
2024-01-02 19:45:02 +01:00
Fabian Neumann
4988e77be5
add release note
2024-01-02 19:33:02 +01:00
Fabian Neumann
ebc25fbf61
add release note
2024-01-02 19:12:41 +01:00
Fabian Neumann
861e7b5fe5
Merge branch 'master' into biogas-upgrade-cc
2024-01-02 18:55:29 +01:00
Fabian Neumann
b0cca00b70
add documentation and release note for biogas upgrading CC
2024-01-02 18:51:03 +01:00
Fabian Neumann
fd81058008
add VOM of PtX processes ( closes #747 )
2024-01-02 18:35:10 +01:00
Fabian Neumann
0720ccb00d
add release note
2024-01-02 18:14:11 +01:00
Fabian Neumann
fac257ca97
Merge pull request #821 from PyPSA/md5-checksums
...
validate checksums for zenodo downloads
2024-01-02 17:23:06 +01:00
Fabian Neumann
8a11bdb4b1
solve_network: option to inject custom extra functionalities from source file
2023-12-29 17:19:19 +01:00
Fabian Neumann
71985d5e3a
validate checksums for zenodo downloads
2023-12-29 12:34:14 +01:00
Fabian Neumann
e097aa48ae
Merge branch 'master' into misc/deprecations
2023-12-29 11:36:19 +01:00
Fabian Neumann
396fdee6f1
Merge pull request #812 from Climact/fix/typo-prepare-sector-network
...
Fix typo in buses definition for oil boilers in add_industry in prepare_sectors_networks
2023-12-29 10:47:41 +01:00
Fabian Hofmann
b5f8e8d206
Merge branch 'master' into fix/retrieve-wdpa
2023-12-21 23:14:56 +01:00
euronion
25c5751565
Check WDPA url also a month forward
2023-12-21 18:39:06 +01:00
euronion
f251e89269
Update release_notes.rst
2023-12-21 17:52:31 +01:00
Fabian Neumann
43674bcee8
Revert "Add option for carbon capture in integrated steelworks"
2023-12-14 16:30:30 +01:00
Fabian Neumann
e0ca38be6e
Merge pull request #719 from PyPSA/blast-furnace-with-cc
...
Add option for carbon capture in integrated steelworks
2023-12-11 20:12:26 +01:00
Fabian Neumann
ea7a66b873
Merge pull request #794 from PyPSA/mv-focus-weights
...
move focus_weights into clustering configuration segment
2023-12-11 20:10:46 +01:00
Fabian Neumann
f200292267
add release note
2023-12-11 20:10:29 +01:00
Fabian Neumann
0f3fb540ef
finalise ukraine_hackathon branch for merge
2023-12-11 18:24:57 +01:00
Thomas Gilon
889a5dd5a2
Fix typo in buses definition for oil boilers in add_industry in prepare_sector_network
2023-12-11 17:18:31 +01:00
Thomas Gilon
1352f6c30e
Fix nodal fraction with distributed generators
2023-12-08 10:32:35 +01:00
Fabian
71f88fd063
update release notes
2023-10-31 12:14:02 +01:00
Fabian Neumann
97a5be1e84
Merge branch 'master' into feature/retrieve-irena
2023-10-11 16:17:15 +02:00
Thomas Gilon
124177b6db
Add option for SMR CC
2023-10-11 14:32:47 +02:00
Thomas Gilon
43e20a26e6
Add rule to update IRENA data for existing infrastructure
2023-10-11 14:26:04 +02:00
Fabian Neumann
8f5a57a278
Merge branch 'master' into blast-furnace-with-cc
2023-10-08 12:01:45 +02:00
lisazeyen
21d1109853
Merge branch 'master' into multi-horizon
2023-09-29 08:40:05 +02:00
Fabian Neumann
4995138656
Merge branch 'master' into biomass-time-varying
2023-09-28 17:32:57 +02:00
Lukas Franken
834f7ea144
Add dialogue to rule purge to prevent accidents ( #745 )
2023-09-28 17:19:13 +02:00
Fabian Neumann
5006bc4877
build_biomass_potentials: link to planning_horizons wildcard, interpolate missing years
2023-09-26 15:12:39 +02:00
euronion
02bffdbd06
Fix bug preventing inclusion of custom_powerplants ( #732 )
2023-09-05 17:21:11 +02:00
lisazeyen
9ec7442c69
merge master
2023-08-30 12:03:49 +02:00
lisazeyen
3247fb59e0
clean up
2023-08-30 11:50:49 +02:00
Fabian Neumann
d0f2d52853
apply protected() to zenodo downloads; only retrieve monthly fuel/CO2 prices when necessary
2023-08-24 11:11:33 +02:00
Fabian Hofmann
3f3f752e8f
Merge branch 'master' into scenario-management
2023-08-24 10:19:14 +02:00
Fabian Neumann
8cdba1c8e4
Merge branch 'master' into blast-furnace-with-cc
2023-08-23 09:37:07 +02:00
martavp
b2e8efea19
add small comment to release note
2023-08-22 08:36:21 +02:00
Fabian Hofmann
72e6c2fd80
Merge branch 'master' into scenario-management
2023-08-15 15:16:05 +02:00
Fabian
6df2742cb9
update release notes
2023-08-15 15:14:55 +02:00
Fabian Neumann
def61ae769
industry distribution: use EPRTR as fallback if ETS missing
2023-08-14 12:39:33 +02:00
Fabian Neumann
91be48e36f
Add option for carbon capture in integrated steelworks.
2023-08-09 10:58:14 +02:00
Fabian Neumann
2c586e76e0
update global energy monitor LNG terminal data
2023-07-31 09:07:10 +02:00
Fabian Neumann
c4fe27fe51
fix typo
2023-07-27 11:39:44 +02:00
pre-commit-ci[bot]
54151d384a
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-07-27 09:38:32 +00:00
Fabian Neumann
8e6a70b468
prepare release 0.8.1
2023-07-27 11:23:02 +02:00
Fabian Hofmann
6a96931833
Merge branch 'master' into misc/deprecations
2023-07-26 15:04:24 +02:00
Fabian Neumann
a0366fb2bc
Merge branch 'master' into multilinks-default
2023-07-18 14:05:57 +02:00
pre-commit-ci[bot]
aa7a2c823a
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-07-14 11:42:08 +00:00
euronion
328e413b12
Update release_notes.rst
2023-07-14 13:41:22 +02:00
Fabian Neumann
b110810669
no more override_component_attrs for multilinks
2023-07-13 22:31:55 +02:00
Fabian Neumann
86708838da
Merge branch 'master' into linemaxext-config
2023-06-30 14:51:29 +02:00
euronion
16dcad0176
Prevent attempt to re-add existing carriers.
2023-06-30 13:25:20 +02:00
Fabian Hofmann
ab0963540f
Merge branch 'master' into complete-carrier-set
2023-06-21 09:53:19 +02:00
Fabian Neumann
86e5f08fbf
Merge branch 'master' into linemaxext-config
2023-06-20 13:33:18 +02:00
virio-andreyana
12b9356245
add info to release_notes
2023-06-14 11:03:07 +02:00
pre-commit-ci[bot]
e431a9675c
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-15 13:02:41 +00:00
Fabian Hofmann
824e6bb18c
Merge branch 'master' into complete-carrier-set
2023-05-15 15:01:57 +02:00
Fabian Neumann
99963edaaf
add option to limit maximum extension per line/link; linemaxext
2023-05-12 09:29:38 +02:00
Fabian Neumann
5be21dfc5a
add option for piecewise linear transmission loss approximation
2023-05-12 09:07:16 +02:00
Fabian Neumann
e29571535b
remove references to memory logfile in *.smk, add release note
2023-05-12 07:11:41 +02:00
Max Parzen
510e544a4f
add release note
2023-05-07 14:19:37 +01:00
pre-commit-ci[bot]
b5f5b35f41
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-05-05 10:16:35 +00:00
virio-andreyana
f6597f43a0
Update release_notes.rst
2023-05-05 12:16:16 +02:00
Fabian Neumann
67303deedd
Merge pull request #647 from PyPSA/hydrogen-turbine
...
add plain hydrogen turbine option for re-electrification
2023-04-30 10:44:30 +02:00
Fabian
9b631189c5
retrieve.smk: rename retrieve_load_data -> retrieve_electricity_demand
2023-04-25 16:37:01 +02:00
Fabian Hofmann
f4ff3dffc2
Update doc/release_notes.rst
2023-04-24 13:09:04 +02:00
euronion
54346b071e
Address pandas deprecation of date_parser for pandas.read_csv
2023-04-22 20:33:38 +02:00
Fabian Neumann
f2e53b59bf
add plain hydrogen turbine option for re-electrification
2023-04-22 09:44:13 +02:00
Fabian
8c19a74fa5
add release notes
...
fix config references in configuration.rst
2023-04-21 11:33:06 +02:00
Fabian
1f6f7a2039
replace config.yaml by config/config.yaml in doc and docstrings
2023-04-21 10:41:44 +02:00
Ahmad
b877b41019
- incorporated the remaining changes
...
- added a released note about the renaming of build_load_data to build_electricity_demand
2023-04-16 02:28:56 +02:00
Adrian Odenweller
a39d611df3
Update release note with CPLEX bugfix
2023-03-25 13:34:45 +01:00
Fabian Neumann
72471e9d99
add release notes for v0.8.0
2023-03-22 10:52:08 +01:00
Fabian Neumann
1716656549
doc: implement review feedback
2023-03-17 12:39:13 +01:00
pre-commit-ci[bot]
c24b119928
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-03-16 10:42:46 +00:00
Fabian Neumann
12d38bd867
docs: add release notes and document new config options
2023-03-16 11:41:50 +01:00
pre-commit-ci[bot]
23c92ca436
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-03-15 16:01:11 +00:00
Fabian Neumann
55395c5465
enhance documentation, with instructions for sector-coupled / electricity-only studies
2023-03-15 17:00:06 +01:00
Fabian
e0f8952218
codespell: fix typo & add word to exception list
2023-03-14 13:05:51 +01:00
Fabian Hofmann
9b7e4d3bee
Merge branch 'master' into merge-pypsa-eur-sec
2023-03-06 16:09:42 +01:00
pre-commit-ci[bot]
8db3780fce
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2023-03-06 14:43:47 +00:00
Fabian Neumann
ca087eb0aa
doc: reorganise pre-merge PyPSA-Eur release notes
2023-03-06 14:30:00 +01:00
Fabian Neumann
0bd8523999
how to handle upcoming releases
2023-03-06 14:27:32 +01:00
Fabian Neumann
4cc1f5cd72
merge docs
2023-03-06 12:44:44 +01:00
Fabian Neumann
97bbafdd70
Merge remote-tracking branch 'pypsa-eur-sec/master' into merge-pypsa-eur-sec
2023-03-06 11:54:08 +01:00
Fabian
0332216891
update release notes
2023-03-06 09:46:18 +01:00
Fabian Neumann
63a5a39b0c
organise release notes
2023-02-16 21:19:25 +01:00
Fabian Neumann
b14d657042
minor fixes and address deprecation warnings
2023-02-16 20:13:26 +01:00
Fabian Neumann
b2ea0576cd
add release note
2023-02-16 17:32:36 +01:00
Fabian Neumann
f7b1dd6882
finalise release notes
2023-02-16 14:56:24 +01:00
Fabian Neumann
b6732bf6c4
documentation updates
2023-02-16 12:37:30 +01:00
Fabian Neumann
9c1182fe96
prepare release 0.7
2023-02-16 11:50:55 +01:00
Fabian Neumann
809b07be86
Merge pull request #303 from PyPSA/electrolysis-wasteheat
...
add option to use electrolysis waste heat in district heating
2023-02-15 19:06:12 +01:00
Fabian Neumann
d2f2af9245
add release note
2023-02-15 19:04:52 +01:00
Fabian Neumann
5d08dfc2ec
add min part load for FT and methanolisation via p_min_pu
2023-02-15 13:47:57 +01:00
Fabian Hofmann
f94be5c2f5
Merge branch 'master' into fix/deprecation-warning-pandas-1.4
2023-02-07 11:00:02 +01:00
Fabian Neumann
27414ac010
new config options for demand in aviation + HVC, control of ICE shares in land transport and agriculture
2022-12-29 11:46:57 +01:00
Fabian Neumann
8edc9042b9
add release note
2022-12-28 15:46:11 +01:00
Fabian Neumann
8bab9300ec
add release note
2022-12-28 13:50:55 +01:00
Max Parzen
545a734b7b
Merge branch 'master' into pz-max-patch-2
2022-12-16 12:20:58 +00:00
Max Parzen
17a8bc3c39
Update release_notes.rst
2022-12-16 11:06:36 +00:00
Max Parzen
3dac13ac3b
Update release_notes.rst
2022-12-16 10:58:24 +00:00
martavp
d5758f2863
Merge branch 'master' into improve-doc
2022-11-27 14:11:51 +01:00
Fabian
df4eb85a19
fix typos
2022-11-18 09:08:07 +01:00
Fabian Neumann
3815d0da61
add release note
2022-11-10 15:31:25 +01:00
Fabian Neumann
1611d63a8a
Merge branch 'master' into nh3
2022-10-01 16:01:39 +02:00
Fabian Hofmann
62ca32b274
Merge branch 'master' into fix/deprecation-warning-pandas-1.4
2022-09-26 12:33:13 +02:00
Fabian Hofmann
9d1a0e2c13
Merge branch 'master' into exclude_carrier_clustering
2022-09-22 12:33:19 +02:00
Fabian Neumann
fcb80190c4
bump version to 0.6.1
2022-09-20 18:33:21 +02:00
Philipp Glaum
d532424e5d
update release_notes
2022-09-20 08:42:45 +02:00
Fabian Hofmann
9d46cf7659
Merge branch 'master' into default-res-installations
2022-09-19 13:50:34 +02:00
Fabian
e2a4140663
add_electricity: calculate marginal costs from plant efficiency
2022-09-19 13:08:03 +02:00
Fabian
54f602ed94
config: enable res installations per default
2022-09-19 13:00:12 +02:00
pre-commit-ci[bot]
5d1ef8a640
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2022-09-16 13:04:06 +00:00
Fabian
e9ea4c5e53
update release notes
2022-09-16 15:03:22 +02:00
Fabian Hofmann
affa1c2b88
Merge branch 'master' into misc/precommit-ci-2
2022-09-16 14:38:49 +02:00
Fabian
1536cc2787
codespell: fix typos
...
Snakefile: fix unformattable parst
pre-commit: fix codespell ignore
2022-09-16 14:36:43 +02:00
Fabian
b694337541
scenario management: use "shared_cutouts" instead of "dedicated_cutouts"
2022-09-13 14:54:58 +02:00
Fabian Hofmann
863dbf0417
Merge branch 'master' into scenario-management
2022-09-12 15:45:51 +02:00
Fabian Neumann
5f08dca2fd
prepare release 0.6.0
2022-09-10 15:31:43 +02:00
Fabian
71ba743e46
enable scneario management for different configs
2022-09-08 10:28:07 +02:00
Fabian
2eb26f7334
address #314
2022-09-05 12:55:46 +02:00
martavp
b3b40f75ab
Update release_notes.rst
2022-09-02 14:28:31 +02:00
lisazeyen
4accfff1bb
update release notes
2022-08-08 08:53:16 +02:00
lisazeyen
9752b4b4e6
Merge branch 'master' into pellet-boiler
2022-08-05 12:25:01 +02:00
lisazeyen
8f92f08579
update relase notes
2022-08-05 12:21:32 +02:00
lisazeyen
274e7df5af
update release notes
2022-08-04 16:03:32 +02:00
Philipp Glaum
16ab4703da
add release note
2022-07-29 15:12:19 +02:00
Fabian Neumann
df6d74a087
add release docs where to change versions
2022-07-27 13:12:52 +02:00
Fabian Neumann
885316002c
release_notes: markdown to rst syntax
2022-07-27 11:58:23 +02:00
Fabian Neumann
4dcb47f74b
release notes: update date
2022-07-27 11:49:30 +02:00
Fabian Neumann
8d132464bd
Merge branch 'release-v0.5' into introduce_modularity_clustering
2022-07-27 09:04:39 +02:00
Fabian Neumann
6027ade0ed
prepare release notes
2022-07-26 15:30:07 +02:00
Fabian Neumann
8fc0c57ed6
update copyright years
2022-07-26 15:05:59 +02:00
Fabian Neumann
239dcfdd1e
Merge branch 'master' into introduce_modularity_clustering
2022-07-26 14:04:56 +02:00
Fabian Hofmann
3ba7e2ab90
Merge branch 'master' into technology-data
2022-07-21 15:36:12 +02:00
martacki
90ffc35f05
documentation
2022-07-13 15:39:46 +02:00
lisazeyen
187c9cbaa3
add release notes
2022-06-29 08:49:29 +02:00
Fabian Neumann
74f8ca1c7f
Merge branch 'master' into eu-energy-security
2022-06-28 08:09:39 +02:00
Fabian Neumann
971e970250
Merge branch 'master' into landlock-fix-alterative
2022-06-28 07:47:13 +02:00
martacki
f1dedd9429
hierarchical clustering: release notes & revert to old default clustering algorithm (kmeans)
2022-06-27 21:11:49 +02:00
Fabian Neumann
51de606aab
Revert "remove build/retrieve natura raster, directly use shapefile"
2022-06-27 19:00:41 +02:00
Fabian
b56d1f6f4d
conventional config section: update to more general attribute assignment scheme
2022-06-27 17:35:19 +02:00
Martha Frysztacki
5587327be3
Merge branch 'master' into harmonize_clustering_strategies
2022-06-27 14:02:45 +02:00
Fabian Hofmann
8349e85252
Apply suggestions from code review
...
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2022-06-27 11:48:45 +02:00
Fabian Neumann
8e57d68b73
Merge branch 'master' into landlock-fix-alterative
2022-06-27 09:44:42 +02:00
Fabian Neumann
5ca231824e
Merge branch 'master' into eu-energy-security
2022-06-27 08:58:37 +02:00
Fabian Neumann
520f7e440e
Merge branch 'master' into technology-data
2022-06-25 11:05:41 +02:00
Fabian Neumann
d321b2b762
resolve merge conflicts
2022-06-24 20:15:32 +02:00
Fabian
b37c1d98d3
update release notes
2022-06-24 18:44:03 +02:00
Fabian
c42d2bd97d
refactor save to geojson file functionality to allow import/export of empty geodfs
2022-06-24 15:11:21 +02:00
Fabian Neumann
e1a6e13f75
add release note [no ci]
2022-06-23 15:28:00 +02:00
martacki
8dba48c412
clustering strats to configurables: documentation and testing
2022-06-21 19:08:22 +02:00
Fabian
8cbe4e4f9d
update release notes and doc
2022-06-10 00:33:09 +02:00
Fabian
76cd0751b4
Merge branch 'eu-energy-security' of github.com:PyPSA/pypsa-eur into eu-energy-security
2022-06-09 20:36:35 +02:00
Fabian
26a56d1836
update release notes
2022-06-09 20:33:13 +02:00
Fabian Hofmann
619b471f72
Merge branch 'master' into eu-energy-security
2022-06-07 10:05:11 +02:00
Max Parzen
e974a30fd3
add release note
2022-06-03 17:14:30 +01:00
Max Parzen
edb81a9e6a
add release note
2022-05-28 14:50:44 +01:00
euronion
c412a61013
Add country-specific EAF restriction for NPPs. ( #361 )
...
* Add country-specific EAF restriction for NPPs.
Based on historic figures from IAEA.
* Update release_notes.rst
2022-04-08 15:41:23 +02:00
Fabian Neumann
3678e5c523
Add operational reserve margin constraint analogous to GenX
...
Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>
2022-04-07 14:39:34 +02:00
Fabian Neumann
c4bb470b93
add release note and instructions on global gas limit
2022-04-05 17:05:50 +02:00
Fabian
1fd6a685ab
powerplants: filter out powerplants with shut down date < 2021
2022-04-05 15:12:01 +02:00
Fabian Neumann
ade22bf4f0
add existing wind and solar capacities based on IRENASTATS
2022-04-04 19:03:09 +02:00
Fabian Neumann
7fee2944d8
Merge branch 'master' into rm-raster-natura
2022-03-28 12:07:33 +02:00
Fabian Neumann
03e6764a9d
Merge branch 'master' into issue-301
2022-03-25 13:46:46 +01:00
Fabian Neumann
85387bded2
Merge branch 'master' into skip-if-no-lv
2022-03-25 13:46:04 +01:00
Fabian Neumann
d94719a33d
fix tutorial and add release notes
2022-03-24 15:53:02 +01:00
Fabian Neumann
c54ddab4a3
remove unused simple_hvdc_costs
2022-03-24 14:47:00 +01:00
Fabian Neumann
62e7653d7e
add release notes
2022-03-24 14:37:18 +01:00
Fabian Neumann
12a5a5f86a
add release notes
2022-03-24 14:34:08 +01:00
Fabian Neumann
5a7c0d7967
remove build/retrieve natura raster, directly use shapefile
2022-03-20 10:03:17 +01:00
Fabian Neumann
c4423d43a8
add synchronisation release, release notes
2022-03-17 18:19:06 +01:00
euronion
c729d0dd74
Update release_notes.rst
2022-03-04 21:21:49 +01:00
euronion
76ee8c617a
Update release_notes.rst
2022-03-04 21:15:35 +01:00
martacki
b63271f12f
release_notes, old format of base_network with updated docstrings
2022-03-03 17:16:23 +01:00
Koen van Greevenbroek
a2d3edd82b
Document the k-means random state fix
2022-02-10 16:07:31 +01:00
Fabian Neumann
090b4908a4
Snakefile: use standard resource mem_mb rather than mem
2022-01-27 21:04:50 +01:00
Fabian Neumann
a747c88d08
disable solar PV CF correction factor for default satellite data ( closes #285 )
2022-01-13 15:42:48 +01:00
Fabian Neumann
7535a0d385
update data bundle ( #216 )
2022-01-06 10:29:59 +01:00
Fabian Neumann
d1762919c5
add option 'seqXXX' to sweep global co2 sequestration potentials ( #208 )
...
* add option 'seqXXX' to sweep global co2 sequestration potentials
* add release notes
2021-12-10 12:05:38 +01:00
Fabian Neumann
82096f92e8
fix for GlobalConstraints mu with "co2_sequestration_limit" ( #211 )
...
* fix for GlobalConstraints mu with co2_sequestration_limit
* add release notes
2021-12-06 11:31:48 +01:00
Fabian Neumann
a2459881ef
allow H2 retrofitting from CH4 pipelines without endogenous CH4 grid ( #204 )
...
* allow H2 retrofitting from CH4 pipelines without endogenous CH4 grid
* add small capital cost to gas pipelines to incentivise decommissioning
* add release notes
2021-11-29 12:42:10 +01:00
Fabian Neumann
d04f6c02a7
Merge branch 'master' into retrofit-gas-pipelines
2021-11-29 09:13:51 +01:00
Fabian Neumann
263628fa22
add option to automatically download and extract sector databundle ( #198 )
2021-11-29 09:12:55 +01:00
Fabian Neumann
3ecb761b57
add regionalised hydrogen salt cavern storage potentials ( #191 )
...
* add regionalised hydrogen salt cavern storage potentials
* fix reading in salt-cavern potentials and typo in imports
* by default disable nearshore and offshore salt cavern potentials
Co-authored-by: lisazeyen <lisa.zeyen@web.de>
2021-11-29 09:12:07 +01:00
Fabian Neumann
1ff5d76a0c
gas_network: add release notes
2021-11-13 18:16:10 +01:00
Fabian Neumann
1b2c6e17c5
add release note for offshore density reduction
2021-10-05 12:21:45 +02:00
Fabian Neumann
e872595c79
release_notes: correct version
2021-10-04 18:02:05 +02:00
Fabian Neumann
c5452d9882
release_notes: opener
2021-10-04 17:45:54 +02:00
Fabian Neumann
692f4705c4
merge master
2021-10-04 13:21:33 +02:00
Fabian Neumann
c168fd60d3
add release note for agriculture, forestry and fishing
2021-10-04 11:19:15 +02:00
Fabian Neumann
7f0ed1372c
organise release notes
2021-10-04 10:02:47 +02:00
Fabian Neumann
aca1023c3d
bump version to 0.6.0
2021-10-02 11:17:29 +02:00
Fabian Neumann
2bfc091f8b
update data bundle
2021-10-02 11:12:45 +02:00
Fabian Neumann
2e6e9c6802
Merge branch 'master' into agriculture-energy-co2
2021-10-02 10:51:28 +02:00
Fabian Neumann
b560d95b6a
merge master
2021-10-02 10:41:56 +02:00
Fabian Neumann
4400658099
edit release note
2021-10-02 10:40:01 +02:00
Fabian Neumann
7987fd23cf
add release note
2021-10-02 10:33:56 +02:00
Fabian Neumann
ff6d736a89
Merge branch 'master' into myopic-low-clustering-gens
2021-09-30 14:51:45 +02:00
Fabian Neumann
5fb169c31f
Merge branch 'master' into enspreso-biomass
2021-09-29 15:46:11 +02:00
Fabian Neumann
8cf8a49b48
Merge branch 'master' of github.com:nworbmot/PyPSA-Eur-Sec
2021-09-28 17:24:09 +02:00
Fabian Neumann
488b93a079
extend release notes on plastics recycling
2021-09-28 17:24:00 +02:00
Fabian Neumann
fcc10aa950
Merge branch 'master' into master
2021-09-28 17:15:26 +02:00
Fabian Neumann
9f4e1f2176
make HVC recycling ready for pathway, minor edits
2021-09-28 17:08:03 +02:00
lisazeyen
dadfa8691b
update mocksnakemake for testing
2021-09-28 16:36:40 +02:00
Fabian Neumann
385779fbbf
Merge branch 'master' into biomass-transport
2021-09-28 11:33:21 +02:00
Fabian Neumann
ec04d7909a
Merge pull request #148 from PyPSA/co2-network
...
Add CO2 network
2021-09-28 11:29:20 +02:00
Fabian Neumann
04c8d1fd02
add correction factor to offshore wind for wake losses
2021-09-23 08:57:18 +02:00
Fabian Neumann
b4af3f3fa3
change license
2021-09-22 18:03:25 +02:00
Fabian Neumann
089fc5b747
final tweaks of release notes
2021-09-22 16:46:23 +02:00
Fabian Neumann
780b60cc46
add release note
2021-09-14 16:38:48 +02:00
Fabian Neumann
2e02af8b4b
change license
2021-09-14 16:37:41 +02:00
Fabian Neumann
b88322587f
Release 0.4 ( #274 )
...
* update release notes [skip ci]
* update fixed versions environment.yaml
* format release notes
2021-09-14 16:15:25 +02:00
Fabian
ea50abab6d
doc: fix build warnings
2021-08-27 12:30:29 +02:00
Martha Frysztacki
f30ca8a18a
Merge branch 'master' into simplify_to_substations
2021-08-26 15:22:02 +02:00
Fabian Neumann
148450e496
adjust documentation and add release notes
2021-08-18 16:38:34 +02:00
Fabian Neumann
5b9f64354f
xarray 0.19 compatibility ( #158 )
2021-08-18 12:17:31 +02:00
Martha Frysztacki
1c173567b5
solve_operations_network: include optimized stores to operation ( #269 )
...
* remove stores-buses from load generators
* include optimized stores to operation network
* add release notes
* Update doc/release_notes.rst
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
* Update doc/release_notes.rst
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
* Update release_notes.rst
* Update scripts/solve_network.py
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2021-08-18 10:38:51 +02:00
Fabian Neumann
99e602f7b2
add ENSPRESO release notes and doc
2021-08-16 14:00:30 +02:00
Fabian Neumann
2e2a66ef3c
biomass_transport: add release notes and documentation
2021-08-09 18:20:07 +02:00
Fabian Neumann
54a509f3dd
Merge branch 'master' into co2-network
2021-08-06 15:51:40 +02:00
Fabian Neumann
d7a290df31
add release note
2021-08-06 15:51:07 +02:00
Fabian Neumann
4cc5e49ca8
Adapt to new snapshot weightings ( #259 )
...
* for now use n.snapshot_weightings.generators
* require pypsa master; use .objective for Nyears
* implement suggestions from code review
* add release note
2021-08-06 13:43:12 +00:00
Fabian Neumann
87596dd015
add H2 liquefaction cost to H2 shipping demand ( #145 )
...
* add H2 liquefaction cost to H2 shipping demand
* rename bus to 'H2 liquid'
* add release note
* make consideration of liquefaction costs for shipping optional
* update release notes
2021-08-04 18:28:18 +02:00
martavp
fab31e6524
Exogenous transition path for shipping, Steel, and Aluminum production ( #136 )
...
* Update .gitignore
* Add fictitious load to account for non-transformed shipping emissions
The share of shipping demand that is transformed is defined now for different years to be used with the myopic code.
The carbon emission from the remaining share is treated as a negative load on the atmospheric carbon dioxide bus, just like aviation and land transport emissions.
* Split colours for H2 in Industry and H2 in shipping when plotting balances.
When plotting the balance for H2, the rename dictionary merges all the demands containing H2.
This commit disables such merging and keeps different colours for H2 in shipping and H2 in industry. This is useful when one wants to look at the H2 balance and have an overview of where the H2 is consumed in the model.
* Make transformation of Steel and Aluminum production depends on year
Previously, the transformation of the Steel and Aluminum production was assumed to occur overnight.
This commit enables the definition of a transformation path via the config.yaml file.
This requires adding the {planning_horizon} to the input and output file name of the following rules:
build_industrial_production_per_country_tomorrow
build_industrial_production_per_node
build_industry_energy_demand_per_node
prepare_sector_network
* small follow-up to merge
* Add oil consumed in shipping as a load to EU oil bus
* Update scripts/prepare_sector_network.py
* add planning_horizons wildcard to benchmark paths
* fixup: double fraction_primary for steel
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2021-08-04 18:19:02 +02:00
Fabian Neumann
ac3ce07d67
Merge branch 'master' into simplify_to_substations
2021-08-03 15:53:49 +02:00
martavp
3a6a1f90ab
Sensitivity e nom max ( #143 )
...
* Update .gitignore
* include e_nom_max sensitivity
* remove change in gitignore
* Update doc/release_notes.rst
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2021-07-06 17:12:39 +02:00
martavp
cc24859d78
Update release_notes.rst
2021-07-05 12:26:11 +02:00
martacki
15ebe63b38
release_notes: style
2021-07-02 10:43:32 +02:00
martacki
6983be337a
release_notes: add PR reference
2021-07-02 10:26:46 +02:00
martacki
34578bf16b
update release_notes
2021-07-02 10:24:30 +02:00
Fabian Neumann
de46177e1a
Merge branch 'master' of github.com:PyPSA/pypsa-eur-sec
2021-07-01 20:22:20 +02:00
Fabian Neumann
a967faf0f9
doc: release notes format
2021-07-01 20:22:08 +02:00
lisazeyen
ca685a10af
add home battery storage and inverter costs ( #99 )
...
* add home battery storage and inverter costs
* Update prepare_sector_network.py
* add release note
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2021-07-01 20:16:12 +02:00
Fabian Neumann
1fc1d2a17d
Revision complete ( #139 )
...
* ammonia_production: minor cleaning and move into __main__ (#106 )
* biomass_potentials: code cleaning and automatic country index inferral (#107 )
* Revision: build energy totals (#111 )
* blacken
* energy_totals: preliminaries
* energy_totals: update build_swiss
* energy_totals: update build_eurostat
* energy_totals: update build_idees
* energy_totals: update build_energy_totals
* energy_totals: update build_eea_co2
* energy_totals: update build_eurostat_co2
* energy_totals: update build_co2_totals
* energy_totals: update build_transport_data
* energy_totals: add tqdm progressbar to idees
* energy_totals: adjust __main__ section
* energy_totals: handle inputs via Snakefile and config
* energy_totals: handle data and emissions year via config
* energy_totals: fix reading in eurostat for different years
* energy_totals: fix erroneous drop duplicates
This caused problems for waste management in HU and SI
* energy_totals: make scope selection of CO2 or GHG a config option
* Revision: build industrial production per country (#114 )
* industry-ppc: format
* industry-ppc: rewrite for performance
* industry-ppc: move reference year to config
* industry-ppct: tidy up and format (#115 )
* remove stale industry demand rules (#116 )
* industry-epc: rewrite for performance (#117 )
* Revision: industrial distribution key (#118 )
* industry-distribution: first tidying
* industry-distribution: first tidying
* industry-distribution: fix syntax
* Revision: industrial energy demand per node today (#119 )
* industry-epn: minor code cleaning
* industry-epn: remove accidental artifact
* industry-epn: remove accidental artifact II
* industry-ppn: code cleaning (#120 )
* minor code cleaning (#121 )
* Revision: industry sector ratios (#122 )
* sector-ratios: basic reformatting
* sector-ratios: add new read_excel function that filters year already
* sector-ratios: rename jrc to idees
* sector-ratios: rename conv_factor to toe_to_MWh
* sector-ratios: modularise into functions
* Move overriding of component attributes to function and into data (#123 )
* move overriding of component attributes to central function and store in separate folder
* fix return of helper.override_component_attrs
* prepare: fix accidental syntax error
* override_component_attrs: bugfix that aligns with pypsa components
* Revision: build population layout (#108 )
* population_layouts: move inside __main__ and blacken
* population_layouts: misc code cleaning and multiprocessing
* population_layouts: fix fill_values assignment of urban fractions
* population_layouts: bugfig for UK-GB naming ambiguity
* population_layouts: sort countries alphabetically for better overview
* config: change path to atlite cutout
* Revision: build clustered population layouts (#112 )
* population_layouts: move inside __main__ and blacken
* population_layouts: misc code cleaning and multiprocessing
* population_layouts: fix fill_values assignment of urban fractions
* population_layouts: bugfig for UK-GB naming ambiguity
* population_layouts: sort countries alphabetically for better overview
* cl_pop_layout: blacken
* cl_pop_layout: turn GeoDataFrame into GeoSeries + code cleaning
* cl_pop_layout: add fraction column which is repeatedly calculated downstream
* Revision: build various heating-related time series (#113 )
* population_layouts: move inside __main__ and blacken
* population_layouts: misc code cleaning and multiprocessing
* population_layouts: fix fill_values assignment of urban fractions
* population_layouts: bugfig for UK-GB naming ambiguity
* population_layouts: sort countries alphabetically for better overview
* cl_pop_layout: blacken
* cl_pop_layout: turn GeoDataFrame into GeoSeries + code cleaning
* gitignore: add .vscode
* heating_profiles: update to new atlite and move into __main__
* heating_profiles: remove extra cutout
* heating_profiles: load regions with .buffer(0) and remove clean_invalid_geometries
* heating_profiles: load regions with .buffer(0) before squeeze()
* heating_profiles: account for transpose of dataarray
* heating_profiles: account for transpose of dataarray in add_exiting_baseyear
* Reduce verbosity of Snakefile (2) (#128 )
* tidy Snakefile light
* Snakefile: fix indents
* Snakefile: add missing RDIR
* tidy config by removing quotes and expanding lists (#109 )
* bugfix: reorder squeeze() and buffer()
* plot/summary: cosmetic changes including: (#131 )
- matplotlibrc for default style and backend
- remove unused config options
- option to configure geomap colors
- option to configure geomap bounds
* solve: align with pypsa-eur using ilopf (#129 )
* tidy myopic code scripts (#132 )
* use mock_snakemake from pypsa-eur (#133 )
* Snakefile: add benchmark files to each rule
* Snakefile: only run build_retro_cost if endogenously optimised
* Snakefile: remove old {network} wildcard constraints
* WIP: Revision: prepare_sector_network (#124 )
* population_layouts: move inside __main__ and blacken
* population_layouts: misc code cleaning and multiprocessing
* population_layouts: fix fill_values assignment of urban fractions
* population_layouts: bugfig for UK-GB naming ambiguity
* population_layouts: sort countries alphabetically for better overview
* cl_pop_layout: blacken
* cl_pop_layout: turn GeoDataFrame into GeoSeries + code cleaning
* move overriding of component attributes to central function and store in separate folder
* prepare: sort imports and remove six dependency
* prepare: remove add_emission_prices
* prepare: remove unused set_line_s_max_pu
This is a function from prepare_network
* prepare: remove unused set_line_volume_limit
This is a PyPSA-Eur function from prepare_network
* prepare: tidy add_co2limit
* remove six dependency
* prepare: tidy code first batch
* prepare: extend override_component_attrs to avoid hacky madd
* prepare: remove hacky madd() for individual components
* prepare: tidy shift function
* prepare: nodes and countries from n.buses not pop_layout
* prepare: tidy loading of pop_layout
* prepare: fix prepare_costs function
* prepare: optimise loading of traffic data
* prepare: move localizer into generate_periodic profiles
* prepare: some formatting of transport data
* prepare: eliminate some code duplication
* prepare: fix remove_h2_network
- only try to remove EU H2 store if it exists
- remove readding nodal Stores because they are never removed
* prepare: move cost adjustment to own function
* prepare: fix a syntax error
* prepare: add investment_year to get() assuming global variable
* prepare: move co2_totals out of prepare_data()
* Snakefile: remove unused prepare_sector_network inputs
* prepare: move limit p/s_nom of lines/links into function
* prepare: tidy add_co2limit file handling
* Snakefile: fix tabs
* override_component_attrs: add n/a defaults
* README: Add network picture to make scope clear
* README: Fix date of preprint (was too optimistic...)
* prepare: move some more config options to config.yaml
* prepare: runtime bugfixes
* fix benchmark path
* adjust plot ylims
* add unit attribute to bus, correct cement capture efficiency
* bugfix: land usage constrained missed inplace operation
Co-authored-by: Tom Brown <tom@nworbmot.org>
* add release notes
* remove old fix_branches() function
* deps: make geopy optional, remove unused imports
* increase default BarConvTol
* get ready for upcoming PyPSA release
* re-remove ** bug
* amend release notes
Co-authored-by: Tom Brown <tom@nworbmot.org>
2021-07-01 20:09:04 +02:00
Fabian Neumann
c5e59dab2f
Merge branch 'master' into simplify_to_substations
2021-06-30 10:34:44 +02:00
euronion
8654077519
Fix creation of renewable profiles for offshore wind. ( #255 )
...
* Update build_renewable_profiles.py
* Update release_notes.rst
* Update release_notes.rst
* Update release_notes.rst
* Update scripts/build_renewable_profiles.py
Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>
* Adjust doc string
Co-authored-by: FabianHofmann <hofmann@fias.uni-frankfurt.de>
Co-authored-by: Fabian <fab.hof@gmx.de>
2021-06-28 16:20:29 +02:00
Tom Brown
96711aab39
doc: Create 0.0.x versions for old PyPSA-Eur-Sec-30(-Path)
...
This is for easier identification of models in the IPCC AR6 model
registration.
2021-06-27 14:42:44 +02:00
Fabian Neumann
7b68e8be0c
GitHub actions CI ( #252 )
...
* add github action ci
* only one environment update call
* line break in echo did not work
* fix syntax
* fix version syntax
* switch to glpk
* reduce time from month to week
* list environment
* use new ipopt version
https://github.com/conda-forge/ipopt-feedstock/issues/55
* remove accidental additions
* request ipopt lower than 3.13.3
https://github.com/conda-forge/ipopt-feedstock/issues/64
* add badges and release notes
* add badge to readme and make ci.yaml cc-0
2021-06-22 11:01:33 +02:00
martacki
0f5934f534
release notes
2021-06-01 12:06:56 +02:00
Fabian Neumann
bfeb429c27
base: add escape if all TYNDP links already in network ( #246 )
2021-05-25 15:55:39 +02:00
Martha Frysztacki [frɨʂtat͡skʲ]
f5a0d566d9
solve_operations_network: integrate all extendable links, not only DC ( #244 )
...
* add_electricity.py Resolve FutureWarning 771 Index.__or__ operating as set operation is deprecated
* solve_operations_network: bug fix
* release notes
* Update doc/release_notes.rst
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2021-05-21 15:31:50 +02:00
Chiara Anselmetti
11c29ac6cc
Adding focus_weights to pre-clustering ( #241 )
...
* Add focus_weights to pre-clustering
Hey guys,
another quick fix since I noticed it wasn't implemented yet: When pre-clustering the network, the focus_weights have not yet been considered. This may distort clustering results when pre-clustering to a low resolution.
* Update release_notes.rst
2021-05-21 15:27:34 +02:00
Tom Brown
1ede513990
doc: Fix badge link for doc and clarifications in release notes
2021-05-21 13:40:22 +02:00
Tom Brown
e4848d603d
PyPSA-Eur-Sec Version 0.5.0
...
See the release notes:
https://pypsa-eur-sec.readthedocs.io/en/latest/release_notes.html#pypsa-eur-sec-0-5-0-21st-may-2021
2021-05-21 12:37:02 +02:00
lisazeyen
42a78262d8
Merge branch 'master' into technology-data
2021-05-10 16:05:48 +02:00
