exerpy 0.0.1__py3-none-any.whl → 0.0.3__py3-none-any.whl

exerpy/components/nodes/deaerator.py

@@ -2,8 +2,7 @@ import logging
 
 import numpy as np
 
-from exerpy.components.component import Component
-from exerpy.components.component import component_registry
+from exerpy.components.component import Component, component_registry
 
 
 @component_registry
@@ -11,9 +10,9 @@ class Deaerator(Component):
     r"""
     Class for exergy analysis of deaerators.
 
-    This class performs exergy analysis calculations for deaerators with multiple 
-    inlet streams and one outlet stream. The exergy product and fuel definitions 
-    vary based on the temperature relationships between inlet streams, outlet 
+    This class performs exergy analysis calculations for deaerators with multiple
+    inlet streams and one outlet stream. The exergy product and fuel definitions
+    vary based on the temperature relationships between inlet streams, outlet
     stream, and ambient conditions.
 
     Parameters
@@ -44,53 +43,52 @@ class Deaerator(Component):
     product and fuel are defined based on temperature relationships:
 
     .. math::
-
-        \dot{E}_\mathrm{P} =
-        \begin{cases}
+        \displaystyle
+        \dot E_{P} =
         \begin{cases}
-        \sum_i \dot{m}_i \cdot (e_\mathrm{out}^\mathrm{PH} -
-        e_{\mathrm{in,}i}^\mathrm{PH})
-        & T_{\mathrm{in,}i} < T_\mathrm{out} \mathrm{ & }
-        T_{\mathrm{in,}i} \geq T_0 \\
-        \sum_i \dot{m}_i \cdot e_\mathrm{out}^\mathrm{PH}
-        & T_{\mathrm{in,}i} < T_\mathrm{out} \mathrm{ & }
-        T_{\mathrm{in,}i} < T_0 \\
-        \end{cases} & T_\mathrm{out} > T_0\\
-        \mathrm{not defined (nan)} & T_\mathrm{out} = T_0\\
-        \begin{cases}
-        \sum_i \dot{m}_i \cdot e_\mathrm{out}^\mathrm{PH}
-        & T_{\mathrm{in,}i} > T_\mathrm{out} \mathrm{ & }
-        T_{\mathrm{in,}i} \geq T_0 \\
-        \sum_i \dot{m}_i \cdot (e_\mathrm{out}^\mathrm{PH} -
-        e_{\mathrm{in,}i}^\mathrm{PH})
-        & T_{\mathrm{in,}i} > T_\mathrm{out} \mathrm{ & }
-        T_{\mathrm{in,}i} < T_0 \\
-        \end{cases} & T_\mathrm{out} < T_0\\
+            \displaystyle
+            \sum_{i}\dot m_{i}\,\bigl(e_{\mathrm{out}}^{\mathrm{PH}}
+            -e_{\mathrm{in},i}^{\mathrm{PH}}\bigr),
+            \quad \text{if }T_{\mathrm{in},i}<T_{\mathrm{out}}\text{ and }T_{\mathrm{in},i}\ge T_{0},\\[8pt]
+            \displaystyle
+            \sum_{i}\dot m_{i}\,e_{\mathrm{out}}^{\mathrm{PH}},
+            \quad \text{if }T_{\mathrm{in},i}<T_{\mathrm{out}}\text{ and }T_{\mathrm{in},i}<T_{0},\\[8pt]
+            \displaystyle
+            \text{not defined (nan)},
+            \quad \text{if }T_{\mathrm{out}}=T_{0},\\[8pt]
+            \displaystyle
+            \sum_{i}\dot m_{i}\,e_{\mathrm{out}}^{\mathrm{PH}},
+            \quad \text{if }T_{\mathrm{in},i}>T_{\mathrm{out}}\text{ and }T_{\mathrm{in},i}\ge T_{0},\\[8pt]
+            \displaystyle
+            \sum_{i}\dot m_{i}\,\bigl(e_{\mathrm{out}}^{\mathrm{PH}}
+            -e_{\mathrm{in},i}^{\mathrm{PH}}\bigr),
+            \quad \text{if }T_{\mathrm{in},i}>T_{\mathrm{out}}\text{ and }T_{\mathrm{in},i}<T_{0}.
         \end{cases}
 
-        \dot{E}_\mathrm{F} =
-        \begin{cases}
-        \begin{cases}
-        \sum_i \dot{m}_i \cdot (e_{\mathrm{in,}i}^\mathrm{PH} -
-        e_\mathrm{out}^\mathrm{PH})
-        & T_{\mathrm{in,}i} > T_\mathrm{out} \\
-        \sum_i \dot{m}_i \cdot e_{\mathrm{in,}i}^\mathrm{PH}
-        & T_{\mathrm{in,}i} < T_\mathrm{out} \mathrm{ & }
-        T_{\mathrm{in,}i} < T_0 \\
-        \end{cases} & T_\mathrm{out} > T_0\\
-        \sum_i \dot{m}_i \cdot e_{\mathrm{in,}i}^\mathrm{PH}
-        & T_\mathrm{out} = T_0\\
+    .. math::
+        \displaystyle
+        \dot E_{F} =
         \begin{cases}
-        \sum_i \dot{m}_i \cdot e_{\mathrm{in,}i}^\mathrm{PH}
-        & T_{\mathrm{in,}i} > T_\mathrm{out} \mathrm{ & }
-        T_{\mathrm{in,}i} \geq T_0 \\
-        \sum_i \dot{m}_i \cdot (e_{\mathrm{in,}i}^\mathrm{PH} -
-        e_\mathrm{out}^\mathrm{PH})
-        & T_{\mathrm{in,}i} < T_\mathrm{out} \\
-        \end{cases} & T_\mathrm{out} < T_0\\
+            \displaystyle
+            \sum_{i}\dot m_{i}\,\bigl(e_{\mathrm{in},i}^{\mathrm{PH}}
+            -e_{\mathrm{out}}^{\mathrm{PH}}\bigr),
+            \quad \text{if }T_{\mathrm{out}}>T_{0}\text{ and }T_{\mathrm{in},i}>T_{\mathrm{out}},\\[8pt]
+            \displaystyle
+            \sum_{i}\dot m_{i}\,e_{\mathrm{in},i}^{\mathrm{PH}},
+            \quad \text{if }T_{\mathrm{out}}>T_{0}\text{ and }T_{\mathrm{in},i}<T_{\mathrm{out}}
+            \text{ and }T_{\mathrm{in},i}<T_{0},\\[8pt]
+            \displaystyle
+            \sum_{i}\dot m_{i}\,e_{\mathrm{in},i}^{\mathrm{PH}},
+            \quad \text{if }T_{\mathrm{out}}=T_{0},\\[8pt]
+            \displaystyle
+            \sum_{i}\dot m_{i}\,e_{\mathrm{in},i}^{\mathrm{PH}},
+            \quad \text{if }T_{\mathrm{out}}<T_{0}\text{ and }T_{\mathrm{in},i}>T_{\mathrm{out}},\\[8pt]
+            \displaystyle
+            \sum_{i}\dot m_{i}\,\bigl(e_{\mathrm{in},i}^{\mathrm{PH}}
+            -e_{\mathrm{out}}^{\mathrm{PH}}\bigr),
+            \quad \text{if }T_{\mathrm{out}}<T_{0}\text{ and }T_{\mathrm{in},i}<T_{\mathrm{out}}.
         \end{cases}
 
-        \forall i \in \mathrm{deaerator inlets}
     """
 
     def __init__(self, **kwargs):
