Commit Graph

438 Commits

Author SHA1 Message Date
Fabian Neumann
a1e42db58b change in zenodo urls from record to records 2024-04-15 15:14:02 +02:00
Fabian Neumann
fe1199e981 update shipdensity_global.zip link [no ci] 2024-04-15 15:03:23 +02:00
Fabian Neumann
991eef6d97 update and reduce databundle size 2024-04-15 14:48:34 +02:00
yerbol-akhmetov
d2584d37b1 update energy totals from Eurostat residential data 2024-04-14 16:28:50 +05:00
yerbol-akhmetov
8b28f34f14 retrieve eurostat disagregated energy balances for household 2024-04-14 13:19:42 +05:00
toniseibold
3b31b99dd2 removing the output file eia_hydro_stats.csv 2024-04-12 10:01:09 +02:00
Koen van Greevenbroek
859212b21f Use powerplantmatching IRENASTAT for add_existing_baseyear 2024-04-11 12:47:13 +02:00
lisazeyen
f715285682
adjust resources perfect foresight 2024-04-02 16:48:37 +02:00
LukasFrankenQ
0396828e3a Merge https://github.com/pypsa/pypsa-eur 2024-03-27 00:09:02 +01:00
LukasFrankenQ
46cd9a8274 changed implementation to always use 2020 cost 2024-03-26 23:54:25 +01:00
Fabian Hofmann
be7dc0d0bb
postprocess: fix typo in benchmark folder 2024-03-26 13:28:06 +01:00
Fabian Hofmann
7611b28d16
Merge branch 'master' into refactor-copy-config-get-rdir 2024-03-20 09:57:31 +01:00
LukasFrankenQ
97acf2f12e included Lisas PR suggestions 2024-03-19 19:30:23 +01:00
Fabian
86a6c3223d perfect foresight: store configs in results dir 2024-03-19 11:26:36 +01:00
Fabian Hofmann
2728bd4780
Merge branch 'master' into fix-snakemake-bug 2024-03-19 11:09:53 +01:00
Koen van Greevenbroek
fcf773c003 Copy, don't move natura.tiff to resources
Preventing problems when parallel processes attempt to move the same
file to different resources directories.
2024-03-19 09:30:37 +01:00
Philipp Glaum
8d9afb0eb0 solve_electricity.smk:replace "minimal" by "shallow" 2024-03-19 08:28:27 +01:00
Koen van Greevenbroek
941de04859 Don't use log path function in IRENA retrieval rule
The `logs` function returns a path with a {run} wildcard which is not
present in the output of the retrieval rule. Follows f50ee2f2.
2024-03-18 10:40:32 +01:00
Fabian Neumann
cb4013812e
Merge branch 'master' into multiyear 2024-03-15 14:28:42 +01:00
Fabian Neumann
e459c3c89d add release notes; rename artificial to synthetic 2024-03-15 14:28:01 +01:00
Fabian Neumann
f50ee2f225 do not use log() for config independent retrieve rules 2024-03-15 13:50:53 +01:00
Fabian Neumann
ee55bba568 omit synthetic load data md5 validation 2024-03-15 12:04:25 +01:00
Fabian Neumann
97d876d4e5 update synthetic load data to cover 1941-2023 2024-03-15 11:44:41 +01:00
Fabian Neumann
f7e617befd make_summary: add drop_leap_day param 2024-03-14 18:52:25 +01:00
Fabian Neumann
02fc334a2e handle leap days in add_brownfield 2024-03-14 18:46:45 +01:00
Fabian Neumann
4fbb3c81c4 fix build_district_heat_share and build_transport_demand for multiyear 2024-03-14 16:48:32 +01:00
Fabian Neumann
57b487f163 handle leap days in temporal clustering 2024-03-14 15:38:36 +01:00
Fabian Neumann
0d6ba9fbd1 move leap year handling into helper function 2024-03-14 15:15:56 +01:00
Fabian Neumann
f695b63732 add more documentation 2024-03-14 14:31:18 +01:00
Fabian Neumann
f84707ba38 drop_leap_days already in renewable profiles 2024-03-14 14:30:50 +01:00
Fabian Neumann
cbeb9834ac update hydro capacity and generation data 2024-03-14 14:08:58 +01:00
LukasFrankenQ
09765ad060 Merged https://github.com/pypsa/pypsa-eur 2024-03-14 12:03:56 +01:00
Fabian Neumann
5b5d308bf7 adapt transport data to multiyear setup with new swiss data 2024-03-13 13:42:03 +01:00
Fabian Neumann
a429b48874 update storage provider for snakemake 8 2024-03-13 09:19:10 +01:00
Fabian Neumann
7fa6811760 Merge branch 'master' into multiyear 2024-03-13 09:13:31 +01:00
Fabian Neumann
06fa9c92da remove copy_config rule and write config for each solved network 2024-03-13 08:57:57 +01:00
Fabian Neumann
ed71978b92 use humanfriendly walltime specifications 2024-03-09 14:47:01 +01:00
Fabian Neumann
bcd02d94d6 retrieve: remove storage(static=True) call 2024-03-09 12:10:45 +01:00
Fabian Neumann
45e955a0d8 add https:// prefix for all storage() calls 2024-03-09 12:07:47 +01:00
Fabian Neumann
105dc6470a replace remaining instances of HTTP.remote 2024-03-08 17:51:02 +01:00
Fabian Neumann
d983d79ed2 Merge branch 'master' into snakemake-8 2024-03-08 17:50:08 +01:00
Fabian Neumann
09502cfbfa add memory logger to solve_sector_network_myopic rule 2024-03-08 11:26:00 +01:00
Fabian Neumann
579cd0c756 Merge branch 'master' into multiyear 2024-03-06 16:34:53 +01:00
Fabian Neumann
c13e0b83cf remove remaining references of eurostat report year 2024-03-05 18:55:59 +01:00
Fabian Neumann
5b513f81db move eurostat into data/eurostat subdirectory from sector-bundle 2024-03-05 18:42:15 +01:00
Fabian Neumann
41f23f9589 change eurostat year in build_industrial_production_per_country 2024-03-05 18:40:06 +01:00
pre-commit-ci[bot]
8aa6d98f56 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-04 18:38:31 +00:00
Fabian Neumann
77ec07d55d Merge branch 'multiyear' of github.com:PyPSA/pypsa-eur into multiyear 2024-03-04 19:38:02 +01:00
Fabian Neumann
8904943a87 integrate artificial load data supplement into build_electricity_demand 2024-03-04 19:37:52 +01:00
Fabian Neumann
9d913bcb38 smaller fixes and reduction of diff 2024-03-04 19:36:41 +01:00
pre-commit-ci[bot]
f4f4c1bf37 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-04 17:26:41 +00:00
pre-commit-ci[bot]
7b584f16bb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-04 16:56:00 +00:00
Fabian Neumann
030e5b15ad remove rule build_cutout_year 2024-03-04 17:51:32 +01:00
Fabian Neumann
c2011bce49 remove {weather_year} wildcard 2024-03-04 17:48:56 +01:00
Fabian Neumann
e6347621f9 remove operations rules to reduce amount of simultaneous changes 2024-03-04 17:42:35 +01:00
Koen van Greevenbroek
1ff8321c5e Remove erroneous automatic snakefmt formatting 2024-03-01 15:56:09 +01:00
Koen van Greevenbroek
75ff4134fb Select correct snapshots for hourly heating demand 2024-03-01 15:26:47 +01:00
Koen van Greevenbroek
61d565ec09 Correct formatting in build_electricity.smk 2024-03-01 15:26:16 +01:00
Koen van Greevenbroek
0c7c0a8585 Minor bugfixes in postprocessing code 2024-03-01 14:37:45 +01:00
Koen van Greevenbroek
e891305c9d Add selection of cutouts for heat to config 2024-03-01 14:37:16 +01:00
Koen van Greevenbroek
c2e7c125c7 Automatic formatting of snakemake rules 2024-03-01 13:24:02 +01:00
Koen van Greevenbroek
3c31caf993 Fix typos in rule inputs 2024-03-01 11:59:04 +01:00
Koen van Greevenbroek
0debf66169 Fix summary plot output 2024-03-01 11:51:34 +01:00
Koen van Greevenbroek
f6f98c102c Use default cutout for ship and nature raster extents
This avoids the need to either collect all cutouts for all weather
years or arbitrarily pick all cutouts for a certain weather year.
2024-03-01 11:45:39 +01:00
Koen van Greevenbroek
de0c0cd1f4 Merge remote-tracking branch 'upstream/master' into multiyear 2024-03-01 11:45:31 +01:00
Koen van Greevenbroek
90fb0b13da Various bugfixes to make multiyear branch run 2024-02-29 12:48:16 +01:00
pre-commit-ci[bot]
8dfab45453 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-27 12:35:59 +00:00
toniseibold
7616ae31fe Merge branch 'energy_totals' of https://github.com/PyPSA/pypsa-eur into energy_totals 2024-02-27 13:33:08 +01:00
toniseibold
5bcecc62c6 retrieve eurostat data is now outside of retrieve_sector_databundle 2024-02-27 13:32:07 +01:00
pre-commit-ci[bot]
9182d6d667 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-27 12:14:43 +00:00
toniseibold
d363aeb57d removing old eurostat data reports as an option, cleaning up code 2024-02-27 12:04:07 +01:00
toniseibold
3298572ced new energy totals from eurostat 2023 report scaling JRC IDEES data from 2015 2024-02-23 13:53:28 +01:00
Koen van Greevenbroek
1c9845afff Adapt offwind solution to new config management 2024-02-20 17:52:57 +01:00
Koen van Greevenbroek
87088904ee Merge remote-tracking branch 'upstream/master' into no-offwind-fix 2024-02-20 14:41:24 +01:00
Fabian Neumann
719d4dad23 Merge branch 'master' into scenario-management 2024-02-20 12:08:54 +01:00
Koen van Greevenbroek
ccb43a5612 Allow absence of offshore wind from sector-coupled networks 2024-02-19 22:45:17 +01:00
Fabian Neumann
16e2286188 update copyright years to 2024 2024-02-19 16:21:48 +01:00
Fabian Neumann
38c90155f1 add release notes 2024-02-18 11:48:55 +01:00
Fabian Neumann
945180f153 allow_missing in collection rules, fixes for myopic, wildcard constraints without function 2024-02-17 23:37:03 +01:00
Fabian Neumann
b543bf37c9 retrieve.smk: do not protect gas network data 2024-02-17 20:48:46 +01:00
Fabian Neumann
68f2e086c5 postprocess.smk: add missing wildcard call 2024-02-17 20:48:17 +01:00
Fabian Neumann
9f643ea429 _helpers: add inplace keyword argument to update_config_from_wildcards 2024-02-17 20:45:44 +01:00
Fabian Neumann
388ea65847 common.smk: use update_config to simplify merge_configs 2024-02-17 20:44:22 +01:00
Fabian Neumann
d335275e0f build_electricity: add missing wildcard call 2024-02-17 20:43:11 +01:00
pre-commit-ci[bot]
cc3d7a4cbb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-17 17:35:54 +00:00
Fabian Neumann
e898781fda use wildcard input functions where applicable 2024-02-17 18:35:26 +01:00
pre-commit-ci[bot]
de244414df [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-17 16:56:03 +00:00
Fabian Neumann
b14d84eb39 Merge branch 'scenario-management' of github.com:PyPSA/pypsa-eur into scenario-management 2024-02-17 17:55:35 +01:00
Fabian Neumann
709b831e06 further adjustments where config_provider needs to be called 2024-02-17 17:51:26 +01:00
pre-commit-ci[bot]
b8d57a6566 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-17 16:39:13 +00:00
Fabian Neumann
89d0fa24b6 further adjustments to latest master branch commits 2024-02-17 17:38:46 +01:00
Fabian Neumann
35b2228891 Merge branch 'wc-to-cf' into scenario-management 2024-02-17 17:16:28 +01:00
Fabian Neumann
d2a66879de Merge branch 'master' into scenario-management 2024-02-17 17:04:36 +01:00
Fabian Neumann
dd2416a59e handle all {opts} and {sector_opts} wildcard values in config 2024-02-17 11:57:16 +01:00
Fabian Neumann
4d4badc519 Merge branch 'master' into industry-pathway 2024-02-16 13:01:40 +01:00
Fabian Neumann
84fc63d7a1
Merge branch 'master' into ammonia 2024-02-16 12:14:00 +01:00
Fabian Neumann
67484f9cf0 remove numpy import, add release ntoe 2024-02-16 12:13:35 +01:00
Fabian Neumann
16e42c8fe6 further progress and bugfixes 2024-02-16 11:17:00 +01:00
martacki
a22b19dcc4 use new swiss data for building energy totals 2024-02-15 16:28:24 +01:00
pre-commit-ci[bot]
b45df1724b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-14 17:31:52 +00:00