GSSYE-650: Added total_traded_energy_Wh to the KPI calculation for He…

…atpump and Virtual Heatpump strategies. Added total_traded_energy_kWh to the AVRO schema.
gridsingularity · Nov 21, 2023 · 2e7be23 · 2e7be23
1 parent bee4d27
commit 2e7be23
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/gsy_framework/schema/avro_schemas/simulation_raw_data.json b/gsy_framework/schema/avro_schemas/simulation_raw_data.json
@@ -438,6 +438,7 @@
         {"name": "energy_consumption_kWh", "type": "float"},
         {"name": "max_energy_demand_kWh", "type": "float"},
         {"name": "min_energy_demand_kWh", "type": "float"},
+        {"name": "total_traded_energy_kWh", "type":  "float"},
         {"name": "market_fee", "type": "float"},
         {
           "name": "bids",

diff --git a/gsy_framework/schema/avro_schemas/simulation_state.json b/gsy_framework/schema/avro_schemas/simulation_state.json
@@ -382,6 +382,13 @@
                 "type": "map",
                 "values": "float"
               }
+            },
+            {
+              "name": "total_traded_energy_kWh",
+              "type": {
+                "type": "map",
+                "values": "float"
+              }
             }
           ]
         }

diff --git a/gsy_framework/sim_results/__init__.py b/gsy_framework/sim_results/__init__.py
@@ -17,6 +17,7 @@
 """
 from gsy_framework.utils import area_name_from_area_or_ma_name
 
+
 def is_load_node_type(area):
     """Check if the given asset is a load."""
     return area["type"] in ["LoadHoursStrategy", "DefinedLoadStrategy",
@@ -27,7 +28,7 @@ def is_load_node_type(area):
 
 def is_heatpump_node_type(area):
     """Check if the given asset is a heat pump."""
-    return area["type"] in ["HeatPumpStrategy"]
+    return area["type"] in ["HeatPumpStrategy", "VirtualHeatpumpStrategy"]
 
 
 def is_bulk_power_producer(area):

diff --git a/gsy_framework/sim_results/kpi.py b/gsy_framework/sim_results/kpi.py
@@ -55,7 +55,7 @@ def accumulate_devices(self, area_dict: Dict):
             if is_producer_node_type(child) or is_heatpump_node_type(child):
                 if_not_in_list_append(self.producer_list, child["uuid"])
                 if_not_in_list_append(self.areas_to_trace_list, child["parent_uuid"])
-            elif is_load_node_type(child):
+            elif is_load_node_type(child) or is_heatpump_node_type(child):
                 if_not_in_list_append(self.consumer_list, child["uuid"])
                 if_not_in_list_append(self.areas_to_trace_list, child["parent_uuid"])
             elif is_prosumer_node_type(child):
@@ -72,6 +72,9 @@ def _accumulate_total_energy_demanded(self, area_dict: Dict, core_stats: Dict):
             child_stats = core_stats.get(child["uuid"], {})
             if is_load_node_type(child):
                 self.total_energy_demanded_wh += child_stats.get("total_energy_demanded_wh", 0)
+            if is_heatpump_node_type(child):
+                self.total_energy_demanded_wh += (
+                        child_stats.get("total_traded_energy_kWh", 0) * 1000.0)
             if child["children"]:
                 self._accumulate_total_energy_demanded(child, core_stats)
 
@@ -205,10 +208,12 @@ def _populate_consumer_producer_sets(self, area_dict: Dict):
         Args:
             area_dict: It contains the respective area's core info
         """
+        if "DH" in area_dict["name"]:
+            return
         for child in area_dict["children"]:
             if is_producer_node_type(child):
                 self.producer_ess_set.add(child["uuid"])
-            elif is_load_node_type(child):
+            elif is_load_node_type(child) or is_heatpump_node_type(child):
                 self.consumer_ess_set.add(child["uuid"])
             elif is_prosumer_node_type(child):
                 self.producer_ess_set.add(child["uuid"])