ubc-solar-physics 1.5.0__cp312-cp312-win_amd64.whl → 1.7.0__cp312-cp312-win_amd64.whl

physics/models/battery/battery_config.toml

@@ -1,8 +1,6 @@
-R_0_data = [0.002564, 0.002541, 0.002541, 0.002558, 0.002549, 0.002574, 0.002596, 0.002626, 0.002676, 0.002789]
-R_P = 0.000530
-C_P = 14646         
-Q_total = 259200
-SOC_data = [0.0752, 0.1705, 0.2677, 0.366, 0.4654, 0.5666, 0.6701, 0.7767, 0.8865, 1.0]
-Uoc_data = [3.481, 3.557, 3.597, 3.623, 3.660, 3.750, 3.846, 3.946, 4.056, 4.183]
-max_current_capacity = 40
-max_energy_capacity = 500
+R_0_data = [0.17953765302439662, 0.15580951404728172, 0.14176929930784543, 0.11043950958574644, 0.13930042505446938, 0.1552885289394773, 0.044070982259896085, 0.2208806896239539, 0.15116267852908616, 0.6553961767519164]
+R_P_data = [0.04153180244191346, 0.10674683402208612, 0.061085424180509884, 0.0781407642082238, 0.05537901113775878, 0.09732054673529467, 0.07662520885708152, 0.09799857401036915, 0.42622740149661487, 0.2718418915736874]
+C_P_data = [14824.398495212006, 1587.5971318119796, 341.1064063616048, 1243.182413110655, 619.5791066439332, 2252.7885790042164, 954.5884882581622, 515.7219779825028, 431.10892633451135, 195.14394897766627]
+Uoc_data = [131.88002282453857, 129.4574321366064, 125.5750277614186, 121.99586066440303, 118.69893412178982, 115.71854177322408, 111.99025635444923, 108.29354777060836, 98.23397960300946, 95.24125831782388]
+Q_total = 151000.0
+Soc_data = [1.0000113624123392, 0.8815263722745977, 0.7671918526292492, 0.6206071038045673, 0.4911613638651783, 0.3606311083423134, 0.23687514228021178, 0.12073345089992571, 0.01456057818183809, 0.0070648691224265425]

physics/models/battery/battery_model.py

@@ -1,135 +1,226 @@
 import numpy as np
-import core
-from scipy import optimize
-from physics.models.battery.battery_config import BatteryModelConfig
+import physics_rs
+from typing import Callable, TypeAlias, Protocol, runtime_checkable, Optional, cast
+from numpy.typing import NDArray
 
 
-class BatteryModel:
+SOCDependent: TypeAlias = Callable[[float | NDArray[float]], float | NDArray[float]]
+
+
+@runtime_checkable
+class EquivalentCircuitModelConfig(Protocol):
     """
-    Class representing the Thevenin equivalent battery model with modular parameters.
-
-    Attributes:
-        R_P (float): Polarization resistance of the battery (Ohms).
-        C_P (float): Polarization capacitance of the battery (Farads).
-        max_current_capacity (float): Nominal capacity of the battery (Ah).
-        max_energy_capacity (float): Maximum energy capacity of the battery (Wh).
-        nominal_charge_capacity (float): Total charge capacity of the battery (Coulombs).
-        state_of_charge (float): Current state of charge (dimensionless, 0.0 to 1.0).
-        U_oc_coefficients (np.ndarray): Coefficients for the open-circuit voltage polynomial.
-        R_0_coefficients (np.ndarray): Coefficients for the ohmic resistance polynomial.
-        U_oc (callable): Function for open-circuit voltage as a function of state of charge (V).
-        R_0 (callable): Function for ohmic resistance as a function of state of charge (Ohms).
-        U_P (float): Current polarization potential (V).
-        U_L (float): Current terminal voltage (V).
-        tau (float): Time constant of the battery model (seconds).
+    A specification for a configuration object which contains the requisite data to specify
+    a `EquivalentCircuitBatteryModel`.
     """
 
-    def __init__(self, battery_config: BatteryModelConfig, state_of_charge=1):
+    @property
+    def get_Uoc(self) -> SOCDependent:
         """
-        Constructor for the BatteryModel class.
-
-        :param BatteryModelConfig battery_config: Configuration object containing the battery's parameters and data.
-        :param float state_of_charge: Initial state of charge of the battery (default is 1.0, fully charged).
+        A map from an SOC to Uoc (open-circuit voltage).
+        Should be compatible with non-vectorized and vectorized calls: float -> float or NDArray -> NDArray
         """
