Update epanet2_enums.h

include/epanet2_enums.h

@@ -65,7 +65,10 @@ typedef enum {
   EN_CANOVERFLOW  = 26, //!< Tank can overflow (= 1) or not (= 0)
   EN_DEMANDDEFICIT = 27,//!< Amount that full demand is reduced under PDA (read only)
   EN_NODE_INCONTROL = 28, //!< Is present in any simple or rule-based control (= 1) or not (= 0)
-  EN_EMITTERFLOW    = 29  //!< Current emitter flow (read only)
+  EN_EMITTERFLOW    = 29, //!< Current emitter flow (read only)
+  EN_LEAKAGEFLOW    = 30, //!< Current leakage flow (read only)
+  EN_DEMANDFLOW     = 31, //!< Current consumer demand delivered (read only)
+  EN_FULLDEMAND     = 32  //!< Current consumer demand requested (read only)
 } EN_NodeProperty;
 
 /// Link properties
@@ -99,7 +102,10 @@ typedef enum {
   EN_PUMP_EPAT    = 22, //!< Pump energy price time pattern index
   EN_LINK_INCONTROL = 23,  //!< Is present in any simple or rule-based control (= 1) or not (= 0)
   EN_GPV_CURVE    = 24, //!< GPV head loss v. flow curve index
-  EN_PCV_CURVE    = 25  //!< PCV loss coeff. curve index
+  EN_PCV_CURVE    = 25, //!< PCV loss coeff. curve index
+  EN_LEAK_AREA    = 26, //!< Pipe leak area (sq mm per 100 length units)
+  EN_LEAK_EXPAN   = 27, //!< Leak expansion rate (sq mm per unit of pressure head)
+  EN_LINK_LEAKAGE = 28  //!< Current leakage rate (read only)
 } EN_LinkProperty;
 
 /// Time parameters
@@ -152,7 +158,8 @@ typedef enum {
   EN_MAXFLOWCHANGE   = 3, //!< Largest flow change in links
   EN_MASSBALANCE     = 4, //!< Cumulative water quality mass balance ratio
   EN_DEFICIENTNODES  = 5, //!< Number of pressure deficient nodes
-  EN_DEMANDREDUCTION = 6  //!< % demand reduction at pressure deficient nodes
+  EN_DEMANDREDUCTION = 6, //!< % demand reduction at pressure deficient nodes
+  EN_LEAKAGELOSS     = 7  //!< % flow lost to system leakage
 } EN_AnalysisStatistic;
 
 /// Types of network objects