From 9b86d5bfa8615704e16ee18ba09d805291cb2b60 Mon Sep 17 00:00:00 2001 From: MaGering Date: Thu, 31 Aug 2023 21:16:12 +0200 Subject: [PATCH 01/20] Change type shortages to imports --- digipipe/esys/esys/config/labels/de.yml | 8 ++++---- digipipe/esys/esys/config/labels/en.yml | 6 +++--- digipipe/esys/esys/model/component_attrs_update.yml | 10 +++++----- digipipe/esys/esys/model/foreign_keys_update.yml | 6 +++--- .../model/model_structure/model_structure_el_only.yml | 2 +- .../model/model_structure/model_structure_full.yml | 6 +++--- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/digipipe/esys/esys/config/labels/de.yml b/digipipe/esys/esys/config/labels/de.yml index bad124a8..878b1e2b 100644 --- a/digipipe/esys/esys/config/labels/de.yml +++ b/digipipe/esys/esys/config/labels/de.yml @@ -1,7 +1,7 @@ # oil: Öl Raises error as "oil" is in "boiler" -> duplicate mappings biomass: Biomasse biomass-biogas_plant: Biogasanlage -biomass-shortage: Biomasse Shortage +biomass-import: Biomasse Import biogas: Biogas biogas-biogas_upgrading_plant: Biogas-Aufbereitungsanlage biogas-bpchp_central: Biogas zentrale KWK @@ -33,7 +33,7 @@ h2-excess: H2 Überschuss h2-extchp_central: H2 zentrale GUD h2-extchp_decentral: H2 dezentrale GUD h2-import: H2 Import -h2-shortage: H2 Import +h2-shortage: H2 Shortage heat_central-demand_hh: zen. Wärmebedarf HH heat_central-demand_cts: zen. Wärmebedarf GHD heat_central-demand_ind: zen. Wärmebedarf I @@ -45,13 +45,13 @@ heat_decentral-storage: dez. Wärmespeicher hydro-reservoir: Reservoir hydro-ror: Laufwasserkraft lignite: Braunkohle -lignite-shortage: Braunkohle Shortage +lignite-import: Braunkohle Import nuclear-st: Kernkraftwerk hard coal: Steinkohle wood: Holz wood-extchp_central: Holz zentrale KWK wood-extchp_decentral: Holz dezentrale KWK -wood-shortage: Holz Shortage +wood-import: Holz Import other: Andere solar-pv_ground: PV Freifläche solar-pv_rooftop: PV Aufdach diff --git a/digipipe/esys/esys/config/labels/en.yml b/digipipe/esys/esys/config/labels/en.yml index ed92e94b..40a9c342 100644 --- a/digipipe/esys/esys/config/labels/en.yml +++ b/digipipe/esys/esys/config/labels/en.yml @@ -1,7 +1,7 @@ # oil: Oil Raises error as "oil" is in "boiler" -> duplicate mappings biomass: Biomass biomass-biogas_plant: Biogas plant -biomass-shortage: Biomass shortage +biomass-import: Biomass Import biogas: Biogas biogas-biogas_upgrading_plant: Biogas upgrading plant biogas-bpchp_central: Biogas central CHP @@ -49,7 +49,7 @@ solar-pv_rooftop: PV rooftop solar-thermalcollector_central: Heat cen. solar thermal collector solar-thermalcollector_decentral: Heat dec. solar thermal collector wind-onshore: Wind on -wood-shortage: Wood shortage +wood-import: Wood Import wood-extchp_central: Wood central CHP wood-extchp_decentral: Wood decentral CHP -lignite-shortage: Lignite shortage +lignite-import: Lignite Import diff --git a/digipipe/esys/esys/model/component_attrs_update.yml b/digipipe/esys/esys/model/component_attrs_update.yml index 40161449..f9a42760 100644 --- a/digipipe/esys/esys/model/component_attrs_update.yml +++ b/digipipe/esys/esys/model/component_attrs_update.yml @@ -371,9 +371,9 @@ ch4-import: # Bus "wood": -wood-shortage: +wood-import: carrier: wood - tech: shortage + tech: import type: shortage foreign_keys: bus: wood @@ -384,9 +384,9 @@ wood-shortage: # Bus "lignite": -lignite-shortage: +lignite-import: carrier: lignite - tech: shortage + tech: import type: shortage foreign_keys: bus: lignite @@ -399,7 +399,7 @@ lignite-shortage: biomass-shortage: carrier: biomass - tech: shortage + tech: import type: shortage foreign_keys: bus: biomass diff --git a/digipipe/esys/esys/model/foreign_keys_update.yml b/digipipe/esys/esys/model/foreign_keys_update.yml index 75b1961e..22bda146 100644 --- a/digipipe/esys/esys/model/foreign_keys_update.yml +++ b/digipipe/esys/esys/model/foreign_keys_update.yml @@ -1,5 +1,5 @@ 'bus': [ - 'biomass-shortage', + 'biomass-import', 'ch4-import', 'electricity-bev_charging', 'electricity-large_scale_battery', @@ -22,8 +22,8 @@ 'heat_decentral-demand_cts', 'heat_decentral-demand_ind', 'heat_decentral-storage', - 'wood-shortage', - 'lignite-shortage', + 'wood-import', + 'lignite-import', 'solar-pv_ground', 'solar-pv_rooftop', 'solar-thermalcollector_central', diff --git a/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml b/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml index 74442c15..772e35b7 100644 --- a/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml +++ b/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml @@ -11,7 +11,7 @@ busses: # - h2 components: - - biomass-shortage + - biomass-import - electricity-import - electricity-export - electricity-bev_charging diff --git a/digipipe/esys/esys/model/model_structure/model_structure_full.yml b/digipipe/esys/esys/model/model_structure/model_structure_full.yml index 8babe91d..5c149a13 100644 --- a/digipipe/esys/esys/model/model_structure/model_structure_full.yml +++ b/digipipe/esys/esys/model/model_structure/model_structure_full.yml @@ -39,7 +39,7 @@ components: - ch4-extchp_decentral - biomass-biogas_plant - - biomass-shortage + - biomass-import - biogas-bpchp_central - biogas-bpchp_decentral @@ -59,9 +59,9 @@ components: - wood-oven - wood-extchp_central - wood-extchp_decentral - - wood-shortage + - wood-import - - lignite-shortage + - lignite-import - lignite-oven - heat_central-demand_hh From 9ee6aefcbd05ead171a179fcd8dfc865e0221cf6 Mon Sep 17 00:00:00 2001 From: MaGering Date: Thu, 31 Aug 2023 21:31:19 +0200 Subject: [PATCH 02/20] Add heat excess --- digipipe/esys/esys/config/labels/de.yml | 2 ++ digipipe/esys/esys/config/labels/en.yml | 2 ++ .../esys/model/component_attrs_update.yml | 20 +++++++++++++++++++ .../esys/esys/model/foreign_keys_update.yml | 2 ++ .../model_structure/model_structure_full.yml | 2 ++ 5 files changed, 28 insertions(+) diff --git a/digipipe/esys/esys/config/labels/de.yml b/digipipe/esys/esys/config/labels/de.yml index 878b1e2b..d0fbbdcc 100644 --- a/digipipe/esys/esys/config/labels/de.yml +++ b/digipipe/esys/esys/config/labels/de.yml @@ -38,10 +38,12 @@ heat_central-demand_hh: zen. Wärmebedarf HH heat_central-demand_cts: zen. Wärmebedarf GHD heat_central-demand_ind: zen. Wärmebedarf I heat_central-storage: zen. Wärmespeicher +heat_central-excess: zen. Wärmeüberschuss heat_decentral-demand_hh: dez. Wärmebedarf HH heat_decentral-demand_cts: dez. Wärmebedarf GHD heat_decentral-demand_ind: dez. Wärmebedarf I heat_decentral-storage: dez. Wärmespeicher +heat_decentral-excess: dez. Wärmeüberschuss hydro-reservoir: Reservoir hydro-ror: Laufwasserkraft lignite: Braunkohle diff --git a/digipipe/esys/esys/config/labels/en.yml b/digipipe/esys/esys/config/labels/en.yml index 40a9c342..b6575fdb 100644 --- a/digipipe/esys/esys/config/labels/en.yml +++ b/digipipe/esys/esys/config/labels/en.yml @@ -39,10 +39,12 @@ heat_central-demand_hh: Heat cen. demand HH heat_central-demand_cts: Heat cen. demand CTS heat_central-demand_ind: Heat cen. demand IND heat_central-storage: Heat cen. storage +heat_central-excess: Heat cen. excess heat_decentral-demand_hh: Heat dec. demand HH heat_decentral-demand_cts: Heat dec. demand CTS heat_decentral-demand_ind: Heat dec. demand IND heat_decentral-storage: Heat dec. storage +heat_decentral-excess: Heat dec. excess hydro-ror: Hydro ROR solar-pv_ground: PV ground solar-pv_rooftop: PV rooftop diff --git a/digipipe/esys/esys/model/component_attrs_update.yml b/digipipe/esys/esys/model/component_attrs_update.yml index f9a42760..2e8a2ae3 100644 --- a/digipipe/esys/esys/model/component_attrs_update.yml +++ b/digipipe/esys/esys/model/component_attrs_update.yml @@ -264,6 +264,16 @@ heat_central-storage: input_parameters: "{}" output_parameters: "{}" +heat_central-excess: + carrier: heat_central + tech: excess + type: excess + foreign_keys: + bus: heat_central + defaults: + marginal_cost: 0 + input_parameters: "{}" + # Bus "decentral heat": @@ -354,6 +364,16 @@ heat_decentral-storage: input_parameters: "{}" output_parameters: "{}" +heat_decentral-excess: + carrier: heat_decentral + tech: excess + type: excess + foreign_keys: + bus: heat_decentral + defaults: + marginal_cost: 0 + input_parameters: "{}" + # Bus "ch4": diff --git a/digipipe/esys/esys/model/foreign_keys_update.yml b/digipipe/esys/esys/model/foreign_keys_update.yml index 22bda146..097a1c3a 100644 --- a/digipipe/esys/esys/model/foreign_keys_update.yml +++ b/digipipe/esys/esys/model/foreign_keys_update.yml @@ -18,10 +18,12 @@ 'heat_central-demand_cts', 'heat_central-demand_ind', 'heat_central-storage', + 'heat_central-excess', 'heat_decentral-demand_hh', 'heat_decentral-demand_cts', 'heat_decentral-demand_ind', 'heat_decentral-storage', + 'heat_decentral-excess', 'wood-import', 'lignite-import', 'solar-pv_ground', diff --git a/digipipe/esys/esys/model/model_structure/model_structure_full.yml b/digipipe/esys/esys/model/model_structure/model_structure_full.yml index 5c149a13..e1870943 100644 --- a/digipipe/esys/esys/model/model_structure/model_structure_full.yml +++ b/digipipe/esys/esys/model/model_structure/model_structure_full.yml @@ -68,11 +68,13 @@ components: - heat_central-demand_cts - heat_central-demand_ind - heat_central-storage + - heat_central-excess - heat_decentral-demand_hh - heat_decentral-demand_cts - heat_decentral-demand_ind - heat_decentral-storage + - heat_decentral-excess - solar-pv_ground - solar-pv_rooftop From c6cf19c8c32114b5eaa371fcf79bb3a06d2502eb Mon Sep 17 00:00:00 2001 From: MaGering Date: Thu, 31 Aug 2023 21:31:56 +0200 Subject: [PATCH 03/20] Add ch4 excess --- digipipe/esys/esys/config/labels/de.yml | 1 + digipipe/esys/esys/config/labels/en.yml | 1 + digipipe/esys/esys/model/component_attrs_update.yml | 9 +++++++++ digipipe/esys/esys/model/foreign_keys_update.yml | 1 + .../model/model_structure/model_structure_el_only.yml | 1 + .../esys/model/model_structure/model_structure_full.yml | 1 + 6 files changed, 14 insertions(+) diff --git a/digipipe/esys/esys/config/labels/de.yml b/digipipe/esys/esys/config/labels/de.yml index d0fbbdcc..5f49d1e0 100644 --- a/digipipe/esys/esys/config/labels/de.yml +++ b/digipipe/esys/esys/config/labels/de.yml @@ -13,6 +13,7 @@ ch4-extchp_central: CH4 zentrale GUD ch4-extchp_decentral: CH4 dezentrale GUD ch4-gt: CH4 GT ch4-import: CH4 Import +ch4-excess: CH4 Überschuss electricity-bev_charging: BEV electricity-demand_hh: Strombedarf HH electricity-demand_cts: Strombedarf GHD diff --git a/digipipe/esys/esys/config/labels/en.yml b/digipipe/esys/esys/config/labels/en.yml index b6575fdb..81d1e1fc 100644 --- a/digipipe/esys/esys/config/labels/en.yml +++ b/digipipe/esys/esys/config/labels/en.yml @@ -13,6 +13,7 @@ ch4-extchp_central: CH4 central CCGT ch4-extchp_decentral: CH4 decentral CCGT ch4-gt: CH4 GT ch4-import: CH4 import +ch4-excess: CH4 excess electricity-bev_charging: BEV charging electricity-demand_hh: El. demand HH electricity-demand_cts: El. demand CTS diff --git a/digipipe/esys/esys/model/component_attrs_update.yml b/digipipe/esys/esys/model/component_attrs_update.yml index 2e8a2ae3..2922029c 100644 --- a/digipipe/esys/esys/model/component_attrs_update.yml +++ b/digipipe/esys/esys/model/component_attrs_update.yml @@ -387,6 +387,15 @@ ch4-import: defaults: output_parameters: "{}" +ch4-excess: + carrier: ch4 + tech: excess + type: excess + foreign_keys: + bus: ch4 + defaults: + output_parameters: "{}" + # Bus "wood": diff --git a/digipipe/esys/esys/model/foreign_keys_update.yml b/digipipe/esys/esys/model/foreign_keys_update.yml index 097a1c3a..7ffc8d59 100644 --- a/digipipe/esys/esys/model/foreign_keys_update.yml +++ b/digipipe/esys/esys/model/foreign_keys_update.yml @@ -1,6 +1,7 @@ 'bus': [ 'biomass-import', 'ch4-import', + 'ch4-excess', 'electricity-bev_charging', 'electricity-large_scale_battery', 'electricity-small_scale_battery', diff --git a/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml b/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml index 772e35b7..e215ca28 100644 --- a/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml +++ b/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml @@ -23,6 +23,7 @@ components: - electricity-small_scale_battery - ch4-import + - ch4-excess - ch4-gt - biomass-biogas_plant diff --git a/digipipe/esys/esys/model/model_structure/model_structure_full.yml b/digipipe/esys/esys/model/model_structure/model_structure_full.yml index e1870943..03df5bce 100644 --- a/digipipe/esys/esys/model/model_structure/model_structure_full.yml +++ b/digipipe/esys/esys/model/model_structure/model_structure_full.yml @@ -30,6 +30,7 @@ components: - electricity-pth_decentral - ch4-import + - ch4-excess - ch4-boiler_central - ch4-boiler_decentral - ch4-bpchp_central From 82e3cf054fbcb925aceffb2fb06f380dadef52c4 Mon Sep 17 00:00:00 2001 From: MaGering Date: Thu, 31 Aug 2023 21:38:58 +0200 Subject: [PATCH 04/20] Add biomass excess --- digipipe/esys/esys/config/labels/de.yml | 1 + digipipe/esys/esys/config/labels/en.yml | 1 + digipipe/esys/esys/model/component_attrs_update.yml | 9 +++++++++ digipipe/esys/esys/model/foreign_keys_update.yml | 1 + .../model/model_structure/model_structure_el_only.yml | 1 + .../esys/model/model_structure/model_structure_full.yml | 1 + 6 files changed, 14 insertions(+) diff --git a/digipipe/esys/esys/config/labels/de.yml b/digipipe/esys/esys/config/labels/de.yml index 5f49d1e0..717dc76a 100644 --- a/digipipe/esys/esys/config/labels/de.yml +++ b/digipipe/esys/esys/config/labels/de.yml @@ -1,5 +1,6 @@ # oil: Öl Raises error as "oil" is in "boiler" -> duplicate mappings biomass: Biomasse +biomass-excess: Biomasse Überschuss biomass-biogas_plant: Biogasanlage biomass-import: Biomasse Import biogas: Biogas diff --git a/digipipe/esys/esys/config/labels/en.yml b/digipipe/esys/esys/config/labels/en.yml index 81d1e1fc..227bda71 100644 --- a/digipipe/esys/esys/config/labels/en.yml +++ b/digipipe/esys/esys/config/labels/en.yml @@ -1,5 +1,6 @@ # oil: Oil Raises error as "oil" is in "boiler" -> duplicate mappings biomass: Biomass +biomass-excess: Biomass excess biomass-biogas_plant: Biogas plant biomass-import: Biomass Import biogas: Biogas diff --git a/digipipe/esys/esys/model/component_attrs_update.yml b/digipipe/esys/esys/model/component_attrs_update.yml index 2922029c..cc3042df 100644 --- a/digipipe/esys/esys/model/component_attrs_update.yml +++ b/digipipe/esys/esys/model/component_attrs_update.yml @@ -435,6 +435,15 @@ biomass-shortage: defaults: output_parameters: "{}" +biomass-excess: + carrier: biomass + tech: excess + type: excess + foreign_keys: + bus: biomass + defaults: + output_parameters: "{}" + biomass-biogas_plant: carrier: biomass tech: biogas_plant diff --git a/digipipe/esys/esys/model/foreign_keys_update.yml b/digipipe/esys/esys/model/foreign_keys_update.yml index 7ffc8d59..199e6201 100644 --- a/digipipe/esys/esys/model/foreign_keys_update.yml +++ b/digipipe/esys/esys/model/foreign_keys_update.yml @@ -1,5 +1,6 @@ 'bus': [ 'biomass-import', + 'biomass-excess', 'ch4-import', 'ch4-excess', 'electricity-bev_charging', diff --git a/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml b/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml index e215ca28..cfff135f 100644 --- a/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml +++ b/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml @@ -26,6 +26,7 @@ components: - ch4-excess - ch4-gt + - biomass-excess - biomass-biogas_plant - biogas-biogas_upgrading_plant # - h2-cavern diff --git a/digipipe/esys/esys/model/model_structure/model_structure_full.yml b/digipipe/esys/esys/model/model_structure/model_structure_full.yml index 03df5bce..de4c1f6d 100644 --- a/digipipe/esys/esys/model/model_structure/model_structure_full.yml +++ b/digipipe/esys/esys/model/model_structure/model_structure_full.yml @@ -41,6 +41,7 @@ components: - biomass-biogas_plant - biomass-import + - biomass-excess - biogas-bpchp_central - biogas-bpchp_decentral From ce01ac7a350a550193065d5a85326aa8e74e7946 Mon Sep 17 00:00:00 2001 From: MaGering Date: Thu, 31 Aug 2023 21:39:33 +0200 Subject: [PATCH 05/20] Add biogas excess --- digipipe/esys/esys/config/labels/de.yml | 1 + digipipe/esys/esys/config/labels/en.yml | 1 + digipipe/esys/esys/model/component_attrs_update.yml | 9 +++++++++ digipipe/esys/esys/model/foreign_keys_update.yml | 1 + .../model/model_structure/model_structure_el_only.yml | 1 + .../esys/model/model_structure/model_structure_full.yml | 1 + 6 files changed, 14 insertions(+) diff --git a/digipipe/esys/esys/config/labels/de.yml b/digipipe/esys/esys/config/labels/de.yml index 717dc76a..ede36f92 100644 --- a/digipipe/esys/esys/config/labels/de.yml +++ b/digipipe/esys/esys/config/labels/de.yml @@ -4,6 +4,7 @@ biomass-excess: Biomasse Überschuss biomass-biogas_plant: Biogasanlage biomass-import: Biomasse Import biogas: Biogas +biogas-excess: Biogas Überschuss biogas-biogas_upgrading_plant: Biogas-Aufbereitungsanlage biogas-bpchp_central: Biogas zentrale KWK biogas-bpchp_decentral: Biogas dezentrale KWK diff --git a/digipipe/esys/esys/config/labels/en.yml b/digipipe/esys/esys/config/labels/en.yml index 227bda71..7cb3fa9d 100644 --- a/digipipe/esys/esys/config/labels/en.yml +++ b/digipipe/esys/esys/config/labels/en.yml @@ -4,6 +4,7 @@ biomass-excess: Biomass excess biomass-biogas_plant: Biogas plant biomass-import: Biomass Import biogas: Biogas +biogas-excess: Biogas excess biogas-biogas_upgrading_plant: Biogas upgrading plant biogas-bpchp_central: Biogas central CHP biogas-bpchp_decentral: Biogas decentral CHP diff --git a/digipipe/esys/esys/model/component_attrs_update.yml b/digipipe/esys/esys/model/component_attrs_update.yml index cc3042df..5f02b54b 100644 --- a/digipipe/esys/esys/model/component_attrs_update.yml +++ b/digipipe/esys/esys/model/component_attrs_update.yml @@ -458,6 +458,15 @@ biomass-biogas_plant: # Bus "biogas": +biogas-excess: + carrier: biogas + tech: excess + type: excess + foreign_keys: + bus: biogas + defaults: + output_parameters: "{}" + biogas-biogas_upgrading_plant: carrier: biogas tech: biogas_upgrading_plant diff --git a/digipipe/esys/esys/model/foreign_keys_update.yml b/digipipe/esys/esys/model/foreign_keys_update.yml index 199e6201..1c9a2ec9 100644 --- a/digipipe/esys/esys/model/foreign_keys_update.yml +++ b/digipipe/esys/esys/model/foreign_keys_update.yml @@ -1,6 +1,7 @@ 'bus': [ 'biomass-import', 'biomass-excess', + 'biogas-excess', 'ch4-import', 'ch4-excess', 'electricity-bev_charging', diff --git a/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml b/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml index cfff135f..eeefe307 100644 --- a/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml +++ b/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml @@ -28,6 +28,7 @@ components: - biomass-excess - biomass-biogas_plant + - biogas-excess - biogas-biogas_upgrading_plant # - h2-cavern # - h2-demand diff --git a/digipipe/esys/esys/model/model_structure/model_structure_full.yml b/digipipe/esys/esys/model/model_structure/model_structure_full.yml index de4c1f6d..c78791b0 100644 --- a/digipipe/esys/esys/model/model_structure/model_structure_full.yml +++ b/digipipe/esys/esys/model/model_structure/model_structure_full.yml @@ -43,6 +43,7 @@ components: - biomass-import - biomass-excess + - biogas-excess - biogas-bpchp_central - biogas-bpchp_decentral - biogas-biogas_upgrading_plant From e93761f0f3cf06351b2193250505c4c5d4045f8a Mon Sep 17 00:00:00 2001 From: MaGering Date: Thu, 31 Aug 2023 21:40:17 +0200 Subject: [PATCH 06/20] Add lignite excess --- digipipe/esys/esys/config/labels/de.yml | 1 + digipipe/esys/esys/config/labels/en.yml | 1 + digipipe/esys/esys/model/component_attrs_update.yml | 9 +++++++++ digipipe/esys/esys/model/foreign_keys_update.yml | 1 + .../esys/model/model_structure/model_structure_full.yml | 1 + 5 files changed, 13 insertions(+) diff --git a/digipipe/esys/esys/config/labels/de.yml b/digipipe/esys/esys/config/labels/de.yml index ede36f92..9d64b870 100644 --- a/digipipe/esys/esys/config/labels/de.yml +++ b/digipipe/esys/esys/config/labels/de.yml @@ -50,6 +50,7 @@ heat_decentral-excess: dez. Wärmeüberschuss hydro-reservoir: Reservoir hydro-ror: Laufwasserkraft lignite: Braunkohle +lignite-excess: Braunkohle Überschuss lignite-import: Braunkohle Import nuclear-st: Kernkraftwerk hard coal: Steinkohle diff --git a/digipipe/esys/esys/config/labels/en.yml b/digipipe/esys/esys/config/labels/en.yml index 7cb3fa9d..a240fea0 100644 --- a/digipipe/esys/esys/config/labels/en.yml +++ b/digipipe/esys/esys/config/labels/en.yml @@ -58,3 +58,4 @@ wood-import: Wood Import wood-extchp_central: Wood central CHP wood-extchp_decentral: Wood decentral CHP lignite-import: Lignite Import +lignite-excess: Lignite excess diff --git a/digipipe/esys/esys/model/component_attrs_update.yml b/digipipe/esys/esys/model/component_attrs_update.yml index 5f02b54b..98a3b9df 100644 --- a/digipipe/esys/esys/model/component_attrs_update.yml +++ b/digipipe/esys/esys/model/component_attrs_update.yml @@ -422,6 +422,15 @@ lignite-import: defaults: output_parameters: "{}" +lignite-excess: + carrier: lignite + tech: excess + type: excess + foreign_keys: + bus: lignite + defaults: + output_parameters: "{}" + # Bus "biomass": diff --git a/digipipe/esys/esys/model/foreign_keys_update.yml b/digipipe/esys/esys/model/foreign_keys_update.yml index 1c9a2ec9..f3281106 100644 --- a/digipipe/esys/esys/model/foreign_keys_update.yml +++ b/digipipe/esys/esys/model/foreign_keys_update.yml @@ -29,6 +29,7 @@ 'heat_decentral-excess', 'wood-import', 'lignite-import', + 'lignite-excess', 'solar-pv_ground', 'solar-pv_rooftop', 'solar-thermalcollector_central', diff --git a/digipipe/esys/esys/model/model_structure/model_structure_full.yml b/digipipe/esys/esys/model/model_structure/model_structure_full.yml index c78791b0..2256dd1b 100644 --- a/digipipe/esys/esys/model/model_structure/model_structure_full.yml +++ b/digipipe/esys/esys/model/model_structure/model_structure_full.yml @@ -65,6 +65,7 @@ components: - wood-import - lignite-import + - lignite-excess - lignite-oven - heat_central-demand_hh From 0ec41615d85da7950d9a0310b6579c0eb877f97d Mon Sep 17 00:00:00 2001 From: MaGering Date: Thu, 31 Aug 2023 21:40:36 +0200 Subject: [PATCH 07/20] Add wood excess --- digipipe/esys/esys/config/labels/de.yml | 1 + digipipe/esys/esys/config/labels/en.yml | 1 + digipipe/esys/esys/model/component_attrs_update.yml | 9 +++++++++ digipipe/esys/esys/model/foreign_keys_update.yml | 1 + .../esys/model/model_structure/model_structure_full.yml | 1 + 5 files changed, 13 insertions(+) diff --git a/digipipe/esys/esys/config/labels/de.yml b/digipipe/esys/esys/config/labels/de.yml index 9d64b870..29c03c46 100644 --- a/digipipe/esys/esys/config/labels/de.yml +++ b/digipipe/esys/esys/config/labels/de.yml @@ -55,6 +55,7 @@ lignite-import: Braunkohle Import nuclear-st: Kernkraftwerk hard coal: Steinkohle wood: Holz +wood-excess: Holz Überschuss wood-extchp_central: Holz zentrale KWK wood-extchp_decentral: Holz dezentrale KWK wood-import: Holz Import diff --git a/digipipe/esys/esys/config/labels/en.yml b/digipipe/esys/esys/config/labels/en.yml index a240fea0..62224285 100644 --- a/digipipe/esys/esys/config/labels/en.yml +++ b/digipipe/esys/esys/config/labels/en.yml @@ -55,6 +55,7 @@ solar-thermalcollector_central: Heat cen. solar thermal collector solar-thermalcollector_decentral: Heat dec. solar thermal collector wind-onshore: Wind on wood-import: Wood Import +wood-excess: Wood excess wood-extchp_central: Wood central CHP wood-extchp_decentral: Wood decentral CHP lignite-import: Lignite Import diff --git a/digipipe/esys/esys/model/component_attrs_update.yml b/digipipe/esys/esys/model/component_attrs_update.yml index 98a3b9df..e860b76b 100644 --- a/digipipe/esys/esys/model/component_attrs_update.yml +++ b/digipipe/esys/esys/model/component_attrs_update.yml @@ -409,6 +409,15 @@ wood-import: defaults: output_parameters: "{}" +wood-excess: + carrier: wood + tech: excess + type: excess + foreign_keys: + bus: wood + defaults: + output_parameters: "{}" + # Bus "lignite": diff --git a/digipipe/esys/esys/model/foreign_keys_update.yml b/digipipe/esys/esys/model/foreign_keys_update.yml index f3281106..5dd4fd6c 100644 --- a/digipipe/esys/esys/model/foreign_keys_update.yml +++ b/digipipe/esys/esys/model/foreign_keys_update.yml @@ -28,6 +28,7 @@ 'heat_decentral-storage', 'heat_decentral-excess', 'wood-import', + 'wood-excess', 'lignite-import', 'lignite-excess', 'solar-pv_ground', diff --git a/digipipe/esys/esys/model/model_structure/model_structure_full.yml b/digipipe/esys/esys/model/model_structure/model_structure_full.yml index 2256dd1b..779a4c22 100644 --- a/digipipe/esys/esys/model/model_structure/model_structure_full.yml +++ b/digipipe/esys/esys/model/model_structure/model_structure_full.yml @@ -63,6 +63,7 @@ components: - wood-extchp_central - wood-extchp_decentral - wood-import + - wood-excess - lignite-import - lignite-excess From 65c79127027ce7ef8e1f6fcf5beecf6a3e0a3cee Mon Sep 17 00:00:00 2001 From: MaGering Date: Thu, 31 Aug 2023 21:43:57 +0200 Subject: [PATCH 08/20] Remove high slack costs on shortages --- digipipe/esys/esys/config/write_default_scalars.yml | 7 ------- digipipe/esys/scripts/write_default_scalars.py | 3 --- 2 files changed, 10 deletions(-) diff --git a/digipipe/esys/esys/config/write_default_scalars.yml b/digipipe/esys/esys/config/write_default_scalars.yml index e439e6eb..2c227082 100644 --- a/digipipe/esys/esys/config/write_default_scalars.yml +++ b/digipipe/esys/esys/config/write_default_scalars.yml @@ -90,13 +90,6 @@ write_default_scalars: "which": "empty_dict", "var_unit": "None", } - marginal_cost_shortage: { - "var_name": "marginal_cost", - "type": shortage, - "tech": None, - "which": "high_costs", - "var_unit": "EUR/MWh", - } marginal_cost_volatile: { "var_name": "marginal_cost", "type": volatile, diff --git a/digipipe/esys/scripts/write_default_scalars.py b/digipipe/esys/scripts/write_default_scalars.py index 6caf852e..4646f60f 100644 --- a/digipipe/esys/scripts/write_default_scalars.py +++ b/digipipe/esys/scripts/write_default_scalars.py @@ -65,9 +65,6 @@ def get_var_value_and_comment(which): elif which == "empty": var_value = np.nan comment = "Empty" - elif which == "high_costs": - var_value = 1000000000 - comment = "High slack cost on shortage" elif which == "false": var_value = False comment = "Empty" From ce179ceb8ac5408a930360ca64c3d04991e7e624 Mon Sep 17 00:00:00 2001 From: MaGering Date: Thu, 31 Aug 2023 21:45:59 +0200 Subject: [PATCH 09/20] Set excess revenues to zero to prevent export --- digipipe/esys/esys/config/write_default_scalars.yml | 7 +++++++ digipipe/esys/scripts/write_default_scalars.py | 3 +++ 2 files changed, 10 insertions(+) diff --git a/digipipe/esys/esys/config/write_default_scalars.yml b/digipipe/esys/esys/config/write_default_scalars.yml index 2c227082..d66fd08e 100644 --- a/digipipe/esys/esys/config/write_default_scalars.yml +++ b/digipipe/esys/esys/config/write_default_scalars.yml @@ -97,6 +97,13 @@ write_default_scalars: "which": "zeros", "var_unit": "EUR/MWh", } + marginal_cost_excess: { + "var_name": "marginal_cost", + "type": excess, + "tech": excess, + "which": "excess_costs", + "var_unit": "EUR/MWh", + } storage_capacity: { "var_name": "storage_capacity", "type": None, diff --git a/digipipe/esys/scripts/write_default_scalars.py b/digipipe/esys/scripts/write_default_scalars.py index 4646f60f..a375e7d0 100644 --- a/digipipe/esys/scripts/write_default_scalars.py +++ b/digipipe/esys/scripts/write_default_scalars.py @@ -74,6 +74,9 @@ def get_var_value_and_comment(which): elif which == "variable_costs": var_value = '{"variable_costs": 1e-7}' comment = "Own assumption to prevent hidden curtailment" + elif which == "excess_costs": + var_value = 0 + comment = "No export of this carrier" elif which == "emissions_not_modeled": var_value = 0 comment = "No fossils in 2045 in the modelled sectors." From cc1443bae7a10d526769555544ff8038d27c37ea Mon Sep 17 00:00:00 2001 From: MaGering Date: Thu, 31 Aug 2023 21:53:05 +0200 Subject: [PATCH 10/20] Fix biomass import in component_attrs_update.yml --- digipipe/esys/esys/model/component_attrs_update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/digipipe/esys/esys/model/component_attrs_update.yml b/digipipe/esys/esys/model/component_attrs_update.yml index e860b76b..54d6701e 100644 --- a/digipipe/esys/esys/model/component_attrs_update.yml +++ b/digipipe/esys/esys/model/component_attrs_update.yml @@ -444,7 +444,7 @@ lignite-excess: # Bus "biomass": -biomass-shortage: +biomass-import: carrier: biomass tech: import type: shortage From be729cbaed3c385af51f5ed6069f3c4c8a03ff9c Mon Sep 17 00:00:00 2001 From: MaGering Date: Thu, 31 Aug 2023 22:29:58 +0200 Subject: [PATCH 11/20] Set high capacity of shortages / no limit to import --- digipipe/esys/esys/config/write_default_scalars.yml | 2 +- digipipe/esys/scripts/write_default_scalars.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/digipipe/esys/esys/config/write_default_scalars.yml b/digipipe/esys/esys/config/write_default_scalars.yml index d66fd08e..f83100ce 100644 --- a/digipipe/esys/esys/config/write_default_scalars.yml +++ b/digipipe/esys/esys/config/write_default_scalars.yml @@ -38,7 +38,7 @@ write_default_scalars: "var_name": "capacity", "type": shortage, "tech": None, - "which": "empty", + "which": "high_capacity", "var_unit": "MW", } capacity_excess: { diff --git a/digipipe/esys/scripts/write_default_scalars.py b/digipipe/esys/scripts/write_default_scalars.py index a375e7d0..a90f19d8 100644 --- a/digipipe/esys/scripts/write_default_scalars.py +++ b/digipipe/esys/scripts/write_default_scalars.py @@ -65,6 +65,9 @@ def get_var_value_and_comment(which): elif which == "empty": var_value = np.nan comment = "Empty" + elif which == "high_capacity": + var_value = 100000000 + comment = "No limit for import" elif which == "false": var_value = False comment = "Empty" From bfb6eaf4dc6c6689d0f5e8d79884607c8cc363a9 Mon Sep 17 00:00:00 2001 From: MaGering Date: Thu, 31 Aug 2023 22:37:26 +0200 Subject: [PATCH 12/20] Set zeros as dummy values for amount --- digipipe/esys/esys/config/write_default_scalars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/digipipe/esys/esys/config/write_default_scalars.yml b/digipipe/esys/esys/config/write_default_scalars.yml index f83100ce..8d38f4c4 100644 --- a/digipipe/esys/esys/config/write_default_scalars.yml +++ b/digipipe/esys/esys/config/write_default_scalars.yml @@ -52,7 +52,7 @@ write_default_scalars: "var_name": "amount", "type": None, "tech": None, - "which": "empty", + "which": "zeros", "var_unit": "MWh/a", } capacity_potential: { From 36320e94e6f8b0cf53b6000a375f1b1649fa03d1 Mon Sep 17 00:00:00 2001 From: MaGering Date: Thu, 31 Aug 2023 23:57:45 +0200 Subject: [PATCH 13/20] Revert "Add ch4 excess" This reverts commit c6cf19c8c32114b5eaa371fcf79bb3a06d2502eb. --- digipipe/esys/esys/config/labels/de.yml | 1 - digipipe/esys/esys/config/labels/en.yml | 1 - digipipe/esys/esys/model/component_attrs_update.yml | 9 --------- digipipe/esys/esys/model/foreign_keys_update.yml | 1 - .../model/model_structure/model_structure_el_only.yml | 1 - .../esys/model/model_structure/model_structure_full.yml | 1 - 6 files changed, 14 deletions(-) diff --git a/digipipe/esys/esys/config/labels/de.yml b/digipipe/esys/esys/config/labels/de.yml index 29c03c46..ec496392 100644 --- a/digipipe/esys/esys/config/labels/de.yml +++ b/digipipe/esys/esys/config/labels/de.yml @@ -15,7 +15,6 @@ ch4-extchp_central: CH4 zentrale GUD ch4-extchp_decentral: CH4 dezentrale GUD ch4-gt: CH4 GT ch4-import: CH4 Import -ch4-excess: CH4 Überschuss electricity-bev_charging: BEV electricity-demand_hh: Strombedarf HH electricity-demand_cts: Strombedarf GHD diff --git a/digipipe/esys/esys/config/labels/en.yml b/digipipe/esys/esys/config/labels/en.yml index 62224285..c1a37b8b 100644 --- a/digipipe/esys/esys/config/labels/en.yml +++ b/digipipe/esys/esys/config/labels/en.yml @@ -15,7 +15,6 @@ ch4-extchp_central: CH4 central CCGT ch4-extchp_decentral: CH4 decentral CCGT ch4-gt: CH4 GT ch4-import: CH4 import -ch4-excess: CH4 excess electricity-bev_charging: BEV charging electricity-demand_hh: El. demand HH electricity-demand_cts: El. demand CTS diff --git a/digipipe/esys/esys/model/component_attrs_update.yml b/digipipe/esys/esys/model/component_attrs_update.yml index 54d6701e..36522918 100644 --- a/digipipe/esys/esys/model/component_attrs_update.yml +++ b/digipipe/esys/esys/model/component_attrs_update.yml @@ -387,15 +387,6 @@ ch4-import: defaults: output_parameters: "{}" -ch4-excess: - carrier: ch4 - tech: excess - type: excess - foreign_keys: - bus: ch4 - defaults: - output_parameters: "{}" - # Bus "wood": diff --git a/digipipe/esys/esys/model/foreign_keys_update.yml b/digipipe/esys/esys/model/foreign_keys_update.yml index 5dd4fd6c..db6203a6 100644 --- a/digipipe/esys/esys/model/foreign_keys_update.yml +++ b/digipipe/esys/esys/model/foreign_keys_update.yml @@ -3,7 +3,6 @@ 'biomass-excess', 'biogas-excess', 'ch4-import', - 'ch4-excess', 'electricity-bev_charging', 'electricity-large_scale_battery', 'electricity-small_scale_battery', diff --git a/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml b/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml index eeefe307..30c51e16 100644 --- a/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml +++ b/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml @@ -23,7 +23,6 @@ components: - electricity-small_scale_battery - ch4-import - - ch4-excess - ch4-gt - biomass-excess diff --git a/digipipe/esys/esys/model/model_structure/model_structure_full.yml b/digipipe/esys/esys/model/model_structure/model_structure_full.yml index 779a4c22..c75ea743 100644 --- a/digipipe/esys/esys/model/model_structure/model_structure_full.yml +++ b/digipipe/esys/esys/model/model_structure/model_structure_full.yml @@ -30,7 +30,6 @@ components: - electricity-pth_decentral - ch4-import - - ch4-excess - ch4-boiler_central - ch4-boiler_decentral - ch4-bpchp_central From 3b3380af20a8d63e0deffbae6895b8395b3b8a51 Mon Sep 17 00:00:00 2001 From: MaGering Date: Thu, 31 Aug 2023 23:58:48 +0200 Subject: [PATCH 14/20] Revert "Add biomass excess" This reverts commit 82e3cf054fbcb925aceffb2fb06f380dadef52c4. --- digipipe/esys/esys/config/labels/de.yml | 1 - digipipe/esys/esys/config/labels/en.yml | 1 - digipipe/esys/esys/model/component_attrs_update.yml | 9 --------- digipipe/esys/esys/model/foreign_keys_update.yml | 1 - .../model/model_structure/model_structure_el_only.yml | 1 - .../esys/model/model_structure/model_structure_full.yml | 1 - 6 files changed, 14 deletions(-) diff --git a/digipipe/esys/esys/config/labels/de.yml b/digipipe/esys/esys/config/labels/de.yml index ec496392..0141c62e 100644 --- a/digipipe/esys/esys/config/labels/de.yml +++ b/digipipe/esys/esys/config/labels/de.yml @@ -1,6 +1,5 @@ # oil: Öl Raises error as "oil" is in "boiler" -> duplicate mappings biomass: Biomasse -biomass-excess: Biomasse Überschuss biomass-biogas_plant: Biogasanlage biomass-import: Biomasse Import biogas: Biogas diff --git a/digipipe/esys/esys/config/labels/en.yml b/digipipe/esys/esys/config/labels/en.yml index c1a37b8b..07bf6916 100644 --- a/digipipe/esys/esys/config/labels/en.yml +++ b/digipipe/esys/esys/config/labels/en.yml @@ -1,6 +1,5 @@ # oil: Oil Raises error as "oil" is in "boiler" -> duplicate mappings biomass: Biomass -biomass-excess: Biomass excess biomass-biogas_plant: Biogas plant biomass-import: Biomass Import biogas: Biogas diff --git a/digipipe/esys/esys/model/component_attrs_update.yml b/digipipe/esys/esys/model/component_attrs_update.yml index 36522918..6412a8c9 100644 --- a/digipipe/esys/esys/model/component_attrs_update.yml +++ b/digipipe/esys/esys/model/component_attrs_update.yml @@ -444,15 +444,6 @@ biomass-import: defaults: output_parameters: "{}" -biomass-excess: - carrier: biomass - tech: excess - type: excess - foreign_keys: - bus: biomass - defaults: - output_parameters: "{}" - biomass-biogas_plant: carrier: biomass tech: biogas_plant diff --git a/digipipe/esys/esys/model/foreign_keys_update.yml b/digipipe/esys/esys/model/foreign_keys_update.yml index db6203a6..f1de7e32 100644 --- a/digipipe/esys/esys/model/foreign_keys_update.yml +++ b/digipipe/esys/esys/model/foreign_keys_update.yml @@ -1,6 +1,5 @@ 'bus': [ 'biomass-import', - 'biomass-excess', 'biogas-excess', 'ch4-import', 'electricity-bev_charging', diff --git a/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml b/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml index 30c51e16..a07da9fb 100644 --- a/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml +++ b/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml @@ -25,7 +25,6 @@ components: - ch4-import - ch4-gt - - biomass-excess - biomass-biogas_plant - biogas-excess - biogas-biogas_upgrading_plant diff --git a/digipipe/esys/esys/model/model_structure/model_structure_full.yml b/digipipe/esys/esys/model/model_structure/model_structure_full.yml index c75ea743..7bd31881 100644 --- a/digipipe/esys/esys/model/model_structure/model_structure_full.yml +++ b/digipipe/esys/esys/model/model_structure/model_structure_full.yml @@ -40,7 +40,6 @@ components: - biomass-biogas_plant - biomass-import - - biomass-excess - biogas-excess - biogas-bpchp_central From 10daa9795f2f6397b55c49a87f979a990d6213d5 Mon Sep 17 00:00:00 2001 From: MaGering Date: Thu, 31 Aug 2023 23:59:29 +0200 Subject: [PATCH 15/20] Revert "Add biogas excess" This reverts commit ce01ac7a350a550193065d5a85326aa8e74e7946. --- digipipe/esys/esys/config/labels/de.yml | 1 - digipipe/esys/esys/config/labels/en.yml | 1 - digipipe/esys/esys/model/component_attrs_update.yml | 9 --------- digipipe/esys/esys/model/foreign_keys_update.yml | 1 - .../model/model_structure/model_structure_el_only.yml | 1 - .../esys/model/model_structure/model_structure_full.yml | 1 - 6 files changed, 14 deletions(-) diff --git a/digipipe/esys/esys/config/labels/de.yml b/digipipe/esys/esys/config/labels/de.yml index 0141c62e..fbf09a7d 100644 --- a/digipipe/esys/esys/config/labels/de.yml +++ b/digipipe/esys/esys/config/labels/de.yml @@ -3,7 +3,6 @@ biomass: Biomasse biomass-biogas_plant: Biogasanlage biomass-import: Biomasse Import biogas: Biogas -biogas-excess: Biogas Überschuss biogas-biogas_upgrading_plant: Biogas-Aufbereitungsanlage biogas-bpchp_central: Biogas zentrale KWK biogas-bpchp_decentral: Biogas dezentrale KWK diff --git a/digipipe/esys/esys/config/labels/en.yml b/digipipe/esys/esys/config/labels/en.yml index 07bf6916..65d6c6c1 100644 --- a/digipipe/esys/esys/config/labels/en.yml +++ b/digipipe/esys/esys/config/labels/en.yml @@ -3,7 +3,6 @@ biomass: Biomass biomass-biogas_plant: Biogas plant biomass-import: Biomass Import biogas: Biogas -biogas-excess: Biogas excess biogas-biogas_upgrading_plant: Biogas upgrading plant biogas-bpchp_central: Biogas central CHP biogas-bpchp_decentral: Biogas decentral CHP diff --git a/digipipe/esys/esys/model/component_attrs_update.yml b/digipipe/esys/esys/model/component_attrs_update.yml index 6412a8c9..92fa6eb9 100644 --- a/digipipe/esys/esys/model/component_attrs_update.yml +++ b/digipipe/esys/esys/model/component_attrs_update.yml @@ -458,15 +458,6 @@ biomass-biogas_plant: # Bus "biogas": -biogas-excess: - carrier: biogas - tech: excess - type: excess - foreign_keys: - bus: biogas - defaults: - output_parameters: "{}" - biogas-biogas_upgrading_plant: carrier: biogas tech: biogas_upgrading_plant diff --git a/digipipe/esys/esys/model/foreign_keys_update.yml b/digipipe/esys/esys/model/foreign_keys_update.yml index f1de7e32..b81f8469 100644 --- a/digipipe/esys/esys/model/foreign_keys_update.yml +++ b/digipipe/esys/esys/model/foreign_keys_update.yml @@ -1,6 +1,5 @@ 'bus': [ 'biomass-import', - 'biogas-excess', 'ch4-import', 'electricity-bev_charging', 'electricity-large_scale_battery', diff --git a/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml b/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml index a07da9fb..772e35b7 100644 --- a/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml +++ b/digipipe/esys/esys/model/model_structure/model_structure_el_only.yml @@ -26,7 +26,6 @@ components: - ch4-gt - biomass-biogas_plant - - biogas-excess - biogas-biogas_upgrading_plant # - h2-cavern # - h2-demand diff --git a/digipipe/esys/esys/model/model_structure/model_structure_full.yml b/digipipe/esys/esys/model/model_structure/model_structure_full.yml index 7bd31881..93dce9ea 100644 --- a/digipipe/esys/esys/model/model_structure/model_structure_full.yml +++ b/digipipe/esys/esys/model/model_structure/model_structure_full.yml @@ -41,7 +41,6 @@ components: - biomass-biogas_plant - biomass-import - - biogas-excess - biogas-bpchp_central - biogas-bpchp_decentral - biogas-biogas_upgrading_plant From 524573d297d9aa9bbd3c28737a4c413af4ac5f30 Mon Sep 17 00:00:00 2001 From: MaGering Date: Thu, 31 Aug 2023 23:59:42 +0200 Subject: [PATCH 16/20] Revert "Add lignite excess" This reverts commit e93761f0f3cf06351b2193250505c4c5d4045f8a. --- digipipe/esys/esys/config/labels/de.yml | 1 - digipipe/esys/esys/config/labels/en.yml | 1 - digipipe/esys/esys/model/component_attrs_update.yml | 9 --------- digipipe/esys/esys/model/foreign_keys_update.yml | 1 - .../esys/model/model_structure/model_structure_full.yml | 1 - 5 files changed, 13 deletions(-) diff --git a/digipipe/esys/esys/config/labels/de.yml b/digipipe/esys/esys/config/labels/de.yml index fbf09a7d..3a1e432d 100644 --- a/digipipe/esys/esys/config/labels/de.yml +++ b/digipipe/esys/esys/config/labels/de.yml @@ -47,7 +47,6 @@ heat_decentral-excess: dez. Wärmeüberschuss hydro-reservoir: Reservoir hydro-ror: Laufwasserkraft lignite: Braunkohle -lignite-excess: Braunkohle Überschuss lignite-import: Braunkohle Import nuclear-st: Kernkraftwerk hard coal: Steinkohle diff --git a/digipipe/esys/esys/config/labels/en.yml b/digipipe/esys/esys/config/labels/en.yml index 65d6c6c1..542949ed 100644 --- a/digipipe/esys/esys/config/labels/en.yml +++ b/digipipe/esys/esys/config/labels/en.yml @@ -56,4 +56,3 @@ wood-excess: Wood excess wood-extchp_central: Wood central CHP wood-extchp_decentral: Wood decentral CHP lignite-import: Lignite Import -lignite-excess: Lignite excess diff --git a/digipipe/esys/esys/model/component_attrs_update.yml b/digipipe/esys/esys/model/component_attrs_update.yml index 92fa6eb9..094c27f6 100644 --- a/digipipe/esys/esys/model/component_attrs_update.yml +++ b/digipipe/esys/esys/model/component_attrs_update.yml @@ -422,15 +422,6 @@ lignite-import: defaults: output_parameters: "{}" -lignite-excess: - carrier: lignite - tech: excess - type: excess - foreign_keys: - bus: lignite - defaults: - output_parameters: "{}" - # Bus "biomass": diff --git a/digipipe/esys/esys/model/foreign_keys_update.yml b/digipipe/esys/esys/model/foreign_keys_update.yml index b81f8469..19514cd0 100644 --- a/digipipe/esys/esys/model/foreign_keys_update.yml +++ b/digipipe/esys/esys/model/foreign_keys_update.yml @@ -27,7 +27,6 @@ 'wood-import', 'wood-excess', 'lignite-import', - 'lignite-excess', 'solar-pv_ground', 'solar-pv_rooftop', 'solar-thermalcollector_central', diff --git a/digipipe/esys/esys/model/model_structure/model_structure_full.yml b/digipipe/esys/esys/model/model_structure/model_structure_full.yml index 93dce9ea..313c59f3 100644 --- a/digipipe/esys/esys/model/model_structure/model_structure_full.yml +++ b/digipipe/esys/esys/model/model_structure/model_structure_full.yml @@ -63,7 +63,6 @@ components: - wood-excess - lignite-import - - lignite-excess - lignite-oven - heat_central-demand_hh From a5d9eacdf066572272dd8f87121a7bc428e0eb27 Mon Sep 17 00:00:00 2001 From: MaGering Date: Thu, 31 Aug 2023 23:59:59 +0200 Subject: [PATCH 17/20] Revert "Add wood excess" This reverts commit 0ec41615d85da7950d9a0310b6579c0eb877f97d. --- digipipe/esys/esys/config/labels/de.yml | 1 - digipipe/esys/esys/config/labels/en.yml | 1 - digipipe/esys/esys/model/component_attrs_update.yml | 9 --------- digipipe/esys/esys/model/foreign_keys_update.yml | 1 - .../esys/model/model_structure/model_structure_full.yml | 1 - 5 files changed, 13 deletions(-) diff --git a/digipipe/esys/esys/config/labels/de.yml b/digipipe/esys/esys/config/labels/de.yml index 3a1e432d..d0fbbdcc 100644 --- a/digipipe/esys/esys/config/labels/de.yml +++ b/digipipe/esys/esys/config/labels/de.yml @@ -51,7 +51,6 @@ lignite-import: Braunkohle Import nuclear-st: Kernkraftwerk hard coal: Steinkohle wood: Holz -wood-excess: Holz Überschuss wood-extchp_central: Holz zentrale KWK wood-extchp_decentral: Holz dezentrale KWK wood-import: Holz Import diff --git a/digipipe/esys/esys/config/labels/en.yml b/digipipe/esys/esys/config/labels/en.yml index 542949ed..b6575fdb 100644 --- a/digipipe/esys/esys/config/labels/en.yml +++ b/digipipe/esys/esys/config/labels/en.yml @@ -52,7 +52,6 @@ solar-thermalcollector_central: Heat cen. solar thermal collector solar-thermalcollector_decentral: Heat dec. solar thermal collector wind-onshore: Wind on wood-import: Wood Import -wood-excess: Wood excess wood-extchp_central: Wood central CHP wood-extchp_decentral: Wood decentral CHP lignite-import: Lignite Import diff --git a/digipipe/esys/esys/model/component_attrs_update.yml b/digipipe/esys/esys/model/component_attrs_update.yml index 094c27f6..c8cfa6b4 100644 --- a/digipipe/esys/esys/model/component_attrs_update.yml +++ b/digipipe/esys/esys/model/component_attrs_update.yml @@ -400,15 +400,6 @@ wood-import: defaults: output_parameters: "{}" -wood-excess: - carrier: wood - tech: excess - type: excess - foreign_keys: - bus: wood - defaults: - output_parameters: "{}" - # Bus "lignite": diff --git a/digipipe/esys/esys/model/foreign_keys_update.yml b/digipipe/esys/esys/model/foreign_keys_update.yml index 19514cd0..097a1c3a 100644 --- a/digipipe/esys/esys/model/foreign_keys_update.yml +++ b/digipipe/esys/esys/model/foreign_keys_update.yml @@ -25,7 +25,6 @@ 'heat_decentral-storage', 'heat_decentral-excess', 'wood-import', - 'wood-excess', 'lignite-import', 'solar-pv_ground', 'solar-pv_rooftop', diff --git a/digipipe/esys/esys/model/model_structure/model_structure_full.yml b/digipipe/esys/esys/model/model_structure/model_structure_full.yml index 313c59f3..e1870943 100644 --- a/digipipe/esys/esys/model/model_structure/model_structure_full.yml +++ b/digipipe/esys/esys/model/model_structure/model_structure_full.yml @@ -60,7 +60,6 @@ components: - wood-extchp_central - wood-extchp_decentral - wood-import - - wood-excess - lignite-import - lignite-oven From 2af7fee783bba52e6ce57a63e02ad87fbddf3e47 Mon Sep 17 00:00:00 2001 From: MaGering Date: Fri, 1 Sep 2023 00:00:56 +0200 Subject: [PATCH 18/20] Revert "Set excess revenues to zero to prevent export" This reverts commit ce179ceb8ac5408a930360ca64c3d04991e7e624. --- digipipe/esys/esys/config/write_default_scalars.yml | 7 ------- digipipe/esys/scripts/write_default_scalars.py | 3 --- 2 files changed, 10 deletions(-) diff --git a/digipipe/esys/esys/config/write_default_scalars.yml b/digipipe/esys/esys/config/write_default_scalars.yml index 8d38f4c4..9d611b88 100644 --- a/digipipe/esys/esys/config/write_default_scalars.yml +++ b/digipipe/esys/esys/config/write_default_scalars.yml @@ -97,13 +97,6 @@ write_default_scalars: "which": "zeros", "var_unit": "EUR/MWh", } - marginal_cost_excess: { - "var_name": "marginal_cost", - "type": excess, - "tech": excess, - "which": "excess_costs", - "var_unit": "EUR/MWh", - } storage_capacity: { "var_name": "storage_capacity", "type": None, diff --git a/digipipe/esys/scripts/write_default_scalars.py b/digipipe/esys/scripts/write_default_scalars.py index a90f19d8..86e39120 100644 --- a/digipipe/esys/scripts/write_default_scalars.py +++ b/digipipe/esys/scripts/write_default_scalars.py @@ -77,9 +77,6 @@ def get_var_value_and_comment(which): elif which == "variable_costs": var_value = '{"variable_costs": 1e-7}' comment = "Own assumption to prevent hidden curtailment" - elif which == "excess_costs": - var_value = 0 - comment = "No export of this carrier" elif which == "emissions_not_modeled": var_value = 0 comment = "No fossils in 2045 in the modelled sectors." From 1ff4ad9ca44dcd0b96e544ac8d4d9f04ec620c6e Mon Sep 17 00:00:00 2001 From: MaGering Date: Fri, 1 Sep 2023 00:03:23 +0200 Subject: [PATCH 19/20] Revert "Add heat excess" This reverts commit 9ee6aefcbd05ead171a179fcd8dfc865e0221cf6. --- digipipe/esys/esys/config/labels/de.yml | 2 -- digipipe/esys/esys/config/labels/en.yml | 2 -- .../esys/model/component_attrs_update.yml | 20 ------------------- .../esys/esys/model/foreign_keys_update.yml | 2 -- .../model_structure/model_structure_full.yml | 2 -- 5 files changed, 28 deletions(-) diff --git a/digipipe/esys/esys/config/labels/de.yml b/digipipe/esys/esys/config/labels/de.yml index d0fbbdcc..878b1e2b 100644 --- a/digipipe/esys/esys/config/labels/de.yml +++ b/digipipe/esys/esys/config/labels/de.yml @@ -38,12 +38,10 @@ heat_central-demand_hh: zen. Wärmebedarf HH heat_central-demand_cts: zen. Wärmebedarf GHD heat_central-demand_ind: zen. Wärmebedarf I heat_central-storage: zen. Wärmespeicher -heat_central-excess: zen. Wärmeüberschuss heat_decentral-demand_hh: dez. Wärmebedarf HH heat_decentral-demand_cts: dez. Wärmebedarf GHD heat_decentral-demand_ind: dez. Wärmebedarf I heat_decentral-storage: dez. Wärmespeicher -heat_decentral-excess: dez. Wärmeüberschuss hydro-reservoir: Reservoir hydro-ror: Laufwasserkraft lignite: Braunkohle diff --git a/digipipe/esys/esys/config/labels/en.yml b/digipipe/esys/esys/config/labels/en.yml index b6575fdb..40a9c342 100644 --- a/digipipe/esys/esys/config/labels/en.yml +++ b/digipipe/esys/esys/config/labels/en.yml @@ -39,12 +39,10 @@ heat_central-demand_hh: Heat cen. demand HH heat_central-demand_cts: Heat cen. demand CTS heat_central-demand_ind: Heat cen. demand IND heat_central-storage: Heat cen. storage -heat_central-excess: Heat cen. excess heat_decentral-demand_hh: Heat dec. demand HH heat_decentral-demand_cts: Heat dec. demand CTS heat_decentral-demand_ind: Heat dec. demand IND heat_decentral-storage: Heat dec. storage -heat_decentral-excess: Heat dec. excess hydro-ror: Hydro ROR solar-pv_ground: PV ground solar-pv_rooftop: PV rooftop diff --git a/digipipe/esys/esys/model/component_attrs_update.yml b/digipipe/esys/esys/model/component_attrs_update.yml index c8cfa6b4..a5a3fcb1 100644 --- a/digipipe/esys/esys/model/component_attrs_update.yml +++ b/digipipe/esys/esys/model/component_attrs_update.yml @@ -264,16 +264,6 @@ heat_central-storage: input_parameters: "{}" output_parameters: "{}" -heat_central-excess: - carrier: heat_central - tech: excess - type: excess - foreign_keys: - bus: heat_central - defaults: - marginal_cost: 0 - input_parameters: "{}" - # Bus "decentral heat": @@ -364,16 +354,6 @@ heat_decentral-storage: input_parameters: "{}" output_parameters: "{}" -heat_decentral-excess: - carrier: heat_decentral - tech: excess - type: excess - foreign_keys: - bus: heat_decentral - defaults: - marginal_cost: 0 - input_parameters: "{}" - # Bus "ch4": diff --git a/digipipe/esys/esys/model/foreign_keys_update.yml b/digipipe/esys/esys/model/foreign_keys_update.yml index 097a1c3a..22bda146 100644 --- a/digipipe/esys/esys/model/foreign_keys_update.yml +++ b/digipipe/esys/esys/model/foreign_keys_update.yml @@ -18,12 +18,10 @@ 'heat_central-demand_cts', 'heat_central-demand_ind', 'heat_central-storage', - 'heat_central-excess', 'heat_decentral-demand_hh', 'heat_decentral-demand_cts', 'heat_decentral-demand_ind', 'heat_decentral-storage', - 'heat_decentral-excess', 'wood-import', 'lignite-import', 'solar-pv_ground', diff --git a/digipipe/esys/esys/model/model_structure/model_structure_full.yml b/digipipe/esys/esys/model/model_structure/model_structure_full.yml index e1870943..5c149a13 100644 --- a/digipipe/esys/esys/model/model_structure/model_structure_full.yml +++ b/digipipe/esys/esys/model/model_structure/model_structure_full.yml @@ -68,13 +68,11 @@ components: - heat_central-demand_cts - heat_central-demand_ind - heat_central-storage - - heat_central-excess - heat_decentral-demand_hh - heat_decentral-demand_cts - heat_decentral-demand_ind - heat_decentral-storage - - heat_decentral-excess - solar-pv_ground - solar-pv_rooftop From ad7480a3d335220fc2754d6e6adfe0207f26357e Mon Sep 17 00:00:00 2001 From: nesnoj Date: Thu, 7 Sep 2023 15:16:42 +0200 Subject: [PATCH 20/20] Fix pv ground slider values to prevent app to alter SQ value from panel settings Related issue in digiplan: https://github.com/rl-institut/digiplan/issues/368 --- CHANGELOG.md | 2 ++ digipipe/store/datasets/app_settings/scripts/panels.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c787ad6e..29ec5132 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -135,6 +135,8 @@ and the versioning aim to respect [Semantic Versioning](http://semver.org/spec/v - Restrict snakemake version to v7.32.0 - Add central heat pump targets to slider - Restrict heat pump sliders to not move under 50% +- Fix pv ground slider values to prevent app to alter SQ value from panel + settings ### Removed diff --git a/digipipe/store/datasets/app_settings/scripts/panels.py b/digipipe/store/datasets/app_settings/scripts/panels.py index e67b9cf7..350a5bcd 100644 --- a/digipipe/store/datasets/app_settings/scripts/panels.py +++ b/digipipe/store/datasets/app_settings/scripts/panels.py @@ -138,7 +138,7 @@ def add_electricity_panel_settings( ) # PV ground and roof - pv_ground_search_area_start = round( + pv_ground_search_area_start = math.ceil( pv_ground_stats.capacity_net.sum() / ( pv_ground_area_stats.sum().sum() @@ -161,7 +161,7 @@ def add_electricity_panel_settings( panel_settings.update( **dict( s_pv_ff_1=dict( - max=round( + max=math.ceil( pv_ground_area_stats.sum().sum() * tech_data["power_density"]["pv_ground"] ),