@@ -117,7 +115,7 @@ class Deaerator(Component):
         ------
         ValueError
             If the required inlet and outlet streams are not properly defined.
-        """      
+        """
         # Ensure that the component has both inlet and outlet streams
         if len(self.inl) < 2 or len(self.outl) < 1:
             raise ValueError("Deaerator requires at least two inlets and one outlet.")
@@ -126,34 +124,34 @@ class Deaerator(Component):
         self.E_F = 0
 
         # Case 1: Outlet temperature is greater than T0
-        if self.outl[0]['T'] > T0:
+        if self.outl[0]["T"] > T0:
             for _, inlet in self.inl.items():
-                if inlet['T'] < self.outl[0]['T']:  # Tin < Tout
-                    if inlet['T'] >= T0:  # and Tin >= T0
-                        self.E_P += inlet['m'] * (self.outl[0]['e_PH'] - inlet['e_PH'])
+                if inlet["T"] < self.outl[0]["T"]:  # Tin < Tout
+                    if inlet["T"] >= T0:  # and Tin >= T0
+                        self.E_P += inlet["m"] * (self.outl[0]["e_PH"] - inlet["e_PH"])
                     else:  # and Tin < T0
-                        self.E_P += inlet['m'] * self.outl[0]['e_PH']
-                        self.E_F += inlet['m'] * inlet['e_PH']
+                        self.E_P += inlet["m"] * self.outl[0]["e_PH"]
+                        self.E_F += inlet["m"] * inlet["e_PH"]
                 else:  # Tin > Tout
