Commit Graph

1571 Commits

Author SHA1 Message Date
Fabian
04a2bea176 scenario-management: use list for including wildcards with shared resource 2023-08-24 13:20:11 +02:00
pre-commit-ci[bot]
b91a7b9c51 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-08-24 08:19:40 +00:00
Fabian Hofmann
3f3f752e8f
Merge branch 'master' into scenario-management 2023-08-24 10:19:14 +02:00
Fabian
62c6143863 scenario-management: reenable shared resources, make shared resources wildcards dependent 2023-08-23 17:14:57 +02:00
Fabian
7b9ab155f4 helpers: fix condition in set_scenario_config
prepare_sector: insert set_scenario_config
2023-08-22 18:15:50 +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
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
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
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
1810bbd4b3 make set_scenario_config robust against mock_snakemake and subworkflow 2023-08-21 12:24:27 +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
ebb5da655e scenarios: add collect function plot_elec_networks 2023-08-17 12:56:34 +02:00
Fabian
91eff472a7 scenario-management: fix set_scenario_config function; apply config_provider to some direct inputs 2023-08-17 12:31:07 +02:00
Fabian
9d4ce430cc electricity demand: remove powerstastics flag, merge sources in retrieve_electricity_demand 2023-08-17 10:17:12 +02:00
Fabian
672d7b9538 force add scenarios.yaml / create_scenarios 2023-08-16 13:45:59 +02:00
Fabian
af2fb1a82e uptrack changes in scenarios.yaml/create_scenarios.py 2023-08-16 13:37:10 +02:00
Fabian
59fe665616 add exemplary scenarios.yaml
add create_scenarios.py
2023-08-16 13:25:52 +02:00
Fabian
32eb114b61 retrieve electricity demand: make online version snakemake params 2023-08-16 13:05:22 +02:00
Fabian
9cd449cf3c retrieve electricity demand: use script in order to concat time-series 2023-08-16 11:41:48 +02:00
Fabian
b40a8926ff copy_config: fix import 2023-08-15 16:51:35 +02:00
Fabian
5036964dbe copy_config: ensure to store updated config 2023-08-15 15:49:57 +02:00
Fabian Hofmann
72e6c2fd80
Merge branch 'master' into scenario-management 2023-08-15 15:16:05 +02:00
Fabian
e28ae59375 introduce scenario-management 2023-08-15 15:06:59 +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
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