Commit Graph

3556 Commits

Author SHA1 Message Date
lisazeyen
60b1968eb0 check for missing buses 2023-08-23 13:27:40 +02:00
lisazeyen
ba589ac7af add config for perfect foresight 2023-08-23 13:27:21 +02:00
lisazeyen
6585e2c623 adjust summary and plotting 2023-08-23 13:26:27 +02:00
lisazeyen
20bf1cdaf5 deal with global constraints 2023-08-23 13:26:08 +02:00
lisazeyen
f47ce1c432 add lifetime 2023-08-23 13:24:25 +02:00
lisazeyen
a21b1f2d10 add params 2023-08-23 13:23:27 +02:00
pre-commit-ci[bot]
afda8ee1f6 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-08-23 07:37:30 +00:00
Fabian Neumann
8cdba1c8e4
Merge branch 'master' into blast-furnace-with-cc 2023-08-23 09:37:07 +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
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 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
0bc7921330 Merge branch 'blast-furnace-with-cc' of github.com:PyPSA/pypsa-eur into blast-furnace-with-cc 2023-08-09 11:03:47 +02:00
Fabian Neumann
830d9762ef fix typo in definition of coal in spatial namespace 2023-08-09 11:03:42 +02:00
pre-commit-ci[bot]
0420269093 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-08-09 09:02:40 +00: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
dbbc66710a Merge branch 'coke' into blast-furnace-with-cc 2023-08-09 11:02:07 +02:00