-                    self.E_F += inlet['m'] * (inlet['e_PH'] - self.outl[0]['e_PH'])
+                    self.E_F += inlet["m"] * (inlet["e_PH"] - self.outl[0]["e_PH"])
 
         # Case 2: Outlet temperature is equal to T0
-        elif self.outl[0]['T'] == T0:
+        elif self.outl[0]["T"] == T0:
             self.E_P = np.nan
             for _, inlet in self.inl.items():
-                self.E_F += inlet['m'] * inlet['e_PH']
+                self.E_F += inlet["m"] * inlet["e_PH"]
 
         # Case 3: Outlet temperature is less than T0
         else:
             for _, inlet in self.inl.items():
-                if inlet['T'] > self.outl[0]['T']:  # Tin > Tout
-                    if inlet['T'] >= T0:  # and Tin >= T0
-                        self.E_P += inlet['m'] * self.outl[0]['e_PH']
-                        self.E_F += inlet['m'] * inlet['e_PH']
+                if inlet["T"] > self.outl[0]["T"]:  # Tin > Tout
+                    if inlet["T"] >= T0:  # and Tin >= T0
+                        self.E_P += inlet["m"] * self.outl[0]["e_PH"]
+                        self.E_F += inlet["m"] * inlet["e_PH"]
                     else:  # and Tin < T0
-                        self.E_P += inlet['m'] * (self.outl[0]['e_PH'] - inlet['e_PH'])
+                        self.E_P += inlet["m"] * (self.outl[0]["e_PH"] - inlet["e_PH"])
                 else:  # Tin < Tout
-                    self.E_F += inlet['m'] * (inlet['e_PH'] - self.outl[0]['e_PH'])
+                    self.E_F += inlet["m"] * (inlet["e_PH"] - self.outl[0]["e_PH"])
 
         # Calculate exergy destruction and efficiency
         if np.isnan(self.E_P):
@@ -164,7 +162,7 @@ class Deaerator(Component):
 
         # Log the results
         logging.info(
-            f"Deaerator exergy balance calculated: "
+            f"Exergy balance of Deaerator {self.name} calculated: "
             f"E_P={self.E_P:.2f}, E_F={self.E_F:.2f}, E_D={self.E_D:.2f}, "
             f"Efficiency={self.epsilon:.2%}"
         )
