Merge branch 'master' into feature/GSYE-563

gridsingularity · Oct 24, 2023 · 55b0695 · 55b0695
2 parents e47eda9 + 9bd7a21
commit 55b0695
Show file tree

Hide file tree

Showing 2 changed files with 109 additions and 196 deletions.
diff --git a/gsy_framework/schema/avro_schemas/simulation_state.json b/gsy_framework/schema/avro_schemas/simulation_state.json
@@ -92,47 +92,34 @@
               ]
             },
             {
-              "name": "area_stats",
-              "default": "null",
-              "type": [
-                "null",
-                {
-                  "name": "AreaStatsRecord",
-                  "type": "record",
-                  "fields": [
-                    {
-                      "name": "rate_stats_market",
-                      "type": {
-                        "type": "map",
-                        "values": [
-                          {
-                            "name": "RateStatsMarketMap",
-                            "type": "map",
-                            "values": [
-                              "null",
-                              "float"
-                            ]
-                          }
-                        ]
-                      }
-                    },
-                    {
-                      "name": "exported_energy",
-                      "type": {
-                        "type": "map",
-                        "values": "float"
-                      }
-                    },
-                    {
-                      "name": "imported_energy",
-                      "type": {
-                        "type": "map",
-                        "values": "float"
-                      }
-                    }
-                  ]
-                }
-              ]
+              "name": "rate_stats_market",
+              "type": {
+                "type": "map",
+                "values": [
+                  {
+                    "name": "RateStatsMarketMap",
+                    "type": "map",
+                    "values": [
+                      "null",
+                      "float"
+                    ]
+                  }
+                ]
+              }
+            },
+            {
+              "name": "exported_energy",
+              "type": {
+                "type": "map",
+                "values": "float"
+              }
+            },
+            {
+              "name": "imported_energy",
+              "type": {
+                "type": "map",
+                "values": "float"
+              }
             }
           ]
         },
@@ -157,13 +144,6 @@
             {
               "name": "total_energy_demanded_Wh",
               "type": "float"
-            },
-            {
-              "name": "area_stats",
-              "type": [
-                "null",
-                "AreaStatsRecord"
-              ]
             }
           ]
         },
@@ -191,13 +171,6 @@
                 "type": "map",
                 "values": "float"
               }
-            },
-            {
-              "name": "area_stats",
-              "type": [
-                "null",
-                "AreaStatsRecord"
-              ]
             }
           ]
         },
@@ -225,13 +198,6 @@
                 "type": "map",
                 "values": "float"
               }
-            },
-            {
-              "name": "area_stats",
-              "type": [
-                "null",
-                "AreaStatsRecord"
-              ]
             }
           ]
         },
@@ -246,13 +212,6 @@
                 "int"
               ]
             },
-            {
-              "name": "area_stats",
-              "type": [
-                "null",
-                "AreaStatsRecord"
-              ]
-            },
             {
               "name": "battery_energy_per_slot",
               "type": "float"
@@ -344,13 +303,6 @@
                 "int"
               ]
             },
-            {
-              "name": "area_stats",
-              "type": [
-                "null",
-                "AreaStatsRecord"
-              ]
-            },
             {
               "name": "storage_temp_C",
               "type": {