Update code

Author: phumthep

scripts/run_quickstart.py

@@ -42,7 +42,7 @@ def main():
 
     # Plot the results
     simulator.plot_fuelmix("bar", output_folder)
-    simulator.plot_unit_status(output_folder)
+    simulator.plot_thermal_units(output_folder)
 
 
 if __name__ == "__main__":

src/pownet/core/data_processor.py

@@ -214,15 +214,15 @@ def calc_line_susceptance(self) -> None:
         # Replace with user-specified values
         excluded_values = [-1, None]
         user_specified_susceptance = self.user_transmission.loc[
-            ~self.user_transmission["susceptance"].isin(excluded_values),
-            ["source", "sink", "susceptance"],
+            ~self.user_transmission["user_susceptance"].isin(excluded_values),
+            ["source", "sink", "user_susceptance"],
         ]
         user_specified_susceptance = user_specified_susceptance.set_index(
             ["source", "sink"]
         )
         # Change from float to int
         user_specified_susceptance = user_specified_susceptance.astype(
-            {"susceptance": int}
+            {"user_susceptance": int}
         )
 
         self.transmission_data = self.transmission_data.set_index(["source", "sink"])

src/pownet/core/output.py

@@ -120,6 +120,16 @@ def get_monthly_demand(self, input_demand: pd.DataFrame) -> pd.Series:
         monthly_demand.index.name = "Month"
         return monthly_demand
 
+    def get_thermal_unit_hourly_status(
+        self, node_variables: pd.DataFrame
+    ) -> pd.DataFrame:
+        """The hourly status of thermal units for each hour over the simulation period."""
+        thermal_unit_hourly_status = node_variables[
+            node_variables["vartype"] == "status"
+        ].reset_index(drop=True)
+        thermal_unit_hourly_status["timestep"] = thermal_unit_hourly_status["hour"] % 24
+        return thermal_unit_hourly_status
+
     def get_thermal_unit_mean_hourly_status(
         self, node_variables: pd.DataFrame
     ) -> pd.DataFrame:
@@ -172,6 +182,11 @@ def get_thermal_unit_daily_dispatch(
             columns="node", index="day", values="value", aggfunc="sum"
         )
 
+    def get_thermal_unit_hourly_dispatch(
+        self, node_variables: pd.DataFrame
+    ) -> pd.DataFrame:
+        return node_variables[node_variables["vartype"] == "pthermal"].copy()
+
     def get_nondispatch_hourly_capacity_factor(
         self,
         type: str,

src/pownet/core/simulation.py

@@ -172,22 +172,15 @@ def run(
 
     def get_node_variables(self) -> pd.DataFrame:
         """Return the node-specific variables."""
-        output_processor = OutputProcessor(
-            year=self.inputs.year,
-            fuelmap=self.inputs.fuelmap,
-            nodal_hourly_demand=self.inputs.demand,
-        )
-        self.node_variables = self.system_record.get_node_variables()
-        output_processor.load_node_variables_from_df(self.node_variables)
-        return output_processor.node_variables
+        return self.system_record.get_node_variables()
 
     def get_flow_variables(self) -> pd.DataFrame:
         """Return the flow variables."""
-        return self.system_record.flow_variables
+        return self.system_record.get_flow_variables()
 
     def get_systemwide_variables(self) -> pd.DataFrame:
         """Return the system variables"""
-        return self.system_record.systemwide_variables
+        return self.system_record.get_systemwide_variables()
 
     def write_results(self, output_folder: str) -> None:
         """Write the simulation results to files"""
@@ -208,28 +201,26 @@ def plot_fuelmix(self, chart_type: str, output_folder: str = None) -> None:
                 "Invalid chart type. Choose between 'fuelmix' and 'fuelmix_area'."
             )
 
-        output_processor = OutputProcessor(
-            inputs=self.inputs,
-        )
-        node_var_df = self.system_record.get_node_variables()
-        output_processor.load_from_dataframe(node_var_df)
+        output_processor = OutputProcessor()
+        output_processor.load(self.inputs)
 
-        visualizer = Visualizer(model_id=self.inputs.model_id)
+        node_variables = self.system_record.get_node_variables()
 
+        visualizer = Visualizer(model_id=self.inputs.model_id)
         if chart_type == "bar":
             visualizer.plot_fuelmix_bar(
-                dispatch=output_processor.get_hourly_dispatch(),
-                demand=output_processor.get_hourly_demand(),
+                dispatch=output_processor.get_hourly_generation(node_variables),
+                demand=output_processor.get_hourly_demand(self.inputs.demand),
                 output_folder=output_folder,
             )
         elif chart_type == "area":
             visualizer.plot_fuelmix_area(
-                dispatch=output_processor.get_hourly_dispatch(),
-                demand=output_processor.get_hourly_demand(),
+                dispatch=output_processor.get_hourly_generation(node_variables),
+                demand=output_processor.get_hourly_demand(self.inputs.demand),
                 output_folder=output_folder,
             )
 
-    def plot_unit_status(self, output_folder: str = None) -> None:
+    def plot_thermal_units(self, output_folder: str = None) -> None:
         """Plot the status of the thermal units
 
         Args:
@@ -238,14 +229,17 @@ def plot_unit_status(self, output_folder: str = None) -> None:
         Returns:
             None
         """
-        output_processor = OutputProcessor(
-            inputs=self.inputs,
-        )
-        output_processor.load_from_dataframe(self.system_record.get_node_variables())
+        node_variables = self.system_record.get_node_variables()
+
+        output_processor = OutputProcessor()
+        output_processor.load(self.inputs)
+
         visualizer = Visualizer(model_id=self.inputs.model_id)
         visualizer.plot_thermal_units(
-            unit_status=output_processor.get_unit_status(),
-            thermal_dispatch=output_processor.get_hourly_thermal_dispatch(),
+            unit_status=output_processor.get_thermal_unit_hourly_status(node_variables),
+            thermal_dispatch=output_processor.get_thermal_unit_hourly_dispatch(
+                node_variables
+            ),
             thermal_rated_capacity=self.inputs.thermal_rated_capacity,
             output_folder=output_folder,
         )
@@ -259,10 +253,6 @@ def plot_lmp(self, output_folder: str = None) -> None:
         Returns:
             None
         """
-        output_processor = OutputProcessor(
-            inputs=self.inputs,
-        )
-        output_processor.load_from_dataframe(self.system_record.get_node_variables())
         visualizer = Visualizer(model_id=self.inputs.model_id)
         visualizer.plot_lmp(
             lmp_df=self.system_record.get_lmp(),