@@ -172,23 +170,25 @@ class Deaerator(Component):
     def aux_eqs(self, A, b, counter, T0, equations, chemical_exergy_enabled):
         """
         Auxiliary equations for the deaerator.
-        
+
         This function adds rows to the cost matrix A and the right-hand-side vector b to enforce
         the following auxiliary cost relations:
-        
+
         (1) Mixing equation for chemical exergy costs (if enabled):
-            - The outlet's specific chemical exergy cost is calculated as a mass-weighted 
-              average of the inlet streams' specific chemical exergy costs
-            - This enforces proper chemical exergy cost distribution through the deaerator
-        
+
+        - The outlet's specific chemical exergy cost is calculated as a mass-weighted average of the inlet streams' specific chemical exergy costs
+
+        - This enforces proper chemical exergy cost distribution through the deaerator
+
         (2) Mixing equation for mechanical exergy costs:
-            - The outlet's specific mechanical exergy cost is calculated as a mass-weighted
-              average of the inlet streams' specific mechanical exergy costs
-            - This ensures mechanical exergy costs are properly conserved in the mixing process
-            
+
+        - The outlet's specific mechanical exergy cost is calculated as a mass-weighted average of the inlet streams' specific mechanical exergy costs
+
+        - This ensures mechanical exergy costs are properly conserved in the mixing process
+
         Both equations implement the proportionality rule for mixing processes where
         the outlet's specific costs should reflect the contribution of each inlet stream.
-        
+
         Parameters
         ----------
         A : numpy.ndarray
@@ -203,7 +203,7 @@ class Deaerator(Component):
             Dictionary for storing equation labels.
         chemical_exergy_enabled : bool
             Flag indicating whether chemical exergy auxiliary equations should be added.
-        
+
         Returns
         -------
         A : numpy.ndarray
@@ -229,13 +229,16 @@ class Deaerator(Component):
                 # Outlet chemical exergy is zero: assign fallback for all inlets.
                 for inlet in self.inl.values():
                     A[counter, inlet["CostVar_index"]["CH"]] = 1
-            equations[counter] = f"aux_mixing_chem_{self.outl[0]['name']}"
+            equations[counter] = {
+                "kind": "aux_mixing",
+                "objects": [self.name, self.inl[0]["name"], self.inl[1]["name"], self.outl[0]["name"]],
+                "property": "c_CH",
+            }
             chem_row = 1  # One row added for chemical equation.
         else:
             chem_row = 0  # No row added.
 
         # --- Mechanical cost auxiliary equation ---
-        mech_row = 0  # This row will always be added.
         if self.outl[0]["e_M"] != 0:
             A[counter + chem_row, self.outl[0]["CostVar_index"]["M"]] = -1 / self.outl[0]["E_M"]
             # Iterate over inlet streams for mechanical mixing.
@@ -247,7 +250,11 @@ class Deaerator(Component):
         else:
             for inlet in self.inl.values():
                 A[counter + chem_row, inlet["CostVar_index"]["M"]] = 1
-        equations[counter + chem_row] = f"aux_mixing_mech_{self.outl[0]['name']}"
+        equations[counter + chem_row] = {
+            "kind": "aux_mixing",
+            "objects": [self.name, self.inl[0]["name"], self.inl[1]["name"], self.outl[0]["name"]],
+            "property": "c_M",
+        }
 
         # Set the right-hand side entries to zero for the added rows.
         if chemical_exergy_enabled:
@@ -260,26 +267,141 @@ class Deaerator(Component):
 
         return A, b, counter, equations
 
-    def exergoeconomic_balance(self, T0):
-        """
-        Perform exergoeconomic balance calculations for the deaerator.
-        
-        This method calculates various exergoeconomic parameters including:
-        - Cost rates of product (C_P) and fuel (C_F)
-        - Specific cost of product (c_P) and fuel (c_F)
-        - Cost rate of exergy destruction (C_D)
-        - Relative cost difference (r)
-        - Exergoeconomic factor (f)
-        
+    def exergoeconomic_balance(self, T0, chemical_exergy_enabled=False):
+        r"""
+        Perform exergoeconomic cost balance for the deaerator (mixing component).
+
+        The deaerator is a mixing component where multiple streams combine. The general
+        exergoeconomic balance equation is:
+
+        .. math::
+            \sum_{\mathrm{in}} \left(\dot{C}^{\mathrm{T}}_{\mathrm{in}}
+            + \dot{C}^{\mathrm{M}}_{\mathrm{in}}
+            + \dot{C}^{\mathrm{CH}}_{\mathrm{in}}\right)
+            - \sum_{\mathrm{out}} \left(\dot{C}^{\mathrm{T}}_{\mathrm{out}}
+            + \dot{C}^{\mathrm{M}}_{\mathrm{out}}
+            + \dot{C}^{\mathrm{CH}}_{\mathrm{out}}\right)
+            + \dot{Z}
+            = 0
+
+        The product is defined as the outlet stream. The fuel consists of all inlet
+        streams, with specific treatment depending on temperature levels. The cost
+        balance is closed using:
+
+        .. math::
+            \dot{C}_{\mathrm{P}} = \dot{C}_{\mathrm{F}} + \dot{Z}
+
+        **Case 1: Outlet above ambient temperature**
+
+        When :math:`T_{\mathrm{out}} > T_0`:
+
+        For cold inlets (:math:`T_{\mathrm{in}} < T_{\mathrm{out}}`):
+
+        .. math::
+            \dot{C}_{\mathrm{F,cold}} = \dot{C}^{\mathrm{M}}_{\mathrm{in}}
+            + \dot{C}^{\mathrm{CH}}_{\mathrm{in}}
+
+        For hot inlets (:math:`T_{\mathrm{in}} \geq T_{\mathrm{out}}`):
+
+        .. math::
+            \dot{C}_{\mathrm{F,hot}} = -\dot{m}_{\mathrm{in}} \cdot c^{\mathrm{T}}_{\mathrm{in}}
+            \cdot e^{\mathrm{T}}_{\mathrm{in}}
+            + \left(\dot{C}^{\mathrm{T}}_{\mathrm{in}}
+            + \dot{C}^{\mathrm{M}}_{\mathrm{in}}
+            + \dot{C}^{\mathrm{CH}}_{\mathrm{in}}\right)
+
+        Total fuel cost:
+
+        .. math::
+            \dot{C}_{\mathrm{F}} = \sum \dot{C}_{\mathrm{F,cold}}
+            + \sum \dot{C}_{\mathrm{F,hot}}
+            - \dot{C}^{\mathrm{M}}_{\mathrm{out}}
+            - \dot{C}^{\mathrm{CH}}_{\mathrm{out}}
+
+        **Case 2: Outlet at ambient temperature (dissipative)**
+
+        When :math:`|T_{\mathrm{out}} - T_0| < 10^{-6}`:
+
+        .. math::
+            \dot{C}_{\mathrm{F}} = \sum_{\mathrm{in}} \dot{C}^{\mathrm{TOT}}_{\mathrm{in}}
+
+        **Case 3: Outlet below ambient temperature**
+
+        When :math:`T_{\mathrm{out}} < T_0`:
+
+        For hot inlets (:math:`T_{\mathrm{in}} > T_{\mathrm{out}}`):
+
+        .. math::
+            \dot{C}_{\mathrm{F,hot}} = \dot{C}^{\mathrm{M}}_{\mathrm{in}}
+            + \dot{C}^{\mathrm{CH}}_{\mathrm{in}}
+
+        For cold inlets (:math:`T_{\mathrm{in}} \leq T_{\mathrm{out}}`):
+
+        .. math::
+            \dot{C}_{\mathrm{F,cold}} = -\dot{m}_{\mathrm{in}} \cdot c^{\mathrm{T}}_{\mathrm{in}}
+            \cdot e^{\mathrm{T}}_{\mathrm{in}}
+            + \left(\dot{C}^{\mathrm{T}}_{\mathrm{in}}
+            + \dot{C}^{\mathrm{M}}_{\mathrm{in}}
+            + \dot{C}^{\mathrm{CH}}_{\mathrm{in}}\right)
+
+        Total fuel cost:
+
+        .. math::
+            \dot{C}_{\mathrm{F}} = \sum \dot{C}_{\mathrm{F,hot}}
+            + \sum \dot{C}_{\mathrm{F,cold}}
+            - \dot{C}^{\mathrm{M}}_{\mathrm{out}}
+            - \dot{C}^{\mathrm{CH}}_{\mathrm{out}}
+
+        **Calculated exergoeconomic indicators:**
+
+        .. math::
+            c_{\mathrm{F}} = \frac{\dot{C}_{\mathrm{F}}}{\dot{E}_{\mathrm{F}}}
+
+        .. math::
+            c_{\mathrm{P}} = \frac{\dot{C}_{\mathrm{P}}}{\dot{E}_{\mathrm{P}}}
+
+        .. math::
+            \dot{C}_{\mathrm{D}} = c_{\mathrm{F}} \cdot \dot{E}_{\mathrm{D}}
+
+        .. math::
+            r = \frac{c_{\mathrm{P}} - c_{\mathrm{F}}}{c_{\mathrm{F}}}
+
+        .. math::
+            f = \frac{\dot{Z}}{\dot{Z} + \dot{C}_{\mathrm{D}}}
+
         Parameters
         ----------
         T0 : float
-            Ambient temperature
-            
+            Ambient temperature (K).
+        chemical_exergy_enabled : bool, optional
+            If True, chemical exergy is considered in the calculations.
+            Default is False.
+
+        Attributes Set
+        --------------
+        C_P : float
+            Cost rate of product (currency/time).
+        C_F : float
+            Cost rate of fuel (currency/time).
+        c_P : float
+            Specific cost of product (currency/energy).
+        c_F : float
+            Specific cost of fuel (currency/energy).
+        C_D : float
+            Cost rate of exergy destruction (currency/time).
+        r : float
+            Relative cost difference (dimensionless).
+        f : float
+            Exergoeconomic factor (dimensionless).
+
         Notes
         -----
-        The exergoeconomic balance considers thermal (T), chemical (CH),
-        and mechanical (M) exergy components for the inlet and outlet streams.
+        The deaerator treats thermal, mechanical, and chemical exergy components
+        differently depending on whether inlets are "hot" or "cold" relative to
+        the outlet temperature. The distinction ensures proper cost allocation
+        for streams that provide heating versus those being heated.
+
+        Future development may include merging profits from dissipative components.
         """
         self.C_P = 0
         self.C_F = 0
