Commit Graph

3060 Commits

Author SHA1 Message Date
pre-commit-ci[bot]
b8dee184a9 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-08-24 09:12:07 +00:00
Fabian Neumann
d0f2d52853 apply protected() to zenodo downloads; only retrieve monthly fuel/CO2 prices when necessary 2023-08-24 11:11:33 +02:00
Fabian Neumann
1087b1a1af Merge branch 'daniel-rdt-fix-plot-summary' 2023-08-22 14:49:52 +02:00
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
e0e6368645 Merge branch 'daniel-rdt-feature/myopic_existing_baseyear_fix' 2023-08-22 14:42:41 +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
635877b53c
Merge pull request #728 from PyPSA/fix-min-capacity-myopic
Fix min capacity myopic
2023-08-22 14:26:10 +02:00
Fabian Neumann
f4d821ad2a use country_converter instead of pycountry 2023-08-22 14:22:25 +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
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
b2e8efea19 add small comment to release note 2023-08-22 08:36:21 +02: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 Hofmann
1fc83b793d
Merge pull request #725 from PyPSA/nice-name-camel
sanitize_carriers: do not invent nice names, use carrier where not av…
2023-08-21 13:22:29 +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 Neumann
1a60dcb734
Merge pull request #721 from PyPSA/hotmaps-fallback-field
industry distribution: use EPRTR as fallback if ETS missing
2023-08-14 14:55:17 +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
28c238eaa4 follow up 2023-08-12 20:31:51 +02:00
Fabian
392f1b5fb4 solving: add walltime 2023-08-12 20:31:50 +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
Fabian Neumann
e34cec427b
Merge pull request #651 from PyPSA/validation
Validation
2023-08-06 09:22:43 +02:00
Fabian Neumann
8d19043205 handle monthly fuel price download through script 2023-08-06 09:01:56 +02:00
Fabian
18297a6f13 retrieve: fix data path 2023-08-05 16:41:16 +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
8fa3040c38 remove hard config overwrite 2023-08-04 13:57:41 +02:00
Fabian
ad6322bcb3 address review commments 2023-08-04 12:58:31 +02:00
Fabian Hofmann
8622398ceb
Apply suggestions from code review
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2023-08-04 12:23:02 +02:00
Fabian Neumann
2d050cc9fd
Merge pull request #714 from PyPSA/FabianHofmann-patch-1
simplify network: remove 'underground' column to avoid consense error
2023-08-04 07:46:23 +02:00
Fabian Hofmann
6e7bbe1e08
Merge branch 'master' into validation 2023-08-03 18:28:10 +02:00
Fabian Neumann
8e6c454c6a
Merge pull request #715 from PyPSA/FabianHofmann-patch-2
simplify network: increase mem requirement
2023-08-03 18:23:08 +02:00
Fabian Hofmann
7fa577c3a8
simplify network: increase mem requirement 2023-08-03 18:21:36 +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
lisazeyen
9687fef2e2
Merge pull request #711 from PyPSA/biomass-transport-costs
prepare_sector: add biomass transport costs for networks wo biomass network
2023-08-02 15:12:50 +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
f205ff9536 prepare_sectors: make biomass transport costs conditional again 2023-08-02 14:05:05 +02:00