Thomas Gilon
|
cc49926a23
|
Fix gas network retrofit
|
2024-04-23 14:16:29 +02:00 |
|
Thomas Gilon
|
3fe427a0cd
|
Merge branch 'master' into feature/enhance-agg-p-nom-limits
|
2024-04-19 17:52:01 +02:00 |
|
Thomas Gilon
|
e90b37e6d7
|
Improve agg_p_nom_minmax file management
|
2024-04-19 17:47:40 +02:00 |
|
Fabian Neumann
|
95805a8d72
|
Merge pull request #1031 from PyPSA/remove_connection_costs
Remove connection costs output
|
2024-04-18 09:34:32 +02:00 |
|
Fabian Hofmann
|
b993e6affb
|
Merge branch 'master' into store-network-shapes
|
2024-04-17 12:37:47 +02:00 |
|
martacki
|
48f199f936
|
remove UA from countries list for synthetic load data
|
2024-04-16 15:46:36 +02:00 |
|
martacki
|
feb564506a
|
remove connection_costs as snakemake output from simplify_network
|
2024-04-16 15:41:01 +02:00 |
|
cpschau
|
6ea8d52a81
|
no directory change before mock_snakemake
|
2024-04-16 10:43:07 +02:00 |
|
cpschau
|
3cf2d0c059
|
no addition of straight lines
|
2024-04-16 10:24:16 +02:00 |
|
lisazeyen
|
e3ccbc0e3f
|
Merge branch 'master' into Climact-feature/fix-add-land-use-constraint-m
|
2024-04-16 09:59:56 +02:00 |
|
pre-commit-ci[bot]
|
da15ab3ac2
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2024-04-16 09:43:50 +02:00 |
|
lisazeyen
|
ec96a73baf
|
define active assets consitently
|
2024-04-16 09:43:50 +02:00 |
|
lisazeyen
|
dd874e0ed8
|
rename _intervals to _years, shorten definition
|
2024-04-16 09:43:50 +02:00 |
|
lisazeyen
|
442c8a8c74
|
adjust valid_grouping_years
change sign, split up conditions for better readibility
|
2024-04-16 09:43:50 +02:00 |
|
lisazeyen
|
17d44d7f64
|
add check if minimum grouping year< min build year
|
2024-04-16 09:43:50 +02:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|