+        ...
 
-        # ----- Load Config -----
-
-        self.R_P = battery_config.R_P
-        self.C_P = battery_config.C_P
-        self.max_current_capacity = battery_config.max_current_capacity
-        self.max_energy_capacity = battery_config.max_energy_capacity
-        self.nominal_charge_capacity = battery_config.Q_total
-        Soc_data = battery_config.SOC_data
-        Uoc_data = battery_config.Uoc_data
-        R_0_data = battery_config.R_0_data
+    @property
+    def get_R_0(self) -> SOCDependent:
+        """
+        A map from an SOC to R_0 (internal resistance).
+        Should be compatible with non-vectorized and vectorized calls: float -> float or NDArray -> NDArray
+        """
+        ...
 
-        # ----- Initialize Parameters -----
-        def quintic_polynomial(x, x0, x1, x2, x3, x4):
-            return np.polyval(np.array([x0, x1, x2, x3, x4]), x)
+    @property
+    def get_R_P(self) -> SOCDependent:
+        """
+        A map from an SOC to R_P (polarization resistance).
+        Should be compatible with non-vectorized and vectorized calls: float -> float or NDArray -> NDArray
+        """
+        ...
 
-        self.U_oc_coefficients, _ = optimize.curve_fit(quintic_polynomial, Soc_data, Uoc_data)
-        self.R_0_coefficients, _ = optimize.curve_fit(quintic_polynomial, Soc_data, R_0_data)
-        self.U_oc = lambda soc: np.polyval(self.U_oc_coefficients, soc)  # V
-        self.R_0 = lambda soc: np.polyval(self.R_0_coefficients, soc)  # Ohms
+    @property
+    def get_C_P(self) -> SOCDependent:
+        """
+        A map from an SOC to C_P (polarization capacitance).
+        Should be compatible with non-vectorized and vectorized calls: float -> float or NDArray -> NDArray
+        """
+        ...
 
-        self.U_P = 0.0  # V
-        self.U_L = 0.0  # V
-        self.state_of_charge = state_of_charge
+    @property
+    def Q_total(self) -> float:
+        """
+        The total charge capacity of the battery pack, in Coulombs.
+        """
+        ...
 
-        self.tau = self.R_P * self.C_P  # Characteristic Time (seconds)
 
-        # calculated the charging and discharging currents
-        self.discharge_current = lambda P, U_oc, U_P, R_0: ((U_oc - U_P) - np.sqrt(
-            np.power((U_oc - U_P), 2) - 4 * R_0 * P)) / (2 * R_0)
-        self.charge_current = lambda P, U_oc, U_P, R_0: (-(U_oc + U_P) + np.sqrt(
-            np.power((U_oc + U_P), 2) + 4 * R_0 * P)) / (2 * R_0)
+class EquivalentCircuitBatteryModel:
+    """
+    A first-order Thevenin equivalent model of a lithium-ion battery pack
+    """
 
-    def _evolve(self, power: float, tick: float) -> None:
+    def __init__(self, battery_config: EquivalentCircuitModelConfig, state_of_charge: float = 1.0):
         """
-        Update the battery state given the power and time elapsed.
+        Constructor for the EquivalentCircuitBatteryModel class.
 
-        :param float power: Power applied to the battery (W). Positive for charging, negative for discharging.
-        :param float T: Time interval over which the power is applied (seconds).
+        :param BatteryModelConfig battery_config: Configuration object containing the battery's parameters and data.
+        :param float state_of_charge: Initial state of charge of the battery (default is 1.0, fully charged).
         """
-        soc = self.state_of_charge  # State of Charge (dimensionless, 0 < soc < 1)
-        U_P = self.U_P  # Polarization Potential (V)
-        R_P = self.R_P  # Polarization Resistance (Ohms)
-        U_oc = self.U_oc(soc)  # Open-Circuit Potential (V)
-        R_0 = self.R_0(soc)  # Ohmic Resistance (Ohms)
-        Q = self.nominal_charge_capacity  # Nominal Charge Capacity (C)
 
