Features/improve esys structure

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
 

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

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

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: {
@@ -52,7 +52,7 @@ write_default_scalars:
     "var_name": "amount",
     "type": None,
     "tech": None,
-    "which": "empty",
+    "which": "zeros",
     "var_unit": "MWh/a",
   }
   capacity_potential: {
@@ -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,

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
@@ -397,9 +397,9 @@ lignite-shortage:
 
 # Bus "biomass":
 
-biomass-shortage:
+biomass-import:
   carrier: biomass
-  tech: shortage
+  tech: import
   type: shortage
   foreign_keys:
     bus: biomass

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',

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

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

digipipe/esys/scripts/write_default_scalars.py

@@ -65,9 +65,9 @@ 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 == "high_capacity":
+        var_value = 100000000
+        comment = "No limit for import"
     elif which == "false":
         var_value = False
         comment = "Empty"

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"]
                 ),