Commit Graph

1623 Commits

Author SHA1 Message Date
Fabian Neumann
3ccc63aae4 build_carbon_budget: parse input_co2 2023-08-22 14:49:44 +02:00
Fabian Neumann
401fbb7be7 Merge branch 'fix-plot-summary' of github.com:daniel-rdt/pypsa-eur into daniel-rdt-fix-plot-summary 2023-08-22 14:46:48 +02:00
Fabian Neumann
49b2cd382d
Update scripts/plot_summary.py
Co-authored-by: Fabian Hofmann <hofmann@fias.uni-frankfurt.de>
2023-08-22 14:43:15 +02:00
Fabian Neumann
e12cad2789 simplify if-else expression 2023-08-22 14:42:21 +02:00
Fabian Neumann
33305f9761 Merge branch 'feature/myopic_existing_baseyear_fix' of github.com:daniel-rdt/pypsa-eur into daniel-rdt-feature/myopic_existing_baseyear_fix 2023-08-22 14:39:50 +02:00
Fabian Neumann
e4b220ff81 follow-up to #726: import country converter 2023-08-22 14:29:00 +02:00
Fabian Neumann
59d422a1f9
Merge pull request #726 from PyPSA/industrial_key_duplicates
drop duplicates in prepare_hotmaps_database
2023-08-22 14:26:42 +02:00
Fabian Neumann
f4d821ad2a use country_converter instead of pycountry 2023-08-22 14:22:25 +02:00
Fabian Neumann
41a35ad129 bugfix: use of n.madd with singular value prevented 2023-08-22 11:53:02 +02:00
martavp
46cdf2bf3a Merge branch 'fix-min-capacity-myopic' of https://github.com/PyPSA/pypsa-eur into fix-min-capacity-myopic 2023-08-22 11:08:57 +02:00
martavp
9cee4384bb revert commented lines 2023-08-22 11:08:51 +02:00
lisazeyen
890c80e047 remove overrides 2023-08-22 11:00:25 +02:00
lisazeyen
e92fc4ff4d merge master 2023-08-22 10:21:42 +02:00
pre-commit-ci[bot]
69132bd6e2 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-08-22 06:41:43 +00:00
martavp
2391a5c4e9 fix p_nom_min of renewable generators for myopic approach
as described in https://github.com/PyPSA/pypsa-eur/issues/727
2023-08-22 08:31:46 +02:00
pre-commit-ci[bot]
dadc372ecd [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-08-21 14:17:21 +00:00
lisazeyen
8d09e38627
drop duplicates in prepare_hotmaps_database 2023-08-21 16:16:53 +02:00
Fabian Neumann
6cdb194332 sanitize_carriers: do not invent nice names, use carrier where not available 2023-08-21 11:19:16 +02:00
Fabian Neumann
d7554bccff
Merge pull request #722 from PyPSA/carbon-management
Carbon management
2023-08-14 15:57:46 +02:00
Fabian
fc64649089 build_sequestration: switch to geopandas dissolve rather than groupby 2023-08-14 14:39:51 +02:00
pre-commit-ci[bot]
0d096d7388 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-08-14 10:40:07 +00:00
Fabian Neumann
def61ae769 industry distribution: use EPRTR as fallback if ETS missing 2023-08-14 12:39:33 +02:00
Fabian Neumann
1c1d45b1f5 add_electricity: make adding carriers in attach_wind_and_solar safer 2023-08-10 15:00:01 +02:00
pre-commit-ci[bot]
eed52d04ae [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-08-09 13:04:38 +00:00
daniel.rdt
e304efbf3c fix in co2_emissions_year function and correspondigly in plot_summary and snakemake rule. Also changes to historical_emissions in plot_summary since some countries are not in eea dataset. 2023-08-09 14:49:36 +02:00
pre-commit-ci[bot]
ac04abb98c [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-08-09 09:02:22 +00:00
Fabian Neumann
9a68730745 fix: read investment year of time-dependent config 2023-08-09 11:01:58 +02:00
pre-commit-ci[bot]
c32d5249e1 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-08-09 08:12:52 +00:00
Fabian Neumann
ade8a003c6 add coal and coke demand for integrated steelworks (closes #717) 2023-08-09 10:11:28 +02:00
Fabian Neumann
8d19043205 handle monthly fuel price download through script 2023-08-06 09:01:56 +02:00
Fabian
62cb6fbdd8 validation: download input data files instead 2023-08-04 17:38:21 +02:00
Fabian Hofmann
17f4c2ddb0
Merge branch 'master' into validation 2023-08-04 15:23:42 +02:00
Fabian
ad6322bcb3 address review commments 2023-08-04 12:58:31 +02:00
Fabian Hofmann
6e7bbe1e08
Merge branch 'master' into validation 2023-08-03 18:28:10 +02:00
Fabian Hofmann
4a8af57a59
simplify network: remove 'underground' column to avoid consense error 2023-08-03 18:19:20 +02:00
Fabian Neumann
8ae568d852
Merge pull request #712 from PyPSA/harmonize-result-stucture
harmonize output of solving rules
2023-08-03 11:39:53 +02:00
Fabian
1bf6ea1532 only copy active configuration to results folder
use copy config for all solve rules
remove copying of environment
2023-08-02 14:49:32 +02:00
Fabian
5b057575df prepare_sector_network: make use of biomass transport file optional 2023-08-02 14:39:20 +02:00
Fabian Hofmann
b2ab4bbe56
Merge branch 'master' into biomass-transport-costs 2023-08-02 13:14:13 +02:00
Fabian
03e3278f89 prepare_sector: add biomass transport costs for networks wo biomass network 2023-08-02 13:12:08 +02:00
virio-andreyana
657dd08b53 edit configtables and accept Fneum suggestion 2023-08-02 11:11:41 +02:00
Fabian Hofmann
e6ba640ba3
Merge branch 'master' into validation 2023-08-01 12:24:58 +02:00
Fabian
3417f61f50 monthly prices: adjust manual cost assumptions 2023-08-01 12:11:42 +02:00
Fabian Neumann
9808943f23 build_renewable_profiles considers subsets of cutout time scope; handle client shutdown 2023-08-01 09:54:48 +02:00
pre-commit-ci[bot]
ade7e17d57 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-31 09:20:35 +00:00
Fabian Hofmann
1ea8cf47d8
Merge branch 'master' into validation 2023-07-31 11:20:11 +02:00
Fabian
9579198162 validation: further fine-tuning 2023-07-31 11:15:50 +02:00
virio-andreyana
c771f3fac0 Merge branch 'validation' of github.com:PyPSA/pypsa-eur into validation 2023-07-31 01:27:36 +02:00
virio-andreyana
6bf6ec603c fix cross border flow coloring, country color are more contrasted, and update the config documentations 2023-07-31 01:27:15 +02:00
pre-commit-ci[bot]
7c00f9d451 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-28 13:14:42 +00:00
daniel.rdt
407037a799 fix in add_heating_capacities_installed_before_baseyear to account for case when there is no rural heating demand for some nodes in network 2023-07-28 15:09:13 +02:00
Fabian Neumann
8e6a70b468 prepare release 0.8.1 2023-07-27 11:23:02 +02:00
Fabian Hofmann
1d5c8c7242
Merge branch 'master' into fneum/line-rating 2023-07-26 14:56:35 +02:00
Fabian
d60be3fece Merge branch 'master' into validation 2023-07-26 13:01:34 +02:00
Fabian Neumann
d17430d000
Merge branch 'master' into multilinks-default 2023-07-26 08:48:21 +02:00
pre-commit-ci[bot]
f970ba0fd0 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-26 06:48:10 +00:00
Fabian Neumann
5231135d5f make_summary: explicitly typecast default values 2023-07-26 08:47:49 +02:00
pre-commit-ci[bot]
74be5261fc [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-26 05:24:33 +00:00
Fabian Neumann
7575dd0351 handling of natural gas in add_existing_baseyear and add_electricity 2023-07-26 07:24:12 +02:00
Fabian
491345d504 config: move cutout specification to line-rating section
test/config: use be-cutout for testing line-rating
2023-07-25 15:08:44 +02:00
Fabian Neumann
93c14dcda1 Merge branch 'master' into ppl-fueltype-fix 2023-07-25 13:10:59 +02:00
Fabian Hofmann
269a08006f
Merge branch 'master' into validation 2023-07-25 12:30:32 +02:00
Fabian
01aaeb730d cluster_network: introduce efficiency classes for clustering 2023-07-25 12:29:39 +02:00
Fabian Hofmann
3eac0c1127
Merge branch 'master' into multilinks-default 2023-07-24 13:42:50 +02:00
Fabian Hofmann
f0057614b3
Merge branch 'master' into fneum/line-rating 2023-07-24 10:49:15 +02:00
Fabian
474321c638 add_electricity: enable flattening hydro dispatch
config.validation: reduce crossborder caps
2023-07-24 10:47:16 +02:00
Fabian Neumann
1541877fdc Merge branch 'ppl-fueltype-fix' of github.com:PyPSA/pypsa-eur into ppl-fueltype-fix 2023-07-23 15:00:22 +02:00
Fabian Neumann
6110fe784d wrap comparisons in brackets 2023-07-23 14:59:28 +02:00
pre-commit-ci[bot]
3f3e73a0ec [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-23 09:08:29 +00:00
Fabian Neumann
d45cb71b7a match build_powerplants FuelType (closes #754) 2023-07-23 11:07:45 +02:00
pre-commit-ci[bot]
615684d124 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-22 11:26:42 +00:00
virio-andreyana
d36bdaf6bb clean plot_validation_cross_border_flows script 2023-07-22 13:26:11 +02:00
virio-andreyana
56cbcfa672 complete plot_validation_cross_border_flows script 2023-07-22 13:24:35 +02:00
lisazeyen
5c90083e9b merge master 2023-07-21 16:32:11 +02:00
Fabian
c7ef8e8c64 solve network: update mock snakemake 2023-07-20 14:36:22 +02:00
Fabian
793573f655 validate: add line plot for price comparison 2023-07-20 14:36:22 +02:00
Fabian Neumann
268391e204
Merge branch 'master' into master 2023-07-18 14:07:27 +02:00
Fabian Neumann
56e93fe821
Merge branch 'master' into fneum/line-rating 2023-07-18 14:06:11 +02:00
Fabian Neumann
a0366fb2bc
Merge branch 'master' into multilinks-default 2023-07-18 14:05:57 +02:00
Fabian Hofmann
40b87cac04
Merge branch 'master' into validation 2023-07-17 19:24:13 +02:00
Fabian
23b156d2c1 build_monthly_prices: use 2020 as base year for scaling 2023-07-17 17:35:23 +02:00
Fabian Hofmann
dc4286d3e3
Merge branch 'master' into describe-config 2023-07-17 17:33:55 +02:00
Fabian
fcce233a2e Merge branch 'master' into validation 2023-07-17 16:22:39 +02:00
Fabian
d22c87419b update enviromnent yaml to install pypsa from master
cluster: allow custom strategies for all components
2023-07-17 14:03:16 +02:00
Fabian
8e568cee03 cluster network: remove bus strategies as already handled internally 2023-07-14 16:00:21 +02:00
Fabian
f566142d38 cluster network: update to new clustering module (pypsa v0.25) 2023-07-14 15:47:41 +02:00
Fabian Hofmann
9f4c227def
Merge branch 'master' into describe-config 2023-07-14 13:34:20 +02:00
pre-commit-ci[bot]
fc36efaebe [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-13 20:35:05 +00:00
Fabian Neumann
b110810669 no more override_component_attrs for multilinks 2023-07-13 22:31:55 +02:00
Fabian
f020cfa969 validation: plot elec production fix typo 2023-07-13 18:36:14 +02:00
Fabian Hofmann
f90ef3bb73
Merge branch 'master' into validation 2023-07-12 12:32:35 +02:00
Fabian
723350c8ef solve_network: enable rolling horizon 2023-07-11 17:48:35 +02:00
Fabian
4bb0716414 prepare_network: fix addition of dynamic co2 prices 2023-07-11 16:15:27 +02:00
Fabian Neumann
6af92fcf67
Merge branch 'master' into fneum/line-rating 2023-07-11 14:37:17 +02:00
Fabian
86a4b775fd remove hardcoded config overwrite
plot_validation: adjust carrier labels
2023-07-11 14:25:32 +02:00
Fabian
9fbc626862 adjustments to new due to clustering module 2023-07-11 14:24:57 +02:00
pre-commit-ci[bot]
6492b1a195 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-07-10 23:02:57 +00:00
lisazeyen
26156943cf
remove TODO comment
the clipping of the p_min_pu value cannot be removed since it is used for the retrofitting generators which have to follow the heat demand profile. Otherwise the network becomes infeasibe.
2023-07-10 16:15:27 +02:00
Fabian
c7f67f0641 make fuel prices flexible over years
fix marginal cost issue (on pypsa)
minor fixes
2023-07-06 19:14:01 +02:00
Fabian Hofmann
3ea8b26ae0
fix carrier assignment 2023-07-06 15:01:00 +02:00