-        current = self.discharge_current(power, U_oc, U_P, R_0) if power <= 0 else self.charge_current(power, U_oc, U_P, R_0)  # Current (A)
-
-        new_soc = soc + (current * tick / Q)
-        new_U_P = np.exp(-tick / self.tau) * U_P + current * R_P * (1 - np.exp(-tick / self.tau))
+        # We initialize the active components as uncharged
+        self._U_P = 0.0  # V
+        self._U_L = 0.0  # V
+        self._state_of_charge = state_of_charge
+        self._nominal_charge_capacity = battery_config.Q_total
+
+        # Now, the config contains methods to map SOC to each respective parameter.
+        # We can't efficiently pass these functions to compiled libraries.
+        # Instead, we will pre-compute the parameters as a function of SOC
+        # to create fine lookup tables as a portable substitute for runtime computation.
+
+        # Things are going to get a tiny bit messy here, so we will go through this carefully.
+        # I'll write what each resulting map achieves below each code block.
+
+        # Firstly, we're going to discretize SOC by making a range of SOC values in the range [-0.05, 1.1], because
+        # sometimes we are marginally outside the range (0.0, 1.0].
+        # We will quantize at about 4 digits of precision, so ~10,000 values
+        self._min_soc = -0.05
+        self._max_soc = 1.1
+        self._num_indices = int((self._max_soc - self._min_soc) * 10000)
+        SOC_values = np.linspace(self._min_soc, self._max_soc, self._num_indices, dtype=float)
+        # maps: (discrete index) -> (SOC)
+
+        # Now, we're going to create a map from an arbitrary SOC, to the index of the closest SOC
+        # value in our quantized SOC range (`SOC_values`)
+        self._quantization_step: float = (self._max_soc - self._min_soc) / self._num_indices
+        self._soc_to_index = lambda _soc: int(
+            max(0, min(self._num_indices - 1, (_soc - self._min_soc) // self._quantization_step))
+        )
+        # maps: (SOC) -> (discrete index)
+
+        # Now, calculate the value of each parameter for each discrete SOC value using the injected `get_` functions
+        self._U_oc_lookup: NDArray[float] = battery_config.get_Uoc(SOC_values)
+        self._R_0_lookup: NDArray[float] = battery_config.get_R_0(SOC_values)
+        self._R_P_lookup: NDArray[float] = battery_config.get_R_P(SOC_values)
+        self._C_P_lookup: NDArray[float] = battery_config.get_C_P(SOC_values)
+        # maps: (discrete index) -> (parameter)
+
+        # Finally, combine the above maps to create a map from an arbitrary SOC to each battery parameter, using
+        # the discrete lookup tables
+        # These `cast` calls just promise to the type-checker that these will map floats to floats
+        self._U_oc = cast(Callable[[float], float], lambda SOC: self._U_oc_lookup[self._soc_to_index(SOC)])
+        self._R_0 = cast(Callable[[float], float], lambda SOC: self._R_0_lookup[self._soc_to_index(SOC)])
+        self._R_P = cast(Callable[[float], float], lambda SOC: self._R_P_lookup[self._soc_to_index(SOC)])
+        self._C_P = cast(Callable[[float], float], lambda SOC: self._C_P_lookup[self._soc_to_index(SOC)])
+        # maps: ((SOC) -> (discrete index)) -> ((discrete index) -> (parameter))  |==>  (SOC) -> (parameter)
+
+        self._tau: Callable[[float], float] = lambda soc: self._R_P(soc) * self._C_P(soc)  # Characteristic Time in s
+
+    def update_array(
+            self,
+            tick: float,
+            delta_energy_array: Optional[NDArray] = None,
+            current_array: Optional[NDArray] = None,
+            use_compiled: bool = True
+    ) -> tuple[NDArray, NDArray]:
+        """
+        Compute the battery's state of charge and terminal voltage over time in response to a
+        time series of energy/current draw from a load.
 
-        self.state_of_charge = new_soc
-        self.U_P = new_U_P
-        self.U_L = U_oc + U_P + (current * R_0)
+        Only ONE of `current_array` or `delta_energy_array` should be provided.
 
-    def update_array(self, delta_energy_array, tick, rust=True):
-        """
-        Compute the battery's state of charge, voltage, and stored energy over time.
-        This function is a wrapper for the Rust-based and Python-based implementations.
+        Notes
+        -----
+        If both current and power are known, current should be provided.
+        The model implementation requires current for calculations, so it must be derived from power if power
+        was provided.
+        Computing current from power relies on voltage, which is a model output, and therefore
+        the derived current could be less accurate.
 
-        :param np.ndarray delta_energy_array: Array of energy changes (J) at each time step.
+        :param NDArray delta_energy_array: Array of energy changes (J) at each time step.
         :param float tick: Time interval for each step (seconds).
-        :param bool rust: If True, use Rust-based calculations (default is True).
-
-        :return: A tuple containing arrays for state-of-charge, voltage, and stored energy.
-        :rtype: tuple[np.ndarray, np.ndarray, np.ndarray]
+        :param NDArray current_array: Array of current draw (positive sign convention) in Amperes at each time step.
+        :param bool use_compiled: If `True`, use compiled binaries for calculations.
+            Disable for better debugging.
+        :return: A tuple containing arrays for state-of-charge and terminal voltage.
+        :raises ValueError: If BOTH or NEITHER of `current_array` or `delta_energy_array` are provided.
+        :rtype: tuple[NDArray, NDArray]
         """
+        if (delta_energy_array is None) == (current_array is None):  # Enforce that only one should be provided
+            raise ValueError("Exactly one of `delta_energy_array` or `current_array` "
+                             "must be provided, not both or neither.")
+
+        energy_or_current = delta_energy_array if delta_energy_array is not None else current_array
 
-        if rust:
-            return core.update_battery_array(
-                delta_energy_array,
+        if use_compiled:
+            return physics_rs.update_battery_state(
+                energy_or_current,
                 tick,
-                self.state_of_charge,
-                self.U_P,
-                self.R_P,
-                self.R_0_coefficients,
-                self.U_oc_coefficients,
-                self.tau,
-                self.nominal_charge_capacity
+                self._state_of_charge,
+                self._U_P,
+                self._R_0_lookup,
+                self._U_oc_lookup,
+                self._R_P_lookup,
+                self._C_P_lookup,
+                self._nominal_charge_capacity,
+                current_array is None,  # Pass to the library if `energy_or_current` is current or power,
+                self._quantization_step,
+                self._min_soc
             )
+
         else:
-            return self._update_array_py(delta_energy_array, tick)
+            return self._update_array_py(energy_or_current, tick, current_array is None)
 
-    def _update_array_py(self, delta_energy_array, tick):
+    def _update_array_py(self, energy_or_current, tick, is_power):
         """
         Perform energy calculations using Python (fallback method if Rust is disabled).
 
-        :param np.ndarray delta_energy_array: Array of energy changes (J) at each time step.
+        :param NDArray energy_or_current: Array of energy changes (J) at each time step.
         :param float tick: Time interval for each step (seconds).
 
         :return: A tuple containing arrays for state-of-charge and voltage.
-        :rtype: tuple[np.ndarray, np.ndarray]
         """
-        soc = np.empty_like(delta_energy_array, dtype=float)
-        voltage = np.empty_like(delta_energy_array, dtype=float)
-        for i, energy in enumerate(delta_energy_array):
-            self._evolve(energy, tick)
-            soc[i] = self.state_of_charge
-            voltage[i] = self.U_L
+        soc = np.empty_like(energy_or_current, dtype=float)
+        voltage = np.empty_like(energy_or_current, dtype=float)
+
+        for (i, value) in enumerate(energy_or_current):
+            if is_power:
+                # Use the last voltage to calculate current, or an absurdly large number if it is the first,
+                # because we don't know voltage yet.
+                # We will have a very small initial current, no matter what.
+                # We shouldn't be starting to simulate when the battery is in an active state anyway,
+                # so this should be an alright compromise.
+                last_terminal_voltage = voltage[i - 1] if i - 1 >= 0 else 10000
+
+                current: float = value / (tick * last_terminal_voltage)
+            else:
+                current = value
+
+            self._evolve(current, tick)
+            soc[i] = self._state_of_charge
+            voltage[i] = self._U_L
 
         return soc, voltage
+
+    def _evolve(self, current: float, tick: float) -> None:
+        """
+        Update the battery state given the current and time elapsed.
+
+        :param float current: Current applied to the battery (A).
+            Positive for charging, negative for discharging.
+        :param float tick: Time interval over which the power is applied (seconds).
+        """
+        soc = self._state_of_charge  # State of Charge (dimensionless, 0 < soc < 1)
+        U_P = self._U_P  # Polarization Potential (V)
+        R_P = self._R_P(soc)  # Polarization Resistance (Ohms)
+        U_oc = self._U_oc(soc)  # Open-Circuit Potential (V)
+        R_0 = self._R_0(soc)  # Ohmic Resistance (Ohms)
+        Q = self._nominal_charge_capacity  # Nominal Charge Capacity (C)
+        tau = self._tau(soc)  # Time constant (s)
+
+        new_soc = soc + (current * tick / Q)
+        new_U_P = np.exp(-tick / tau) * U_P + current * R_P * (1 - np.exp(-tick / tau))
+
+        self._state_of_charge = new_soc
+        self._U_P = new_U_P
+        self._U_L = U_oc + new_U_P + (current * R_0)