@@ -290,9 +412,8 @@ class Deaerator(Component):
                     self.C_F += i["C_M"] + i["C_CH"]
                 else:
                     # hot inlets
-                    self.C_F += - i["M"] * i["C_T"] * i["e_T"] + (
-                        i["C_T"] + i["C_M"] + i["C_CH"])
-            self.C_F += (-self.outl[0]["C_M"] - self.outl[0]["C_CH"])
+                    self.C_F += -i["M"] * i["C_T"] * i["e_T"] + (i["C_T"] + i["C_M"] + i["C_CH"])
+            self.C_F += -self.outl[0]["C_M"] - self.outl[0]["C_CH"]
         elif self.outl[0]["T"] - 1e-6 < T0 and self.outl[0]["T"] + 1e-6 > T0:
             # dissipative
             for i in self.inl:
@@ -304,15 +425,13 @@ class Deaerator(Component):
                     self.C_F += i["C_M"] + i["C_CH"]
                 else:
                     # cold inlets
-                    self.C_F += - i["M"] * i["C_T"] * i["e_T"] + (
-                        i["C_T"] + i["C_M"] + i["C_CH"])
-            self.C_F += (-self.outl[0]["C_M"] - self.outl[0]["C_CH"])
-        self.C_P = self.C_F + self.Z_costs      # +1/num_serving_comps * C_diff
+                    self.C_F += -i["M"] * i["C_T"] * i["e_T"] + (i["C_T"] + i["C_M"] + i["C_CH"])
+            self.C_F += -self.outl[0]["C_M"] - self.outl[0]["C_CH"]
+        self.C_P = self.C_F + self.Z_costs  # +1/num_serving_comps * C_diff
         # ToDo: add case that merge profits from dissipative component(s)
 
