EnergySystemModels 20260416005__tar.gz → 20260416007__tar.gz

{energysystemmodels-20260416005 → energysystemmodels-20260416007}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: energysystemmodels
-Version: 20260416005
+Version: 20260416007
 Summary: Energy systems models are the mathematical models that are developed in order to represent as reliably as possible various energy-related problems.
 Author: Zoheir HADID
 Author-email: zoheir.hadid@gmail.com

{energysystemmodels-20260416005 → energysystemmodels-20260416007}/setup.py

@@ -11,7 +11,7 @@ setup(
     name='energysystemmodels',
 
 
-    version='20260416005',
+    version='20260416007',
 
     description='Energy systems models are the mathematical models that are developed in order to represent as reliably as possible various energy-related problems.',
 

{energysystemmodels-20260416005 → energysystemmodels-20260416007}/src/ThermodynamicCycles/Combustion/NG_Boiler_Efficiency_EN1295X.py

@@ -3,12 +3,19 @@ import pandas as pd
 import re
 from ThermodynamicCycles.Combustion.NG_Heating_Value import NG_Heating_Value
 
+try:
+    from CoolProp.CoolProp import PropsSI
+    _HAS_COOLPROP = True
+except ImportError:
+    _HAS_COOLPROP = False
+
 
 class NG_Boiler_Efficiency:
     """
     EN12952-15 / EN12953-11 indirect method boiler efficiency calculator.
     Computes heat losses (flue gas sensible, CO, radiation, condensation)
     and derives LHV/HHV efficiencies for natural gas boilers.
+    Uses CoolProp for precise gas enthalpies when available.
     """
 
     R = 8.314510          # J/mol/K
@@ -19,8 +26,11 @@ class NG_Boiler_Efficiency:
     # Dry air molar composition
     DRY_AIR = {'CO2': 0.00033, 'O2': 0.20946, 'N2': 0.78102, 'Ar': 0.00919}
 
-    # Flue gas Cp in kJ/Nm3/K (mean values for typical boiler temperature range)
-    FG_CP = {'CO2': 1.7, 'H2O': 1.5, 'N2': 1.3, 'O2': 1.3, 'Ar': 0.93}
+    # CoolProp fluid names
+    _CP_NAMES = {'CO2': 'CarbonDioxide', 'N2': 'Nitrogen', 'O2': 'Oxygen', 'Ar': 'Argon'}
+
+    # Fallback Cp in kJ/Nm3/K (if CoolProp unavailable)
+    FG_CP_FALLBACK = {'CO2': 1.7, 'H2O': 1.5, 'N2': 1.3, 'O2': 1.3, 'Ar': 0.93}
 
     # Radiation loss constants
     RADIATION_CONSTANT = {'water_tube': 0.0113, 'fire_tube': 0.0072}
@@ -28,6 +38,38 @@ class NG_Boiler_Efficiency:
     # CO net calorific value kJ/Nm3
     NCV_CO = 12633.0
 
+    @staticmethod
+    def _enthalpy_Nm3(species, T_K):
+        """Enthalpy of gas species at T_K in kJ/Nm3, relative to 0 kJ at 0°C.
+
+        Uses CoolProp if available, otherwise Cp fallback.
+        For H2O: uses CoolProp at 1 kPa (superheated vapor) to avoid phase change.
+        """
+        rho_map = {'CO2': 1.977, 'H2O': 0.8034, 'N2': 1.250, 'O2': 1.429, 'Ar': 1.784}
+        rho = rho_map.get(species, 1.3)
+
+        if _HAS_COOLPROP and species != 'H2O':
+            cp_name = NG_Boiler_Efficiency._CP_NAMES.get(species)
+            if cp_name:
+                try:
+                    h = PropsSI('H', 'T', T_K, 'P', 101325, cp_name)
+                    h0 = PropsSI('H', 'T', 273.15, 'P', 101325, cp_name)
+                    return (h - h0) * rho / 1000.0  # J/kg * kg/Nm3 / 1000 -> kJ/Nm3
+                except Exception:
+                    pass
+
+        if _HAS_COOLPROP and species == 'H2O':
+            try:
+                h = PropsSI('H', 'T', T_K, 'P', 1000, 'Water')
+                h0 = PropsSI('H', 'T', 273.16, 'P', 1000, 'Water')
+                return (h - h0) * rho / 1000.0
+            except Exception:
+                pass
+
+        # Fallback: constant Cp
+        Cp = NG_Boiler_Efficiency.FG_CP_FALLBACK.get(species, 1.3)
+        return Cp * (T_K - 273.15)
+
     # Latent heat of water vaporization kJ/kg at 25C
     LATENT_HEAT_WATER = 2442.5
 
@@ -173,12 +215,17 @@ class NG_Boiler_Efficiency:
         # H2O volume fraction in flue gas
         x_H2O_fg = fg['H2O'] / fg_total
 
-        # --- 9-10. Flue gas sensible heat loss ---
-        dT = self.T_fg - self.T_ref
-        # Weighted Cp of flue gas mixture (kJ/Nm3_mix/K)
-        Cp_fg_mix = sum(fg[sp] / fg_total * self.FG_CP.get(sp, 1.3) for sp in fg)
+        # --- 9-10. Flue gas sensible heat loss (CoolProp or fallback) ---
+        T_fg_K = self.T_fg + 273.15
+        T_ref_K = self.T_ref + 273.15
+        # Enthalpy of each species at T_fg and T_ref (kJ/Nm3)
+        fg_enthalpy = 0.0  # kJ per Nm3 of fuel
+        for sp, vol in fg.items():
+            h_fg = self._enthalpy_Nm3(sp, T_fg_K)
+            h_ref = self._enthalpy_Nm3(sp, T_ref_K)
+            fg_enthalpy += vol * (h_fg - h_ref)
 
-        flue_gas_loss = fg_flow * Cp_fg_mix * dT / 3600.0  # kW
+        flue_gas_loss = fg_enthalpy * self.ng_flow / 3600.0  # kW
 
         # CO loss
         CO_loss = self.CO_ppm * 1e-6 * fg_flow_dry * self.NCV_CO / 3600.0  # kW
@@ -219,20 +266,30 @@ class NG_Boiler_Efficiency:
         # --- 12. Boiler efficiency (indirect method) ---
         heat_credits = self.electrical_credit + self.other_heat_credit
 
-        # LHV basis
+        # Water vapor remaining after condensation (Nm3/Nm3_fuel)
+        if self.T_fg < T_condensation:
+            H2O_vapor = H2O_remaining_vapor
+            H2O_condensed = fg['H2O'] - H2O_remaining_vapor
+        else:
+            H2O_vapor = fg['H2O']
+            H2O_condensed = 0.0
+
+        H2O_vapor_kg_h = H2O_vapor * self.ng_flow * 18.015 / 22.414
+        H2O_condensed_kg_h = H2O_condensed * self.ng_flow * 18.015 / 22.414
+
+        # Condensate loss: water leaving envelope at T_fg (sensible heat)
+        condensate_loss = H2O_condensed_kg_h * 4.18 * (self.T_fg - self.T_ref) / 3600.0  # kW
+
+        # === LHV basis ===
+        # Condensation recovery = latent + sensible heat recovered
         total_losses_LHV = flue_gas_loss + CO_loss + radiation_loss - condensation_recovery
         efficiency_LHV = 1.0 - total_losses_LHV / (Q_ng_LHV + heat_credits) if (Q_ng_LHV + heat_credits) > 0 else 0.0
 
-        # HHV basis: flue gas loss must include latent heat of ALL water vapor
-        # Additional latent heat = total H2O in flue gas (as vapor) * latent heat
-        H2O_vapor_Nm3_h = fg['H2O'] * self.ng_flow  # Nm3/h of water vapor
-        if self.T_fg < T_condensation:
-            H2O_vapor_Nm3_h = H2O_remaining_vapor * self.ng_flow
-        H2O_vapor_kg_h = H2O_vapor_Nm3_h * 18.015 / 22.414
-        latent_loss_all_water = H2O_vapor_kg_h * self.LATENT_HEAT_WATER / 3600.0  # kW
-
-        flue_gas_loss_HHV = flue_gas_loss + latent_loss_all_water
-        total_losses_HHV = flue_gas_loss_HHV + CO_loss + radiation_loss - condensation_recovery
+        # === HHV basis ===
+        # Flue gas loss includes latent heat of water REMAINING as vapor
+        latent_vapor = H2O_vapor_kg_h * self.LATENT_HEAT_WATER / 3600.0  # kW
+        flue_gas_loss_HHV = flue_gas_loss + latent_vapor
+        total_losses_HHV = flue_gas_loss_HHV + CO_loss + radiation_loss + condensate_loss
         efficiency_HHV = 1.0 - total_losses_HHV / (Q_ng_HHV + heat_credits) if (Q_ng_HHV + heat_credits) > 0 else 0.0
 
         # --- 13. Useful heat ---

{energysystemmodels-20260416005 → energysystemmodels-20260416007}/src/energysystemmodels.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: energysystemmodels
-Version: 20260416005
+Version: 20260416007
 Summary: Energy systems models are the mathematical models that are developed in order to represent as reliably as possible various energy-related problems.
 Author: Zoheir HADID
 Author-email: zoheir.hadid@gmail.com