EnergySystemModels 20260416005__tar.gz → 20260416006__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: energysystemmodels
-Version: 20260416005
+Version: 20260416006
 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-20260416006}/setup.py

@@ -11,7 +11,7 @@ setup(
     name='energysystemmodels',
 
 
-    version='20260416005',
+    version='20260416006',
 
     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-20260416006}/src/ThermodynamicCycles/Combustion/NG_Boiler_Efficiency_EN1295X.py

@@ -219,20 +219,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-20260416006}/src/energysystemmodels.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: energysystemmodels
-Version: 20260416005
+Version: 20260416006
 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