Fabian Neumann
da10374158
apply ruff linting
2024-05-21 15:28:24 +02:00
Fabian Neumann
9545b757b0
correctly trigger add_solar_potential_constraints
2024-05-21 15:28:03 +02:00
Fabian Neumann
ca451fe9d5
ruff: safe fixes
2024-05-21 14:55:58 +02:00
Fabian Neumann
d19a3bcb64
time_aggregation: handle case where resolution is bool false
2024-05-21 14:22:21 +02:00
pre-commit-ci[bot]
b29b9e6c5d
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-20 20:25:43 +00:00
Fabian Neumann
3f01938eee
Merge branch 'master' into fix_biomass_transport
2024-05-20 22:24:59 +02:00
Fabian Neumann
00efffcc13
move up methanol for industry, to before shipping
2024-05-20 22:06:31 +02:00
Fabian Neumann
0ad3489d3a
Merge branch 'feature/methanol-production' of github.com:Climact/pypsa-eur-climact into Climact-feature/methanol-production
2024-05-20 22:06:15 +02:00
Fabian Neumann
eeb548c03f
Merge branch 'feature/fix-industry-intermediate' of github.com:Climact/pypsa-eur-climact into Climact-feature/fix-industry-intermediate
2024-05-20 21:44:19 +02:00
Fabian Neumann
60a26a67a0
simplify check for coal/coke industry demand
2024-05-20 21:08:44 +02:00
Fabian Neumann
476349292c
Merge branch 'feature/fix-non-steel-coal-demand' of github.com:Climact/pypsa-eur-climact into Climact-feature/fix-non-steel-coal-demand
2024-05-20 21:01:16 +02:00
Fabian Neumann
a8cd1186b8
clarify differences between Co2L in {sector_opts} and {opts} wildcard ( closes #865 )
2024-05-20 17:18:55 +02:00
Fabian Neumann
c7d8af998c
only apply rolling horizon setting in ( closes #864 )
2024-05-20 17:00:56 +02:00
Fabian Neumann
a2012d8937
pre-commit formatting [no ci]
2024-05-20 15:49:40 +02:00
Fabian Neumann
65b05e92a1
Merge branch 'feature/enhance-agg-p-nom-limits' of github.com:Climact/pypsa-eur-climact into Climact-feature/enhance-agg-p-nom-limits
2024-05-20 15:49:14 +02:00
Fabian Neumann
f76f7879f0
Merge branch 'fix_energy_totals'
2024-05-20 15:38:09 +02:00
Fabian Neumann
f25c594a07
bugfix: include total heavy-duty road freight; do not treat total transport as other but including electricity
2024-05-20 15:37:54 +02:00
Fabian Neumann
408e24de80
Merge branch 'master' of github.com:PyPSA/pypsa-eur
2024-05-20 15:01:05 +02:00
Fabian Neumann
c89ce9f045
bugfix: correctly distinguish existing OCGT and CCGT
2024-05-20 15:00:46 +02:00
Fabian Neumann
d2c48b6603
Merge pull request #1071 from SermishaNarayana/master
...
Modification to function "add_operational_reserve_margin" in solve_ne…
2024-05-20 12:45:10 +02:00
Fabian Neumann
7ce15931e5
add simplified power distribution grid losses
2024-05-20 12:41:54 +02:00
pre-commit-ci[bot]
6722e584ba
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-20 10:03:44 +00:00
Sermisha
d7435b6214
Modification to function "add_operational_reserve_margin" in solve_network.py
...
Typecasted pandas dataframes to xarray datasets to allow for multiplication with pypsa variables
2024-05-20 15:30:38 +05:30
Fabian Neumann
6c9fc50a1c
Merge branch 'master' of github.com:PyPSA/pypsa-eur
2024-05-20 11:54:20 +02:00
Fabian Neumann
60441ddfdd
pre-commit formatting [no ci]
2024-05-20 11:52:23 +02:00
Fabian Neumann
bf33518135
time_aggregation: add missing logger object
2024-05-20 11:51:45 +02:00
Fabian Neumann
9152425936
remove handling of tsam as optional dependency
2024-05-20 11:51:24 +02:00
Fabian Neumann
9527f4cf77
Merge branch 'split-out-time-agg' of github.com:koen-vg/pypsa-eur into koen-vg-split-out-time-agg
2024-05-20 11:38:02 +02:00
Fabian Neumann
cf8ee69f94
Merge pull request #1067 from PyPSA/fix_DC_cluster_issue
...
fix_DC_cluster_issue
2024-05-19 20:19:31 +02:00
pre-commit-ci[bot]
b890149d39
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-18 12:22:30 +00:00
Thomas Gilon
c3dcff8a35
Define methanol energy demand for industry
2024-05-17 16:04:48 +02:00
Philipp Glaum
ac48fdaaf4
base_network.py: connect new tyndp links only to closest AC bus
2024-05-17 14:46:20 +02:00
Parisra
ce14cd6647
Update plot_summary.py
...
-Add 2022 emissions to plot carbon budget
-Add UK emissions to the previous numbers
2024-05-16 17:06:28 +02:00
Fabian Neumann
27009f5060
double solar rooftop PV potentials ( closes #935 )
2024-05-15 18:18:15 +02:00
Fabian Neumann
e4d70fdf4a
remove exogenous rooftop_share
2024-05-15 18:13:49 +02:00
Fabian Neumann
e8779fa5a4
small follow-up to #1066 solar-hsat
2024-05-15 18:02:15 +02:00
Fabian Neumann
44fb8cad1f
Merge pull request #957 from PyPSA/land-transport-fix
...
Land transport fix
2024-05-15 17:13:56 +02:00
Fabian Neumann
1aa4f12c5e
remove adjust_transport_temporal_agg
2024-05-15 16:51:17 +02:00
Fabian Neumann
5b5be71341
use loads instead of links where possible
2024-05-15 16:41:49 +02:00
pre-commit-ci[bot]
a352cc346b
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-15 14:18:18 +00:00
lisazeyen
96118ab1f4
Merge branch 'master' into adding_solar_tracking_single_axis
2024-05-15 16:18:13 +02:00
lisazeyen
2223e011a0
merge master
2024-05-15 16:14:25 +02:00
Fabian Neumann
ff603f2c14
Merge branch 'master' into land-transport-fix
2024-05-15 15:25:56 +02:00
Fabian Neumann
ea8fc31a30
link_thresholds as dictionary, not float, more logging messages
2024-05-15 15:15:09 +02:00
lisazeyen
e8de4f308f
rename solar-hsat in config
2024-05-15 15:08:52 +02:00
lisazeyen
6723191031
simplify if statement
2024-05-15 15:04:04 +02:00
lisazeyen
541e267a83
replace print with logger.info
2024-05-15 15:00:42 +02:00
lisazeyen
a9be2825ec
reforumlate constraint
2024-05-15 14:59:34 +02:00
Fabian Neumann
9b50c846a0
solve: add option for post-discretization of lines and links
2024-05-15 14:56:50 +02:00
pre-commit-ci[bot]
5dc2e6862b
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-15 14:21:11 +02:00
JulianGeis
26184e370b
add functionality for post discretization of lines and transmission infrastructure links
2024-05-15 14:19:35 +02:00
Koen van Greevenbroek
f8f0b4cea0
Document the new time_aggregation rule
2024-05-15 13:34:20 +02:00
Koen van Greevenbroek
354fffe6f0
Split time agg into own rule; same agg for all planning horizons
2024-05-15 13:26:03 +02:00
pre-commit-ci[bot]
985aecb0c4
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 19:39:02 +00:00
Fabian Neumann
d6f9e5f4a6
Merge branch 'feature/fix-gas-retrofit' of github.com:Climact/pypsa-eur-climact into Climact-feature/fix-gas-retrofit
2024-05-13 18:05:35 +02:00
Fabian Neumann
cadd33431f
sanitize_locations: avoid attribute error for electricity-only runs ( closes #939 )
2024-05-13 17:59:21 +02:00
Fabian Neumann
788e07a0d1
bugfix to avoid duplicated offshore regions ( closes #396 )
2024-05-13 17:56:28 +02:00
Fabian Neumann
ef395cadf9
Merge pull request #1060 from PyPSA/landfill_master
...
Improve handling of plastics (for `master`)
2024-05-13 17:44:46 +02:00
Fabian Neumann
8fbd60883d
Merge branch 'master' into exclude_shared_resources_master
2024-05-13 17:42:40 +02:00
Fabian Neumann
a9333458b3
handle potentially diverging spatial resolutions of HVC
2024-05-13 17:40:10 +02:00
pre-commit-ci[bot]
c311f7bdf8
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 15:33:35 +00:00
lisazeyen
da9beaa98f
rename Greece iso-code
2024-05-13 17:33:07 +02:00
pre-commit-ci[bot]
b529ab1d3c
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 15:14:35 +00:00
Fabian Neumann
614590b98f
Merge branch 'landfill_master' of github.com:PyPSA/pypsa-eur into landfill_master
2024-05-13 17:14:04 +02:00
Fabian Neumann
649e277c7d
make waste-to-energy work without regional_oil_demand
2024-05-13 17:13:16 +02:00
pre-commit-ci[bot]
a9d0f295fb
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 13:41:41 +00:00
Michael Lindner
afa5cc5014
add heating output, correct bus ordering
2024-05-13 15:39:48 +02:00
pre-commit-ci[bot]
1d709913ed
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 15:39:37 +02:00
Tom Brown
2055fe68ef
add extra bus for HVC, which can either go to air or waste CHP
...
Here we explicitly add the option to generate energy and/or capture
the CO2 from HVC (i.e. plastics). NB: Since waste CHP is expensive,
it's not built.
2024-05-13 15:39:01 +02:00
pre-commit-ci[bot]
f7dc8a7f22
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-05-13 15:36:43 +02:00
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
02e434c8b0
Fix non steel related coal demand during transition (using sector_ratios)
2024-05-02 17:29:07 +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
yerbol-akhmetov
44e32468db
Merge branch 'master' into fix_biomass_transport
2024-04-27 18:09:51 +05: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
pre-commit-ci[bot]
b313b3940c
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-04-20 10:15:59 +00:00
yerbol-akhmetov
1aa10a1294
Merge branch 'master' into fix_biomass_transport
2024-04-20 15:14:41 +05:00
yerbol-akhmetov
3e1eef2934
revert mocksnakemake
2024-04-20 15:14:24 +05:00
yerbol-akhmetov
aaba8fb115
add OS based encoding
2024-04-20 15:09:54 +05: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
pre-commit-ci[bot]
bc78607926
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-04-18 15:32:28 +00:00
yerbol-akhmetov
2113b6657f
add logging
2024-04-18 20:31:42 +05:00
Yerbol Akhmetov
b4e322e61e
Merge branch 'master' into update_households_energy
2024-04-18 20:15:02 +05: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
Yerbol Akhmetov
0125975246
Merge branch 'master' into update_households_energy
2024-04-17 16:10:52 +05: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
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
