Tom Brown
ac0d52e1c3
Allow some plastics sequestered in landfill or built environment
...
I.e. assume some fraction of plastics don't end up being burned or
decaying into air.
2024-05-13 15:36:14 +02:00
Fabian Neumann
5b2d4047df
Merge branch 'master' of github.com:PyPSA/pypsa-eur
2024-05-13 14:55:07 +02:00
Fabian Neumann
e322e21771
Merge branch 'feature/add-nodal-supply-energy' of github.com:Climact/pypsa-eur-climact into Climact-feature/add-nodal-supply-energy
2024-05-13 14:54:49 +02:00
pre-commit-ci[bot]
5364e7dfcc
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 12:25:07 +00:00
Fabian Neumann
6321a69870
rearrange config settings under 'run: shared_resources:'
2024-05-13 14:23:09 +02:00
pre-commit-ci[bot]
0fb68d11d8
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 14:22:05 +02:00
toniseibold
e75e3bd8d7
allow excluding files from shared_resources
2024-05-13 14:21:43 +02:00
pre-commit-ci[bot]
85a2e97f1e
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 08:51:21 +00:00
Fabian Neumann
e023872d44
stop using wildcard by default
2024-05-13 10:50:24 +02:00
Fabian Neumann
22b16d54e9
Merge branch 'feature/rename-existing-capacities' of github.com:Climact/pypsa-eur-climact into Climact-feature/rename-existing-capacities
2024-05-13 10:09:21 +02:00
Fabian Neumann
84d6634af0
Merge branch 'master' into implement-floating
2024-05-13 10:04:42 +02:00
Fabian Neumann
0d9e0f34fd
Merge branch 'master' into reduced-data-bundle
2024-05-12 15:53:08 +02:00
Philipp Glaum
da617be276
Merge branch 'master' of github.com:PyPSA/pypsa-eur into implement-floating
2024-05-10 13:29:58 +02:00
Fabian Neumann
ff99db5cb5
Update scripts/build_hydro_profile.py
2024-05-07 10:53:07 +02:00
Johannes Schmidt
3b77b4a370
Fix that code works if either ES or PT is present
2024-05-06 18:46:04 +02:00
Johannes Schmidt
9d36d2bc9b
Fix copy_timeslice
...
copy timeslice would add data although country not present in load
2024-05-06 13:37:32 +02:00
Johannes Schmidt
97035092ac
Fix approximate_missing_eia_stats
...
Function crasehd when 'ET' or 'PT' not present in list of countries.
2024-05-06 13:20:53 +02:00
Fabian Neumann
c05cfff765
Merge pull request #1045 from Climact/feature/fix-typo
...
Fix typo
2024-05-06 10:33:19 +02:00
Koen van Greevenbroek
303b526bf1
Fix formatting of link in base_network documentation
2024-05-06 09:09:23 +02:00
Koen van Greevenbroek
ca6f803e28
Update documentation to reflect removal of build_bus_regions rule
2024-05-06 08:52:42 +02:00
Koen van Greevenbroek
76c201ef7d
Integrate build_bus_regions into base_network
...
Fixes a problem with the `build_bus_regions` writing to base.nc
without declaring base.nc as an output.
2024-05-03 14:53:18 +02:00
Thomas Gilon
a139bb604a
Merge branch 'master' into feature/add-nodal-supply-energy
2024-05-02 14:28:20 +02:00
Thomas Gilon
45aa714bdc
Add calculate_nodal_supply_energy in make summary
2024-05-02 14:27:30 +02:00
Thomas Gilon
3752929cbb
Merge branch 'master' into feature/fix-typo
2024-05-02 14:22:50 +02:00
Thomas Gilon
54e3d2bb1b
Fix typo
2024-05-02 14:19:58 +02:00
pre-commit-ci[bot]
2d2b0338cc
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-04-29 13:59:11 +00:00
Parisra
ea0e2f66ce
Fix empty array error
...
In case there are no extendable solar generators in the network, the constraint is not implemented. Without this condition, an 'empty array' error will arise.
2024-04-29 15:58:42 +02:00
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
Fabian Neumann
33dddbf1ef
Merge branch 'master' into existing-caps-from-pm
2024-04-26 08:39:44 +02: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
Fabian Neumann
d101b8a95a
Merge branch 'master' into existing-caps-from-pm
2024-04-25 17:33:48 +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
Thomas Gilon
cc49926a23
Fix gas network retrofit
2024-04-23 14:16:29 +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
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
