Commit Graph

2357 Commits

Author SHA1 Message Date
lisazeyen
f5e78645c7 Merge branch 'master' into drop-renewables 2024-04-03 16:26:49 +02:00
Fabian Neumann
a777872c0e
Merge pull request #991 from Climact/feature/fix-grouping-years-reference
Fix grouping year reference in add_land_use_constraint_m
2024-04-03 11:38:34 +02:00
Fabian Neumann
83e3f3f163 Merge branch 'feature/fix-simplify-network-buses' of github.com:Climact/pypsa-eur-climact into Climact-feature/fix-simplify-network-buses 2024-04-03 11:36:46 +02:00
Michael Lindner
89dbd53805 provide Path object as input to ConfigSettings 2024-03-26 17:20:10 +01:00
Koen van Greevenbroek
8b2a068b3a Check if scenario file exists before attempting to load
Useful when running the `create_scenarios` rule the first time.
2024-03-26 11:57:21 +01:00
Thomas Gilon
9dae86cd56 Fix index for existing capacities in add_existing_baseyear 2024-03-25 20:11:02 +01:00
Fabian Hofmann
a725844be9
Merge branch 'master' into share-resources 2024-03-25 16:08:31 +01:00
Thomas Gilon
50466d9593 Fix grouping year reference in add_land_use_constraint_m 2024-03-25 15:44:05 +01:00
Fabian
34f0294264 scenario management: fix shared resources 2024-03-25 14:27:50 +01:00
Fabian
585f9a32a7 cluster_network: ensure correct indexing of weights 2024-03-25 14:16:20 +01:00
Thomas Gilon
fd01cb0a75 Fix type error in cluster_network with "m" configuration 2024-03-22 16:01:42 +01:00
Thomas Gilon
7e99f3bba7 Fix error with symbol of buses in simplify_network 2024-03-22 10:06:48 +01:00
Fabian Neumann
f774a1628d
Merge branch 'master' into fill-missing-domestic-aviation 2024-03-21 12:15:42 +01:00
Fabian Neumann
d0951abded cluster_network: allow more solvers that can handle quadratic problems 2024-03-21 12:02:02 +01:00
Koen van Greevenbroek
bb898bf695 Fix typo in reading input to build_sequestration_potentials rule
Presumably needed since the transition to snakemake 8 storage providers
2024-03-20 15:40:07 +01:00
Fabian Hofmann
60725940ad
Merge branch 'master' into dedicated-shared-resource 2024-03-20 12:42:07 +01:00
Thomas Gilon
9558f44051 Drop assets including renewables in add_existing_baseyear 2024-03-20 10:47:59 +01:00
Fabian Hofmann
5dc5a3b427
Merge branch 'master' into dedicated-shared-resource 2024-03-20 09:58:37 +01:00
Fabian Hofmann
82ac7df318
Merge branch 'master' into refactor-copy-config-get-rdir 2024-03-19 10:22:07 +01:00
Fabian
23e1139c21 snakefile + helpers: separate scenario and rdir getter 2024-03-19 09:39:35 +01:00
Koen van Greevenbroek
22d1bf5dd1 Bugfix for missing eia years
First, cannot cast pd index to boolean. Second, fix logic error of
mistakenly swapped difference in calculating missing years.
2024-03-19 08:55:46 +01:00
Koen van Greevenbroek
65af55c22b Fix typos 2024-03-19 08:54:58 +01:00
Koen van Greevenbroek
a8454fd830 Fill in missing eurostat data on domestic aviation energy demand 2024-03-19 08:52:02 +01:00
Fabian Hofmann
a04ee4227f
Merge branch 'master' into refactor-copy-config-get-rdir 2024-03-19 08:36:50 +01:00
Fabian
2565a7db4f snakefile: move copy_default_files and process_run_config to helpers 2024-03-19 08:30:20 +01:00
Fabian Neumann
3940d2e0ad
Merge pull request #970 from koen-vg/custom-costs-repo
Allow the selection of custom fork of technology-data
2024-03-19 08:28:00 +01:00
Fabian Neumann
db4219f4d5
Merge pull request #971 from koen-vg/fix-sanitize-locations
Only sanitize locations when there are buses with a location
2024-03-19 08:26:24 +01:00
Fabian
f3eae37a02 scneario management: reenable shared resources in one folder 2024-03-18 19:41:35 +01:00
Fabian
c983aa7d2d prepare_perfect: ensure network.meta assignment 2024-03-18 19:34:59 +01:00
Koen van Greevenbroek
e03fbf152c Only sanitize locations when there are buses with a location
Fixes an edge case when no buses with a location are added in add_extra_components.
2024-03-18 14:40:29 +01:00
Koen van Greevenbroek
ce549cd949 Allow the retrieval of cost data from forks of technology-data 2024-03-18 13:18:56 +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
b88c9fbebb
Merge pull request #965 from PyPSA/rm-copy-config
remove copy_config rule and write config for each solved network
2024-03-15 13:53:23 +01:00
Fabian Neumann
3a54653711 fix shared resources for scenario management with {kind} wildcard 2024-03-15 13:50:27 +01:00
Fabian Neumann
a2f97ad1b3 make build_eurostat independent of snakemake object to be imported 2024-03-14 19:24:37 +01:00
Fabian Neumann
63072f2224 fix syntax mistake 2024-03-14 19:06:21 +01:00
Fabian Neumann
b485d987f1 Merge branch 'multiyear' of github.com:PyPSA/pypsa-eur into multiyear 2024-03-14 18:53:15 +01:00
Fabian Neumann
7587f2c6be pop_weighted_energy_totals: feasible for sub-annual temporal scope 2024-03-14 18:52:59 +01:00
Fabian Neumann
f74e2f1bb7 build_heat_totals: allow subset of countries 2024-03-14 18:47:09 +01:00
Fabian Neumann
02fc334a2e handle leap days in add_brownfield 2024-03-14 18:46:45 +01:00
Fabian Neumann
8d85acc61a remove unused keyword argument in temporal aggregation [no ci] 2024-03-14 18:19:25 +01:00
pre-commit-ci[bot]
a6ea15ea4a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-14 17:11:28 +00:00
Fabian Neumann
88dba98512 fix for CI 2024-03-14 18:11:02 +01:00
Fabian Neumann
115dd8d116 handle case when only artifical load must be loaded 2024-03-14 17:15:24 +01:00
Thomas Gilon
1496c585d0 Fix duplicated years in add_land_use_constraint_m 2024-03-14 17:00:10 +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
a5d0f07fe1 build_cutout: revert to master version 2024-03-14 15:29:27 +01:00
Fabian Neumann
6a3cf12459 remove accidental file addition 2024-03-14 15:18:05 +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
5b1575cb50 build_hydro: change decimal to '.' from ',' with updated data 2024-03-14 14:18:26 +01:00
Fabian Neumann
8aa4b5b558 build_heat_totals: use more years for regression 2024-03-14 14:09:39 +01:00
Fabian Neumann
cbeb9834ac update hydro capacity and generation data 2024-03-14 14:08:58 +01:00
pre-commit-ci[bot]
721c64a5bd [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-13 12:43:00 +00:00
Fabian Neumann
955d6837fd district heating: handle missing GB data for 2020-2021 2024-03-13 13:42:29 +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
2eb159af7c idees eurostat rescaling also for period 1990-1999 2024-03-13 13:40:23 +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
0a0a35e4a4
Merge pull request #952 from koen-vg/transmission-expansion-limit-reached
Add check for turning off transmission expnasion if limit reached
2024-03-11 09:06:08 +01:00
Fabian Neumann
c98e5e4b1b
Merge branch 'master' into snakemake-8 2024-03-09 16:09:57 +01:00
Fabian Neumann
887aa53290 build_gas_input_locations: remove unnecessary [0] with new storage plugin 2024-03-09 15:29:39 +01:00
Fabian Neumann
008539d635 add_electricity: fill max_hours also for nan values 2024-03-08 19:29:25 +01:00
Fabian Neumann
ab14c31f55 build_electricity_demand adjustment to reduced function arguments 2024-03-08 19:15:51 +01:00
Fabian Neumann
d983d79ed2 Merge branch 'master' into snakemake-8 2024-03-08 17:50:08 +01:00
Koen van Greevenbroek
3d94e8161b Adapt disabling transmission expansion to also handle cost limit 2024-03-07 09:26:42 +01:00
pre-commit-ci[bot]
d2968230bb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-06 19:43:32 +00:00
Fabian Neumann
a8682db4fc build_energy_totals: pre-process data for all years first [incomplete] 2024-03-06 20:42:45 +01:00
Fabian Neumann
7abbb47efd revert to master version of build_energy_totals 2024-03-06 16:42:33 +01:00
Fabian Neumann
579cd0c756 Merge branch 'master' into multiyear 2024-03-06 16:34:53 +01:00
Micha
d3283f5084
Merge branch 'master' into fix-lifetime 2024-03-06 08:22:25 +01:00
pre-commit-ci[bot]
ca91c02bf7 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-05 17:56:41 +00:00
Fabian Neumann
c13e0b83cf remove remaining references of eurostat report year 2024-03-05 18:55:59 +01:00
Fabian Neumann
bf60da973b build_energy_totals: revision of eurostat report upgrade 2024-03-05 18:43:24 +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]
8c465dbe3c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-05 12:49:35 +00:00
Fabian Neumann
9d0724566c Merge remote-tracking branch 'origin/master' into fneum/energy_totals 2024-03-05 13:40:49 +01:00
Michael Lindner
7f5f0ee45e compute lifetime after grouping DateIn 2024-03-05 12:00:50 +01: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
96f71d7e9c outsource drop_leap_day in temporal aggregation 2024-03-04 19:37:02 +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
Fabian Neumann
92922728d8 Merge branch 'multiyear' of github.com:PyPSA/pypsa-eur into multiyear 2024-03-04 18:25:05 +01:00
Fabian Neumann
249cfab429 remove remaining {weather_year} wildcard usages 2024-03-04 18:24:01 +01: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
1f7d4da3e6 Merge branch 'multiyear' of github.com:PyPSA/pypsa-eur into multiyear 2024-03-04 17:55: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
pre-commit-ci[bot]
9607eb0e6b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-04 16:16:28 +00:00
Koen van Greevenbroek
9a69f88a36 Fix bug bug in time segmentation function signature 2024-03-01 15:49:39 +01:00
Koen van Greevenbroek
75ff4134fb Select correct snapshots for hourly heating demand 2024-03-01 15:26:47 +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
d2527ed0ad Add copyright headers 2024-03-01 13:30:01 +01:00
Koen van Greevenbroek
fa88e411d7 Automatic formatting 2024-03-01 13:25:38 +01:00