Michael Lindner
380884e9ab
group existing capacities to the earlier grouping_year for consistency with optimized capacities
2024-04-16 09:43:50 +02:00
Fabian Neumann
15345ff1cf
skip heat bus for CHPs in places where no central heating
2024-04-16 09:43:50 +02:00
Fabian Neumann
29adeb2267
add missing atlite import
2024-04-15 15:28:02 +02:00
Fabian Neumann
a1e42db58b
change in zenodo urls from record to records
2024-04-15 15:14:02 +02:00
Fabian Neumann
991eef6d97
update and reduce databundle size
2024-04-15 14:48:34 +02:00
Fabian Neumann
a4d58b70f5
Merge pull request #1020 from PyPSA/cleanup_data_structure
...
Cleaning up data and resources
2024-04-15 11:24:43 +02:00
lisazeyen
618ecdddeb
Merge branch 'master' into land-transport-fix
2024-04-15 09:13:28 +02:00
lisazeyen
f3e3113b89
Reset file to the version in master branch
2024-04-15 08:45:51 +02:00
lisazeyen
1a51414550
correct conversion kW->MW
2024-04-15 08:43:12 +02:00
pre-commit-ci[bot]
7436634bf8
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-04-14 11:33:18 +00:00
yerbol-akhmetov
d2584d37b1
update energy totals from Eurostat residential data
2024-04-14 16:28:50 +05:00
Sermisha
7a0ca73f3a
Update to BAU constraint formulation in function add_BAU_constraints
...
Constraint formulation was not taking into account the ordering of the carriers
2024-04-14 14:24:01 +05:30
yerbol-akhmetov
8b28f34f14
retrieve eurostat disagregated energy balances for household
2024-04-14 13:19:42 +05:00
Thomas Gilon
ed83f1fb4a
Add aggregated constraints for wind and possibility to take existing into account in solve_network
...
# Conflicts:
# scripts/solve_network.py
2024-04-12 17:14:31 +02:00
Thomas Gilon
98d2c4dd91
Fix p_nom_min of renewables generators for myopic approach and add check of existing capacities in add_land_use_constraint_m
2024-04-12 16:52:59 +02:00
lisazeyen
245ba5c20b
rename efficiencies in script
2024-04-12 14:38:56 +02:00
pre-commit-ci[bot]
ba93a404ef
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-04-12 12:29:37 +00:00
lisazeyen
53a6b91b06
clear up units
2024-04-12 14:28:52 +02:00
pre-commit-ci[bot]
ed6fa8f32c
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-04-12 11:59:17 +00:00
lisazeyen
4f8cc63461
clarify units
2024-04-12 13:58:01 +02:00
toniseibold
3b31b99dd2
removing the output file eia_hydro_stats.csv
2024-04-12 10:01:09 +02:00
lisazeyen
da1ff3be25
Merge branch 'master' into brownfield-chp
2024-04-12 09:32:44 +02:00
Fabian Neumann
038575dfc0
skip heat bus for CHPs in places where no central heating
2024-04-11 19:14:45 +02:00
cpschau
1867e510e2
remove redundant line
2024-04-11 17:14:17 +02:00
cpschau
c68e3420c0
clean-up after rebase
2024-04-11 16:42:19 +02:00
cpschau
f2db3c6327
add AC & DC lines
2024-04-11 16:32:35 +02:00
cpschau
4d4b8ea266
n.madd instead of pd.concat
2024-04-11 16:32:25 +02:00
pre-commit-ci[bot]
f8b33e8eb2
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-04-11 12:21:46 +00:00
lisazeyen
a72388b989
define active assets consitently
2024-04-11 14:19:59 +02:00
lisazeyen
e9c9d08107
rename _intervals to _years, shorten definition
2024-04-11 14:19:44 +02:00
lisazeyen
b30c8550eb
adjust valid_grouping_years
...
change sign, split up conditions for better readibility
2024-04-11 14:17:49 +02:00
lisazeyen
3a0e356382
add check if minimum grouping year< min build year
2024-04-11 14:12:01 +02:00
Michael Lindner
7c30a2835f
group existing capacities to the earlier grouping_year for consistency with optimized capacities
2024-04-11 14:11:22 +02:00
Fabian
f1b33992f7
move append_bus_shapes to build_bus_regions, apply it where possible
2024-04-11 13:27:52 +02:00
Fabian
219847012d
build_bus_regions: fix shapes index for correct alignment in madd
...
cluster_regions: further modularize functions, fix index alignment
2024-04-11 12:56:49 +02:00
Koen van Greevenbroek
859212b21f
Use powerplantmatching IRENASTAT for add_existing_baseyear
2024-04-11 12:47:13 +02:00
Fabian
590d363579
clustering: add docstring to cluster_regions function, fix network reference
2024-04-11 12:13:07 +02:00
Thomas Gilon
509f7e614f
Clarify suffix usage in add existing baseyear
2024-04-11 10:29:30 +02:00
Fabian
47134a88d8
regions to n.shapes: smooth out remaining issues
2024-04-10 18:35:50 +02:00
Fabian
9686407756
cluster_network: add regions to n.shapes
2024-04-10 18:19:46 +02:00
Fabian Hofmann
af3be19ef4
Merge branch 'master' into store-network-shapes
2024-04-10 17:49:30 +02:00
pre-commit-ci[bot]
7d0b775ca9
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-04-10 15:48:48 +00:00
Fabian
c19b8d760e
build_bus_regions: add shapes to network
2024-04-10 17:47:29 +02:00
cpschau
0ae016a7d0
write shapes to base network
2024-04-10 17:47:03 +02:00
Fabian Neumann
5ecd56d53c
Merge pull request #1010 from PyPSA/correct-co2-seq-potentials
...
Correct co2 potentials
2024-04-10 17:15:03 +02:00
Fabian Neumann
6bc1363080
allow sequestration potential attributes to be string
2024-04-10 17:13:58 +02:00
Philipp Glaum
05a3c43c30
move prefix from Snakefile to get_dir function
2024-04-10 12:23:28 +02:00
lisazeyen
9d9ab98279
add other co2 potentials
2024-04-10 12:06:53 +02:00
Thomas Gilon
b673b947ea
Fix custom busmap read in cluster network
2024-04-09 17:30:38 +02:00
Thomas Gilon
6e20afbaee
Fix typo
2024-04-04 15:42:02 +02:00
Thomas Gilon
8d93b0636e
Fix fill missing in industry sector ratios intermediate
2024-04-04 15:17:57 +02:00
lisazeyen
d8fbc6d6cd
Merge branch 'master' into rename-existing-capacities
2024-04-03 16:51:41 +02:00
pre-commit-ci[bot]
6ba598f426
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-04-03 14:51:12 +00:00
lisazeyen
6da50bf25a
Merge branch 'master' into rename-existing-capacities
2024-04-03 16:43:33 +02:00
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
LukasFrankenQ
0396828e3a
Merge https://github.com/pypsa/pypsa-eur
2024-03-27 00:09:02 +01:00
LukasFrankenQ
9abe1a10d8
removed geothermal chp constraint
2024-03-27 00:04:51 +01:00
LukasFrankenQ
46cd9a8274
changed implementation to always use 2020 cost
2024-03-26 23:54:25 +01:00
toniseibold
d09df8a473
bug fix
2024-03-26 20:56:11 +01:00
Michael Lindner
89dbd53805
provide Path object as input to ConfigSettings
2024-03-26 17:20:10 +01:00
pre-commit-ci[bot]
435350e07b
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-03-26 15:25:49 +00:00
lisazeyen
d7fedc6235
Merge branch 'master' into land-transport-fix
2024-03-26 16:25:27 +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
Toni Seibold
639a0ce4af
Merge branch 'master' into fix_energy_totals
2024-03-25 16:49:20 +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
pre-commit-ci[bot]
dda0c98b28
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-03-25 14:05:20 +00:00
toniseibold
e8761c9e24
overwriting agriculture and transport totals
2024-03-25 15:03:23 +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
LukasFrankenQ
97acf2f12e
included Lisas PR suggestions
2024-03-19 19:30:23 +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
lisazeyen
fd82664292
Merge branch 'master' into land-transport-fix
2024-03-14 20:14:08 +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
LukasFrankenQ
09765ad060
Merged https://github.com/pypsa/pypsa-eur
2024-03-14 12:03:56 +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
lisazeyen
5046289c5f
add lifetime V2G
2024-03-06 14:00:38 +01:00
lisazeyen
5bfc64a658
Merge branch 'master' into land-transport-fix
2024-03-06 09:25:08 +01:00
lisazeyen
74504a0ff3
add lifetime to BEV
2024-03-06 09:04:30 +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]
3549e6843d
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-03-04 16:24:52 +00:00
lisazeyen
1b6e5dc0c2
adjust for perfect foresight
2024-03-04 17:23:19 +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
pre-commit-ci[bot]
ff0093c8fe
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-03-04 16:01:32 +00:00
lisazeyen
fe51fd7022
adjust for temporal aggregation
2024-03-04 17:00:57 +01:00
lisazeyen
6712e48aa0
fix spelling mistake
2024-03-04 15:51:06 +01:00
pre-commit-ci[bot]
fb08d16be9
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-03-04 14:49:19 +00:00
lisazeyen
66257e1e84
fix bug with cyclic shift
2024-03-04 15:46:36 +01:00
pre-commit-ci[bot]
fa935be5cb
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-03-04 11:11:45 +00:00
lisazeyen
c14f782f51
add lifetime to links
2024-03-04 12:11:19 +01:00
lisazeyen
d4bdf489c9
add cyclic shift for EVs
2024-03-04 12:08:45 +01:00
pre-commit-ci[bot]
4242a0841c
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-03-04 08:44:54 +00:00
lisazeyen
04d3164d7f
adjust p_nom + profile
2024-03-04 09:41:22 +01:00
lisazeyen
4ffa702d30
temperature correction in extra function
2024-03-04 08:49:44 +01:00
lisazeyen
8efe43f35f
add temperature correction
2024-03-04 08:34:08 +01:00
Koen van Greevenbroek
9a69f88a36
Fix bug bug in time segmentation function signature
2024-03-01 15:49:39 +01:00
lisazeyen
bed2ef43d5
fix p_nom ICE
2024-03-01 15:47:52 +01:00
Koen van Greevenbroek
75ff4134fb
Select correct snapshots for hourly heating demand
2024-03-01 15:26:47 +01:00
lisazeyen
548a99f273
restructure to links without temperature correction
2024-03-01 15:19:00 +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
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
lisazeyen
b70aa59dce
safe transport demand in unit kinetic energy
2024-03-01 11:32:12 +01:00
Koen van Greevenbroek
90fb0b13da
Various bugfixes to make multiyear branch run
2024-02-29 12:48:16 +01:00
Adrian Odenweller
06a777d96e
Merge branch 'master' into cplexFix
2024-02-27 14:37:49 +01:00
toniseibold
ae187b8ba3
Merge branch 'energy_totals' of https://github.com/PyPSA/pypsa-eur into energy_totals
2024-02-27 14:32:21 +01:00
toniseibold
bd0880c022
correcting misleading comment
2024-02-27 14:32:09 +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
14d6c3b97f
merge
2024-02-27 13:14:09 +01:00
toniseibold
d363aeb57d
removing old eurostat data reports as an option, cleaning up code
2024-02-27 12:04:07 +01:00
Fabian Hofmann
58bcef4625
cluster_network: update solver_name if clause style
2024-02-27 11:39:26 +01:00
Adrian Odenweller
1db30ae63b
Allow CPELX for MIQP in cluster_network
2024-02-24 12:10:08 +01:00
lisazeyen
6b5ab53f0c
Merge branch 'master' into fix-heatpump-lowvoltage
2024-02-23 15:28:36 +01:00
pre-commit-ci[bot]
60653de9f6
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-23 14:27:20 +00:00
lisazeyen
c6ed36df62
adjust AC bus to low voltage
2024-02-23 15:23:55 +01:00
pre-commit-ci[bot]
ace51b9e55
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-23 12:56:46 +00: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
db9f234fad
Fix typo in snakemake input
2024-02-20 18:38:21 +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
184f3a0e03
Merge branch 'scenario-management'
2024-02-20 14:23:05 +01:00
Fabian Neumann
26b202f463
prepare_sector: automatically interpolate in config get() function
2024-02-20 12:34:19 +01:00
Fabian Neumann
719d4dad23
Merge branch 'master' into scenario-management
2024-02-20 12:08:54 +01:00
pre-commit-ci[bot]
d713e3c52b
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-20 09:03:57 +00:00
Tom Brown
4f91c6c43d
bugfix: make sure coal demand is there with regional demand
2024-02-20 09:49:19 +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
df0eb38a68
_helpers: generalise regular expression in find_opt
2024-02-17 23:38:59 +01:00
Fabian Neumann
cf7018c8c4
plot_summary: remove leftover references to opts wildcard
2024-02-17 23:38:00 +01:00
Fabian Neumann
770d352652
handle that time_resolution can be float
2024-02-17 23:37:31 +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
9f643ea429
_helpers: add inplace keyword argument to update_config_from_wildcards
2024-02-17 20:45:44 +01:00
Fabian Neumann
e898781fda
use wildcard input functions where applicable
2024-02-17 18:35:26 +01:00
Fabian Neumann
95853bb59d
_helpers: allow specifying dedicated shared_resources folder
2024-02-17 18:27:59 +01:00
Fabian Neumann
84c3852c2e
_helpers: remove resource folder separation by wildcard
...
This was not working reliably as the number of input and output wildcards could vary, which the function did not acknowledge
2024-02-17 18:15:43 +01:00
Fabian Neumann
db7c983950
mock_snakemake: remove dangeours empty list as default argument
2024-02-17 18:14:18 +01:00
Fabian Neumann
709b831e06
further adjustments where config_provider needs to be called
2024-02-17 17:51:26 +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
7f1ff0c324
Fix plotting of retrofitted hydrogen pipelines with pathway optimisation.
2024-02-16 16:41:21 +01:00
Fabian Neumann
27f9fb8cba
add back in to_csv export (accidentally deleted)
2024-02-16 16:18:31 +01:00
Fabian Neumann
77753fff0d
Merge branch 'master' into industry-pathway
2024-02-16 15:31:54 +01:00
Fabian Neumann
8ae0669b33
Revert "add_electricity: set locations and units of electricity buses"
...
This reverts commit 472a099881
2024-02-16 15:31:17 +01:00
Fabian Neumann
e9174d4f14
Merge branch 'master' into industry-pathway
2024-02-16 15:15:27 +01:00
Fabian Neumann
93bb4e5f54
add release note, simplify build_industry_sector_ratios_intermediate script
2024-02-16 15:14:18 +01:00
Fabian Neumann
472a099881
add_electricity: set locations and units of electricity buses
2024-02-16 13:30:52 +01:00
Fabian Neumann
4d4badc519
Merge branch 'master' into industry-pathway
2024-02-16 13:01:40 +01:00
Fabian Neumann
6a8ae68aec
Merge branch 'industry-coal-bug'
2024-02-16 12:47:34 +01:00
Fabian Neumann
6bedca13c4
Merge branch 'master' into cl-meoh-unit
2024-02-16 12:40:29 +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
pre-commit-ci[bot]
4fa504b0db
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-14 17:32:24 +00: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
Tom Brown
e14bae345b
new script to interpolate industry sector ratios today to tomorrow
...
For each country we gradually switch industry processes from today's
specific energy carrier usage per ton material output to the
best-in-class energy consumption of tomorrow in the
industry_sector_ratios.csv.
This is done on a per-country basis. The ratio of today to tomorrow's
energy consumption is set with the
config["industry"]["sector_ratios_fraction_future"] parameter.
2024-02-14 18:29:56 +01:00
Tom Brown
7f3ad792a9
use production to determine today's energy demand for basic chemicals
...
This uniformises how demand for basic chemicals is calculated.
We also avoid unnecessary use of ammonia production separately.
2024-02-14 18:29:50 +01:00
Tom Brown
cc57952402
industrial prod: use EU28 total for denominator for distribution key
...
This makes sure the distribution key is correct when only subsets of
countries are used. This is then consistent with the HVC, MeOH and Cl
totals being EU28 totals.
Without this change, industry production is overestimated when using
subsets of countries.
Or the user has to adjust the totals for industrial production
themselves.
2024-02-14 18:29:43 +01:00
Tom Brown
cbf7ed0d38
for today's industry energy demand, separate MeOH, Cl and HVC
...
I.e. split basic chemicals (without ammonia) into MeOH, Cl and HVC.
This now agrees with scheme for industrial sectors tomorrow.
2024-02-14 18:29:36 +01:00
Tom Brown
c54626cc1a
bugfix: correct units of subtracted chlorine and methanol
...
in build_industry_sector_ratios.py. In the config the units are Mt/a,
they are multiplied by MWh/t, but what is desired is GWh/a.
2024-02-14 18:29:02 +01:00
Tom Brown
ecedea02d6
bugfix: include all countries in ammonia production resource
...
This is so that the full EU28 ammonia demand can be correctly
subtracted in the build_industry_sector_ratios.py script.
No other downstream scripts are affected by this change.
2024-02-14 18:28:22 +01:00
Martha Frysztacki
234f2f247c
Merge branch 'master' into bus-regions
2024-02-14 17:05:43 +01:00
pre-commit-ci[bot]
78b184ad0f
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-02-12 15:57:49 +00:00
