added state vars to track power and cumulative energy for hvac stuff

fastsim-core/src/vehicle/hvac/hvac_sys_for_lumped_cabin.rs

@@ -170,7 +170,12 @@ impl HVACSystemForLumpedCabin {
             (pwr_thrml_hvac_to_cabin, pwr_thrml_fc_to_cabin, cop)
         };
         self.state.cop = cop;
-        Ok((pwr_thrml_hvac_to_cabin, pwr_thrml_fc_to_cabin))
+        self.state.pwr_thrml_hvac_to_cabin = pwr_thrml_hvac_to_cabin;
+        self.state.pwr_thrml_fc_to_cabin = pwr_thrml_fc_to_cabin;
+        Ok((
+            self.state.pwr_thrml_hvac_to_cabin,
+            self.state.pwr_thrml_fc_to_cabin,
+        ))
     }
 
     fn handle_heat_source(
@@ -289,9 +294,15 @@ pub struct HVACSystemForLumpedCabinState {
     /// Aux power demand from [Vehicle::hvac] system
     pub pwr_aux_for_hvac: si::Power,
     /// Cumulative aux energy for HVAC system
-    pub energy_aux: si::Energy,
-    /// Cumulative energy demand by HVAC system from thermal component (e.g. [FuelConverter])
-    pub energy_thermal_req: si::Energy,
+    pub energy_aux_for_hvac: si::Energy,
+    /// Thermal power from HVAC system to cabin, positive is heating the cabin
+    pub pwr_thrml_hvac_to_cabin: si::Power,
+    /// Cumulative thermal energy from HVAC system to cabin, positive is heating the cabin
+    pub energy_thrml_hvac_to_cabin: si::Energy,
+    /// Thermal power from [FuelConverter] to [Cabin]
+    pub pwr_thrml_fc_to_cabin: si::Power,
+    /// Cumulative thermal energy from [FuelConverter] to [Cabin]
+    pub energy_thrml_fc_to_cabin: si::Energy,
 }
 impl Init for HVACSystemForLumpedCabinState {}
 impl SerdeAPI for HVACSystemForLumpedCabinState {}

fastsim-core/src/vehicle/hvac/hvac_sys_for_lumped_cabin_and_res.rs

@@ -254,10 +254,14 @@ impl HVACSystemForLumpedCabinAndRES {
             self.state.pwr_aux_for_hvac
         };
 
+        self.state.pwr_thrml_hvac_to_cabin = pwr_thrml_hvac_to_cabin;
+        self.state.pwr_thrml_fc_to_cabin = pwr_thrml_fc_to_cabin;
+        self.state.pwr_thrml_hvac_to_res = pwr_thrml_hvac_to_res;
+
         Ok((
-            pwr_thrml_hvac_to_cabin,
-            pwr_thrml_fc_to_cabin,
-            pwr_thrml_hvac_to_res,
+            self.state.pwr_thrml_hvac_to_cabin,
+            self.state.pwr_thrml_fc_to_cabin,
+            self.state.pwr_thrml_hvac_to_res,
         ))
     }
 
@@ -479,9 +483,19 @@ pub struct HVACSystemForLumpedCabinAndRESState {
     /// Au power demand from [Vehicle::hvac] system
     pub pwr_aux_for_hvac: si::Power,
     /// Cumulative aux energy for HVAC system
-    pub energy_aux: si::Energy,
-    /// Cumulative energy demand by HVAC system from thermal component (e.g. [FuelConverter])
-    pub energy_thermal_req: si::Energy,
+    pub energy_aux_for_hvac: si::Energy,
+    /// Thermal power from HVAC system to cabin, positive is heating the cabin
+    pub pwr_thrml_hvac_to_cabin: si::Power,
+    /// Cumulative thermal energy from HVAC system to cabin, positive is heating the cabin
+    pub energy_thrml_hvac_to_cabin: si::Energy,
+    /// Thermal power from [FuelConverter] to [Cabin]
+    pub pwr_thrml_fc_to_cabin: si::Power,
+    /// Cumulative thermal energy from [FuelConverter] to [Cabin]
+    pub energy_thrml_fc_to_cabin: si::Energy,
+    /// Thermal power from HVAC to [ReversibleEnergyStorage]
+    pub pwr_thrml_hvac_to_res: si::Power,
+    /// Cumulative thermal energy from HVAC to [ReversibleEnergyStorage]
+    pub energy_thrml_hvac_to_res: si::Energy,
 }
 impl Init for HVACSystemForLumpedCabinAndRESState {}
 impl SerdeAPI for HVACSystemForLumpedCabinAndRESState {}