Commit Graph

2366 Commits

Author SHA1 Message Date
pre-commit-ci[bot]
c66549c577 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-04-29 12:34:11 +00:00
Parisra
7a2f07e135
Fix component index error
The list of carriers for adjust_renewable_profiles is read from config['electricity']['renewable_carriers'] which includes 'solar-hsat' and would result in 'Components Index(['AL0 0 solar-hsat',...) for attribute p_max_pu of Generator are not in main components dataframe generators' warning for the myopic run if the solar tracking option is false.
2024-04-29 14:33:51 +02:00
Parisra
17b3e1677d
Merge branch 'PyPSA:master' into adding_solar_tracking_single_axis 2024-04-29 14:27:26 +02:00
pre-commit-ci[bot]
3e93c14dd4 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-04-29 11:32:24 +00:00
Koen van Greevenbroek
a4a2af5404 Fix double space in existing capacities
The `name_suffix` variable already includes a space after the bus name.
2024-04-25 18:05:41 +02:00
Parisra
fde0cd9aae
Update land_use constraints
Add solar-hsat and solar-rooftop to land use constraints
2024-04-25 11:49:14 +02:00
Parisra
9a55c8fa7b
Update potential constraint
Only implement constraint if solar-hsat option is selected in config
2024-04-25 11:47:30 +02:00
Parisra
f69ec97a18
Add solar_potential constraint
The constraint ensures the combined installed capacity of solar and solar-hsat does not exceed the total solar capacity of the node
2024-04-25 11:45:31 +02:00
Parisra
be876761f2
Add remove option for solar-hsat
Add function to remove solar-hsat if the config option is 'False'
2024-04-25 11:37:53 +02:00
Parisra
692d837b14
Update add_electricity_grid_connection
Add solar-hsat as technology with a grid connection cost
2024-04-25 11:35:29 +02:00
Parisra
f0187437c1
Update costs
Rename 'solar-utility single-axis' (taken from technology data) to solar-hsat
2024-04-25 11:32:58 +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
a4d58b70f5
Merge pull request #1020 from PyPSA/cleanup_data_structure
Cleaning up data and resources
2024-04-15 11:24:43 +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
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
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
Fabian
590d363579 clustering: add docstring to cluster_regions function, fix network reference 2024-04-11 12:13:07 +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