Commit Graph

4661 Commits

Author SHA1 Message Date
Fabian Neumann
1f303adcfe Merge branch 'coke' into blast-furnace-with-cc 2023-08-22 14:30:03 +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
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
c629476721 adapt to new config path 2023-08-22 11:01:51 +02:00
lisazeyen
e5673731ab make plot_network conditional 2023-08-22 11:01:00 +02:00
lisazeyen
890c80e047 remove overrides 2023-08-22 11:00:25 +02:00
lisazeyen
f5959618f0 add *.orig to gitignore 2023-08-22 10:23:16 +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
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
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
750b74db46 build_electricity: optionally download dynamic fuel prices 2023-08-16 10:51:03 +02:00
Fabian
b3a6e2c281 common: make cache config_getter, use partial functions 2023-08-16 10:50:09 +02:00
Fabian
b9f3df3856 ci: only dry-run scenarios 2023-08-15 17:28:12 +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
3462080b89 ci: adjust scenario test run 2023-08-15 15:46:59 +02:00
Fabian
16d08ec100 CI: fix config scenarios file spec 2023-08-15 15:29:43 +02:00
Fabian Hofmann
72e6c2fd80
Merge branch 'master' into scenario-management 2023-08-15 15:16:05 +02:00
Fabian
6df2742cb9 update release notes 2023-08-15 15:14:55 +02:00
Fabian
56fe245eb4 gitignore: fix typo 2023-08-15 15:08:22 +02:00
Fabian
1f38c69b76 untrack scenarios.yaml 2023-08-15 15:07:34 +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
e7836246ce scenario management: draft scenario yaml creator 2023-08-14 14:56:26 +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