Merge pull request #137 from openego/fixes/#130-stores-and-storages-c…

…ycle-condition fixes/#130 set cyclic to True for storages
openego · Nov 27, 2023 · 3395689 · 3395689
2 parents b444741 + 2dd55ef
commit 3395689
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/egon/data/datasets/scenario_parameters/parameters.py b/src/egon/data/datasets/scenario_parameters/parameters.py
@@ -184,12 +184,14 @@ def electricity(scenario):
                 ** 0.5,
                 "standing_loss": 0,
                 "max_hours": 6,
+                "cyclic_state_of_charge": True,
             },
             "pumped_hydro": {
                 "store": read_costs(costs, "PHS", "efficiency") ** 0.5,
                 "dispatch": read_costs(costs, "PHS", "efficiency") ** 0.5,
                 "standing_loss": 0,
                 "max_hours": 6,
+                "cyclic_state_of_charge": True,
             },
         }
         # Warning: Electrical parameters are set in osmTGmod, editing these values will not change the data!
@@ -363,12 +365,14 @@ def electricity(scenario):
                 ** 0.5,
                 "standing_loss": 0,
                 "max_hours": 6,
+                "cyclic_state_of_charge": True,
             },
             "pumped_hydro": {
                 "store": read_costs(costs, "PHS", "efficiency") ** 0.5,
                 "dispatch": read_costs(costs, "PHS", "efficiency") ** 0.5,
                 "standing_loss": 0,
                 "max_hours": 6,
+                "cyclic_state_of_charge": True,
             },
         }
         # Warning: Electrical parameters are set in osmTGmod, editing these values will not change the data!
@@ -510,12 +514,14 @@ def electricity(scenario):
                 ** 0.5,
                 "standing_loss": 0,
                 "max_hours": 6,
+                "cyclic_state_of_charge": True,
             },
             "pumped_hydro": {
                 "store": read_costs(costs, "PHS", "efficiency") ** 0.5,
                 "dispatch": read_costs(costs, "PHS", "efficiency") ** 0.5,
                 "standing_loss": 0,
                 "max_hours": 6,
+                "cyclic_state_of_charge": True,
             },
         }
         # Warning: Electrical parameters are set in osmTGmod, editing these values will not change the data!

diff --git a/src/egon/data/datasets/storages_etrago/__init__.py b/src/egon/data/datasets/storages_etrago/__init__.py
@@ -25,7 +25,6 @@ def __init__(self, dependencies):
 
 
 def insert_PHES():
-
     # Get datasets configuration
     sources = config.datasets()["storage_etrago"]["sources"]
     targets = config.datasets()["storage_etrago"]["targets"]
@@ -67,6 +66,7 @@ def insert_PHES():
         phes["efficiency_store"] = parameters["store"]
         phes["efficiency_dispatch"] = parameters["dispatch"]
         phes["standing_loss"] = parameters["standing_loss"]
+        phes["cyclic_state_of_charge"] = parameters["cyclic_state_of_charge"]
 
         # Write data to db
         phes.to_sql(
@@ -79,7 +79,6 @@ def insert_PHES():
 
 
 def extendable_batteries_per_scenario(scenario):
-
     # Get datasets configuration
     sources = config.datasets()["storage_etrago"]["sources"]
     targets = config.datasets()["storage_etrago"]["targets"]
@@ -156,6 +155,10 @@ def extendable_batteries_per_scenario(scenario):
         "electricity", scenario
     )["efficiency"]["battery"]["standing_loss"]
 
+    extendable_batteries["cyclic_state_of_charge"] = get_sector_parameters(
+        "electricity", scenario
+    )["efficiency"]["battery"]["cyclic_state_of_charge"]
+
     extendable_batteries["carrier"] = "battery"
 
     # Merge dataframes to fill p_nom_min column
@@ -178,4 +181,4 @@ def extendable_batteries_per_scenario(scenario):
 
 def extendable_batteries():
     for scn in config.settings()["egon-data"]["--scenarios"]:
-        extendable_batteries_per_scenario(scn)
+        extendable_batteries_per_scenario(scn)