-
         self.c_F = self.C_F / self.E_F
         self.c_P = self.C_P / self.E_P
         self.C_D = self.c_F * self.E_D
         self.r = (self.c_P - self.c_F) / self.c_F
-        self.f = self.Z_costs / (self.Z_costs + self.C_D)
+        self.f = self.Z_costs / (self.Z_costs + self.C_D)

exerpy/components/nodes/drum.py

@@ -1,9 +1,6 @@
 import logging
 
-import numpy as np
-
-from exerpy.components.component import Component
-from exerpy.components.component import component_registry
+from exerpy.components.component import Component, component_registry
 
 
 @component_registry
@@ -30,14 +27,8 @@ class Drum(Component):
             \dot{E}_\mathrm{P} = \sum \dot{E}_{\mathrm{out,}j}^\mathrm{PH}\\
             \dot{E}_\mathrm{F} = \sum \dot{E}_{\mathrm{in,}i}^\mathrm{PH}
         """
-        self.E_P = (
-            self.outl[0]['e_PH'] * self.outl[0]['m']
-            + self.outl[1]['e_PH'] * self.outl[1]['m']
-        )
-        self.E_F = (
-            self.inl[0]['e_PH'] * self.inl[0]['m']
-            + self.inl[1]['e_PH'] * self.inl[1]['m']
-        )
+        self.E_P = self.outl[0]["e_PH"] * self.outl[0]["m"] + self.outl[1]["e_PH"] * self.outl[1]["m"]
+        self.E_F = self.inl[0]["e_PH"] * self.inl[0]["m"] + self.inl[1]["e_PH"] * self.inl[1]["m"]
 
         # Calculate exergy destruction and efficiency
         self.E_D = self.E_F - self.E_P
@@ -45,7 +36,7 @@ class Drum(Component):
 
         # Log the results
         logging.info(
-            f"Drum exergy balance calculated: "
+            f"Exergy balance of Drum {self.name} calculated: "
             f"E_P={self.E_P:.2f}, E_F={self.E_F:.2f}, E_D={self.E_D:.2f}, "
             f"Efficiency={self.epsilon:.2%}"
         )
@@ -102,18 +93,26 @@ class Drum(Component):
                 A[counter, self.outl[0]["CostVar_index"]["CH"]] = -1 / self.outl[0]["E_CH"]
             else:
                 A[counter, self.outl[0]["CostVar_index"]["CH"]] = -1
-            equations[counter] = f"aux_drum_chem1_{self.outl[0]['name']}"
-            
+            equations[counter] = {
+                "kind": "aux_equality",
+                "objects": [self.name, self.inl[0]["name"], self.outl[0]["name"]],
+                "property": "c_CH",
+            }
+
             # Equation 2: Balance between inlet 0 and outlet 1 for chemical exergy
             if self.inl[0]["e_CH"] != 0:
-                A[counter+1, self.inl[0]["CostVar_index"]["CH"]] = 1 / self.inl[0]["E_CH"]
+                A[counter + 1, self.inl[0]["CostVar_index"]["CH"]] = 1 / self.inl[0]["E_CH"]
             else:
-                A[counter+1, self.inl[0]["CostVar_index"]["CH"]] = 1
+                A[counter + 1, self.inl[0]["CostVar_index"]["CH"]] = 1
             if self.outl[1]["e_CH"] != 0:
-                A[counter+1, self.outl[1]["CostVar_index"]["CH"]] = -1 / self.outl[1]["E_CH"]
+                A[counter + 1, self.outl[1]["CostVar_index"]["CH"]] = -1 / self.outl[1]["E_CH"]
             else:
-                A[counter+1, self.outl[1]["CostVar_index"]["CH"]] = -1
-            equations[counter+1] = f"aux_drum_chem2_{self.outl[1]['name']}"
+                A[counter + 1, self.outl[1]["CostVar_index"]["CH"]] = -1
+            equations[counter + 1] = {
+                "kind": "aux_equality",
+                "objects": [self.name, self.inl[1]["name"], self.outl[1]["name"]],
+                "property": "c_CH",
+            }
             chem_rows = 2
         else:
             chem_rows = 0
@@ -121,41 +120,53 @@ class Drum(Component):
         # --- Thermal cost auxiliary equation ---
         # For thermal exergy, we balance the two outlets.
         if (self.outl[0]["e_T"] != 0) and (self.outl[1]["e_T"] != 0):
-            A[counter+chem_rows, self.outl[0]["CostVar_index"]["T"]] = 1 / self.outl[0]["E_T"]
-            A[counter+chem_rows, self.outl[1]["CostVar_index"]["T"]] = -1 / self.outl[1]["E_T"]
+            A[counter + chem_rows, self.outl[0]["CostVar_index"]["T"]] = 1 / self.outl[0]["E_T"]
+            A[counter + chem_rows, self.outl[1]["CostVar_index"]["T"]] = -1 / self.outl[1]["E_T"]
         elif self.outl[0]["e_T"] == 0 and self.outl[1]["e_T"] != 0:
-            A[counter+chem_rows, self.outl[0]["CostVar_index"]["T"]] = 1
+            A[counter + chem_rows, self.outl[0]["CostVar_index"]["T"]] = 1
         elif self.outl[0]["e_T"] != 0 and self.outl[1]["e_T"] == 0:
-            A[counter+chem_rows, self.outl[1]["CostVar_index"]["T"]] = -1
+            A[counter + chem_rows, self.outl[1]["CostVar_index"]["T"]] = -1
         else:
-            A[counter+chem_rows, self.outl[0]["CostVar_index"]["T"]] = 1
-            A[counter+chem_rows, self.outl[1]["CostVar_index"]["T"]] = -1
-        equations[counter+chem_rows] = f"aux_drum_therm_{self.outl[0]['name']}_{self.outl[1]['name']}"
+            A[counter + chem_rows, self.outl[0]["CostVar_index"]["T"]] = 1
+            A[counter + chem_rows, self.outl[1]["CostVar_index"]["T"]] = -1
+        equations[counter + chem_rows] = {
+            "kind": "aux_p_rule",
+            "objects": [self.name, self.outl[0]["name"], self.outl[1]["name"]],
+            "property": "c_T",
+        }
 
         # --- Mechanical cost auxiliary equation ---
         if self.outl[0]["e_M"] != 0:
-            A[counter+chem_rows+1, self.outl[0]["CostVar_index"]["M"]] = 1 / self.outl[0]["E_M"]
+            A[counter + chem_rows + 1, self.outl[0]["CostVar_index"]["M"]] = 1 / self.outl[0]["E_M"]
         else:
-            A[counter+chem_rows+1, self.outl[0]["CostVar_index"]["M"]] = 1
+            A[counter + chem_rows + 1, self.outl[0]["CostVar_index"]["M"]] = 1
         if self.outl[1]["e_M"] != 0:
-            A[counter+chem_rows+1, self.outl[1]["CostVar_index"]["M"]] = -1 / self.outl[1]["E_M"]
+            A[counter + chem_rows + 1, self.outl[1]["CostVar_index"]["M"]] = -1 / self.outl[1]["E_M"]
         else:
-            A[counter+chem_rows+1, self.outl[1]["CostVar_index"]["M"]] = -1
-        equations[counter+chem_rows+1] = f"aux_drum_mech_{self.outl[0]['name']}_{self.outl[1]['name']}"
+            A[counter + chem_rows + 1, self.outl[1]["CostVar_index"]["M"]] = -1
+        equations[counter + chem_rows + 1] = {
+            "kind": "aux_p_rule",
+            "objects": [self.name, self.outl[0]["name"], self.outl[1]["name"]],
+            "property": "c_M",
+        }
 
         # --- Thermal-Mechanical coupling equation for outlet 0 ---
         # This enforces that the thermal and mechanical cost components at outlet 0 are consistent.
         if (self.outl[0]["e_T"] != 0) and (self.outl[0]["e_M"] != 0):
-            A[counter+chem_rows+2, self.outl[0]["CostVar_index"]["T"]] = 1 / self.outl[0]["E_T"]
-            A[counter+chem_rows+2, self.outl[0]["CostVar_index"]["M"]] = -1 / self.outl[0]["E_M"]
+            A[counter + chem_rows + 2, self.outl[0]["CostVar_index"]["T"]] = 1 / self.outl[0]["E_T"]
+            A[counter + chem_rows + 2, self.outl[0]["CostVar_index"]["M"]] = -1 / self.outl[0]["E_M"]
         elif (self.outl[0]["e_T"] == 0) and (self.outl[0]["e_M"] == 0):
-            A[counter+chem_rows+2, self.outl[0]["CostVar_index"]["T"]] = 1
-            A[counter+chem_rows+2, self.outl[0]["CostVar_index"]["M"]] = -1
+            A[counter + chem_rows + 2, self.outl[0]["CostVar_index"]["T"]] = 1
+            A[counter + chem_rows + 2, self.outl[0]["CostVar_index"]["M"]] = -1
         elif self.outl[0]["e_T"] == 0:
-            A[counter+chem_rows+2, self.outl[0]["CostVar_index"]["T"]] = 1
+            A[counter + chem_rows + 2, self.outl[0]["CostVar_index"]["T"]] = 1
         else:
-            A[counter+chem_rows+2, self.outl[0]["CostVar_index"]["M"]] = -1
-        equations[counter+chem_rows+2] = f"aux_drum_therm_mech_{self.outl[0]['name']}"
+            A[counter + chem_rows + 2, self.outl[0]["CostVar_index"]["M"]] = -1
+        equations[counter + chem_rows + 2] = {
+            "kind": "aux_equality",
+            "objects": [self.name, self.outl[0]["name"]],
+            "property": "c_T, c_M",
+        }
 
         # Set the right-hand side entries to zero for all added rows.
         for i in range(chem_rows + 3):