epyt-flow 0.13.1__py3-none-any.whl → 0.14.1__py3-none-any.whl

epyt_flow/EPANET/EPANET/SRC_engines/epanet2.c

@@ -1,13 +1,13 @@
 /*
  ******************************************************************************
  Project:      OWA EPANET
- Version:      2.2
+ Version:      2.3
  Module:       epanet2.c
  Description:  implementation of the legacy EPANET API functions
  Authors:      see AUTHORS
  Copyright:    see AUTHORS
  License:      see LICENSE
- Last Updated: 11/02/2019
+ Last Updated: 02/14/2025
  ******************************************************************************
 */
 
@@ -99,12 +99,20 @@ int DLLEXPORT ENopen(const char *inpFile, const char *rptFile, const char *outFi
     return errcode;
 }
 
+int DLLEXPORT ENopenX(const char *inpFile, const char *rptFile, const char *outFile)
+{
+    int errcode = 0;
+    createtmpfiles();
+    errcode = EN_openX(_defaultProject, inpFile, rptFile, outFile);
+    return errcode;
+}
+
 int DLLEXPORT ENgettitle(char *line1, char *line2, char *line3)
 {
     return EN_gettitle(_defaultProject, line1, line2, line3) ;
 }
 
-int DLLEXPORT ENsettitle(char *line1, char *line2, char *line3)
+int DLLEXPORT ENsettitle(const char *line1, const char *line2, const char *line3)
 {
     return EN_settitle(_defaultProject, line1, line2, line3) ;
 }
@@ -114,11 +122,20 @@ int DLLEXPORT ENgetcomment(int object, int index, char *comment)
     return EN_getcomment(_defaultProject, object, index, comment);
 }
 
-int  DLLEXPORT ENsetcomment(int object, int index, char *comment)
+int  DLLEXPORT ENsetcomment(int object, int index, const char *comment)
 {
     return EN_setcomment(_defaultProject, object, index, comment);
 }
 
+int DLLEXPORT ENgettag(int object, int index, char *tag)
+{
+    return EN_gettag(_defaultProject, object, index, tag);
+}
+
+int  DLLEXPORT ENsettag(int object, int index, const char *tag)
+{
+    return EN_settag(_defaultProject, object, index, tag);
+}
 int DLLEXPORT ENgetcount(int object, int *count)
 {
     return EN_getcount(_defaultProject, object, count);
@@ -156,12 +173,12 @@ int DLLEXPORT ENnextH(long *tStep) { return EN_nextH(_defaultProject, tStep); }
 
 int DLLEXPORT ENcloseH() { return EN_closeH(_defaultProject); }
 
-int DLLEXPORT ENsavehydfile(char *filename)
+int DLLEXPORT ENsavehydfile(const char *filename)
 {
     return EN_savehydfile(_defaultProject, filename);
 }
 
-int DLLEXPORT ENusehydfile(char *filename)
+int DLLEXPORT ENusehydfile(const char *filename)
 {
     return EN_usehydfile(_defaultProject, filename);
 }
@@ -192,11 +209,11 @@ int DLLEXPORT ENcloseQ() { return EN_closeQ(_defaultProject); }
 
 ********************************************************************/
 
-int DLLEXPORT ENwriteline(char *line) { return EN_writeline(_defaultProject, line); }
+int DLLEXPORT ENwriteline(const char *line) { return EN_writeline(_defaultProject, line); }
 
 int DLLEXPORT ENreport() { return EN_report(_defaultProject); }
 
-int DLLEXPORT ENcopyreport(char *filename)
+int DLLEXPORT ENcopyreport(const char *filename)
 {
     return EN_copyreport(_defaultProject, filename);
 }
@@ -205,13 +222,23 @@ int DLLEXPORT ENclearreport() { return EN_clearreport(_defaultProject); }
 
 int DLLEXPORT ENresetreport() { return EN_resetreport(_defaultProject); }
 
-int DLLEXPORT ENsetreport(char *format) { return EN_setreport(_defaultProject, format); }
+int DLLEXPORT ENsetreport(const char *format) { return EN_setreport(_defaultProject, format); }
 
 int DLLEXPORT ENsetstatusreport(int level)
 {
     return EN_setstatusreport(_defaultProject, level);
 }
 
+int DLLEXPORT ENsetreportcallback(void (*callback)(void *userData, void *EN_projectHandle, const char*))
+{
+  return EN_setreportcallback(_defaultProject, callback);
+}
+
+int DLLEXPORT ENsetreportcallbackuserdata(void *userData)
+{
+  return EN_setreportcallbackuserdata(_defaultProject, userData);
+}
+
 int DLLEXPORT ENgetversion(int *version) { return EN_getversion(version); }
 
 int DLLEXPORT ENgeterror(int errcode, char *errmsg, int maxLen)
@@ -232,6 +259,10 @@ int DLLEXPORT ENgetresultindex(int type, int index, int *value)
     return EN_getresultindex(_defaultProject, type, index, value);
 }
 
+int  DLLEXPORT ENtimetonextevent(int *eventType, long *duration, int *elementIndex)
+{
+    return EN_timetonextevent(_defaultProject, eventType, duration, elementIndex);
+}
 
 /********************************************************************
 
@@ -283,8 +314,8 @@ int DLLEXPORT ENgetqualtype(int *qualType, int *traceNode)
     return EN_getqualtype(_defaultProject, qualType, traceNode);
 }
 
-int DLLEXPORT ENsetqualtype(int qualType, char *chemName, char *chemUnits,
-              char *traceNode)
+int DLLEXPORT ENsetqualtype(int qualType, const char *chemName,
+              const char *chemUnits, const char *traceNode)
 {
     return EN_setqualtype(_defaultProject, qualType, chemName, chemUnits, traceNode);
 }
@@ -295,7 +326,7 @@ int DLLEXPORT ENsetqualtype(int qualType, char *chemName, char *chemUnits,
 
 ********************************************************************/
 
-int DLLEXPORT ENaddnode(char *id, int nodeType, int *index)
+int DLLEXPORT ENaddnode(const char *id, int nodeType, int *index)
 {
     return EN_addnode(_defaultProject, id, nodeType, index);
 }
@@ -305,7 +336,7 @@ int DLLEXPORT ENdeletenode(int index, int actionCode)
     return EN_deletenode(_defaultProject, index, actionCode);
 }
 
-int DLLEXPORT ENgetnodeindex(char *id, int *index)
+int DLLEXPORT ENgetnodeindex(const char *id, int *index)
 {
     return EN_getnodeindex(_defaultProject, id, index);
 }
@@ -315,7 +346,7 @@ int DLLEXPORT ENgetnodeid(int index, char *id)
     return EN_getnodeid(_defaultProject, index, id);
 }
 
-int DLLEXPORT ENsetnodeid(int index, char *newid)
+int DLLEXPORT ENsetnodeid(int index, const char *newid)
 {
     return EN_setnodeid(_defaultProject, index, newid);
 }
@@ -333,13 +364,27 @@ int DLLEXPORT ENgetnodevalue(int index, int property, EN_API_FLOAT_TYPE *value)
     return errcode;
 }
 
+int DLLEXPORT ENgetnodevalues(int property, EN_API_FLOAT_TYPE *values)
+{
+    int i, errcode = 0;
+    EN_API_FLOAT_TYPE value;
+    
+    for (i = 1; i <= _defaultProject->network.Nnodes; i++)
+    {
+        errcode = ENgetnodevalue(i, property, &value);
+        values[i-1] = value;
+        if (errcode != 0) return errcode;
+    }
+    return 0;
+}
+
 int DLLEXPORT ENsetnodevalue(int index, int property, EN_API_FLOAT_TYPE value)
 {
     return EN_setnodevalue(_defaultProject, index, property, value);
 }
 
 int DLLEXPORT ENsetjuncdata(int index, EN_API_FLOAT_TYPE elev, EN_API_FLOAT_TYPE dmnd,
-              char *dmndpat)
+              const char *dmndpat)
 {
     return EN_setjuncdata(_defaultProject, index, elev, dmnd, dmndpat);
 }
@@ -347,7 +392,7 @@ int DLLEXPORT ENsetjuncdata(int index, EN_API_FLOAT_TYPE elev, EN_API_FLOAT_TYPE
 int  DLLEXPORT ENsettankdata(int index, EN_API_FLOAT_TYPE elev,
                EN_API_FLOAT_TYPE initlvl, EN_API_FLOAT_TYPE minlvl,
                EN_API_FLOAT_TYPE maxlvl, EN_API_FLOAT_TYPE diam,
-               EN_API_FLOAT_TYPE minvol, char *volcurve)
+               EN_API_FLOAT_TYPE minvol, const char *volcurve)
 {
     return EN_settankdata(_defaultProject, index, elev, initlvl, minlvl, maxlvl,
                           diam, minvol, volcurve);
@@ -387,7 +432,7 @@ int DLLEXPORT ENsetdemandmodel(int model, EN_API_FLOAT_TYPE pmin,
 }
 
 int DLLEXPORT ENadddemand(int nodeIndex, EN_API_FLOAT_TYPE baseDemand,
-    char *demandPattern, char *demandName)
+              const char *demandPattern, const char *demandName)
 {
     return EN_adddemand(_defaultProject, nodeIndex, baseDemand, demandPattern, demandName);
 }
@@ -397,7 +442,7 @@ int DLLEXPORT ENdeletedemand(int nodeIndex, int demandIndex)
     return EN_deletedemand(_defaultProject, nodeIndex, demandIndex);
 }
 
-int DLLEXPORT ENgetdemandindex(int nodeIndex, char *demandName, int *demandIndex)
+int DLLEXPORT ENgetdemandindex(int nodeIndex, const char *demandName, int *demandIndex)
 {
     return EN_getdemandindex(_defaultProject, nodeIndex, demandName, demandIndex);
 }
@@ -437,7 +482,7 @@ int DLLEXPORT ENgetdemandname(int nodeIndex, int demandIndex, char *demandName)
     return EN_getdemandname(_defaultProject, nodeIndex, demandIndex, demandName);
 }
 
-int DLLEXPORT ENsetdemandname(int nodeIndex, int demandIndex, char *demandName)
+int DLLEXPORT ENsetdemandname(int nodeIndex, int demandIndex, const char *demandName)
 {
     return EN_setdemandname(_defaultProject, nodeIndex, demandIndex, demandName);
 }
@@ -448,7 +493,8 @@ int DLLEXPORT ENsetdemandname(int nodeIndex, int demandIndex, char *demandName)
 
 ********************************************************************/
 
-int DLLEXPORT ENaddlink(char *id, int linkType, char *fromNode, char *toNode, int *index)
+int DLLEXPORT ENaddlink(const char *id, int linkType, const char *fromNode,
+              const char *toNode, int *index)
 {
     return EN_addlink(_defaultProject, id, linkType, fromNode, toNode, index);
 }
@@ -458,7 +504,7 @@ int DLLEXPORT ENdeletelink(int index, int actionCode)
     return EN_deletelink(_defaultProject, index, actionCode);
 }
 
-int DLLEXPORT ENgetlinkindex(char *id, int *index)
+int DLLEXPORT ENgetlinkindex(const char *id, int *index)
 {
     return EN_getlinkindex(_defaultProject, id, index);
 }
@@ -468,7 +514,7 @@ int DLLEXPORT ENgetlinkid(int index, char *id)
     return EN_getlinkid(_defaultProject, index, id);
 }
 
-int DLLEXPORT ENsetlinkid(int index, char *newid)
+int DLLEXPORT ENsetlinkid(int index, const char *newid)
 {
     return EN_setlinkid(_defaultProject, index, newid);
 }
@@ -500,6 +546,19 @@ int DLLEXPORT ENgetlinkvalue(int index, int property, EN_API_FLOAT_TYPE *value)
     *value = (EN_API_FLOAT_TYPE)v;
     return errcode;
 }
+int DLLEXPORT ENgetlinkvalues(int property, EN_API_FLOAT_TYPE *values)
+{
+    int i, errcode = 0;
+    EN_API_FLOAT_TYPE value;
+    
+    for (i = 1; i <= _defaultProject->network.Nlinks; i++)
+    {
+        errcode = ENgetlinkvalue(i, property, &value);
+        values[i-1] = value;
+        if (errcode != 0) return errcode;
+    }
+    return 0;
+}
 
 int DLLEXPORT ENsetlinkvalue(int index, int property, EN_API_FLOAT_TYPE value)
 {
@@ -516,16 +575,21 @@ int DLLEXPORT ENgetvertexcount(int index, int *count)
 {
     return EN_getvertexcount(_defaultProject, index, count);
 }
-    
+
 int DLLEXPORT ENgetvertex(int index, int vertex, double *x, double *y)
 {
     return EN_getvertex(_defaultProject, index, vertex, x, y);
 }
 
+int DLLEXPORT ENsetvertex(int index, int vertex, double x, double y)
+{
+    return EN_setvertex(_defaultProject, index, vertex, x, y);
+}
+
 int DLLEXPORT ENsetvertices(int index, double *x, double *y, int count)
 {
     return EN_setvertices(_defaultProject, index, x, y, count);
-}    
+}
 
 /********************************************************************
 
@@ -554,7 +618,7 @@ int DLLEXPORT ENsetheadcurveindex(int linkIndex, int curveIndex)
 
 ********************************************************************/
 
-int DLLEXPORT ENaddpattern(char *id)
+int DLLEXPORT ENaddpattern(const char *id)
 {
     return EN_addpattern(_defaultProject, id);
 }
@@ -564,7 +628,7 @@ int DLLEXPORT ENdeletepattern(int index)
     return EN_deletepattern(_defaultProject, index);
 }
 
-int DLLEXPORT ENgetpatternindex(char *id, int *index)
+int DLLEXPORT ENgetpatternindex(const char *id, int *index)
 {
     return EN_getpatternindex(_defaultProject, id, index);
 }
@@ -574,7 +638,7 @@ int DLLEXPORT ENgetpatternid(int index, char *id)
     return EN_getpatternid(_defaultProject, index, id);
 }
 
-int DLLEXPORT ENsetpatternid(int index, char *id)
+int DLLEXPORT ENsetpatternid(int index, const char *id)
 {
     return EN_setpatternid(_defaultProject, index, id);
 }
@@ -621,13 +685,18 @@ int DLLEXPORT ENsetpattern(int index, EN_API_FLOAT_TYPE *values, int len)
     return errcode;
 }
 
+int DLLEXPORT ENloadpatternfile(const char *filename, const char *id)
+{
+    return EN_loadpatternfile(_defaultProject, filename, id);
+}
+
 /********************************************************************
 
     Data Curve Functions
 
 ********************************************************************/
 
-int DLLEXPORT ENaddcurve(char *id)
+int DLLEXPORT ENaddcurve(const char *id)
 {
     return EN_addcurve(_defaultProject, id);
 }
@@ -637,7 +706,7 @@ int DLLEXPORT ENdeletecurve(int index)
     return EN_deletecurve(_defaultProject, index);
 }
 
-int DLLEXPORT ENgetcurveindex(char *id, int *index)
+int DLLEXPORT ENgetcurveindex(const char *id, int *index)
 {
     return EN_getcurveindex(_defaultProject, id, index);
 }
@@ -647,7 +716,7 @@ int DLLEXPORT ENgetcurveid(int index, char *id)
     return EN_getcurveid(_defaultProject, index, id);
 }
 
-int DLLEXPORT ENsetcurveid(int index, char *id)
+int DLLEXPORT ENsetcurveid(int index, const char *id)
 {
     return EN_setcurveid(_defaultProject, index, id);
 }
@@ -662,6 +731,11 @@ int DLLEXPORT ENgetcurvetype(int index, int *type)
     return EN_getcurvetype(_defaultProject, index, type);
 }
 
+int DLLEXPORT ENsetcurvetype(int index, int type)
+{
+    return EN_setcurvetype(_defaultProject, index, type);
+}
+
 int DLLEXPORT ENgetcurvevalue(int curveIndex, int pointIndex, EN_API_FLOAT_TYPE *x,
               EN_API_FLOAT_TYPE *y)
 {
@@ -704,10 +778,10 @@ int DLLEXPORT ENsetcurve(int index, EN_API_FLOAT_TYPE *xValues,
     double *xx = NULL;
     double *yy = NULL;
     int i, errcode = 0;
-    
+
     if (xValues == NULL || yValues == NULL) return 206;
     if (nPoints < 1) return 202;
-    
+
     xx = (double *)calloc(nPoints, sizeof(double));
     yy = (double *)calloc(nPoints, sizeof(double));
     if (xx && yy)
@@ -761,6 +835,17 @@ int DLLEXPORT ENsetcontrol(int index, int type, int linkIndex,
                          nodeIndex, level);
 }
 
+
+int DLLEXPORT ENgetcontrolenabled(int index, int *out_enabled)
+{
+    return EN_getcontrolenabled(_defaultProject, index, out_enabled);
+}
+
+int DLLEXPORT ENsetcontrolenabled(int index, int enabled)
+{
+    return EN_setcontrolenabled(_defaultProject, index, enabled);
+}
+
 /********************************************************************
 
     Rule-Based Controls Functions
@@ -863,3 +948,14 @@ int DLLEXPORT ENsetrulepriority(int index, EN_API_FLOAT_TYPE priority)
 {
     return EN_setrulepriority(_defaultProject, index, priority);
 }
+
+
+int DLLEXPORT ENgetruleenabled(int index, int *out_enabled)
+{
+    return EN_getruleenabled(_defaultProject, index, out_enabled);
+}
+
+int DLLEXPORT ENsetruleenabled(int index, int enabled)
+{
+    return EN_setruleenabled(_defaultProject, index, enabled);
+}

epyt_flow/EPANET/EPANET/SRC_engines/errors.dat

@@ -14,6 +14,7 @@ DAT(120,"cannot solve water quality transport equations")
 // These errors apply only to an input file
 DAT(200,"one or more errors in input file")
 DAT(201,"syntax error")
+DAT(299,"invalid section keyword")
 
 // These errors apply to both an input file and to API functions
 DAT(202,"illegal numeric value")
@@ -43,7 +44,10 @@ DAT(225,"invalid lower/upper levels for tank")
 DAT(226,"no head curve or power rating for pump")
 DAT(227,"invalid head curve for pump")
 DAT(230,"nonincreasing x-values for curve")
-DAT(233,"network has unconnected node")
+DAT(231,"no data provided for curve")
+DAT(232,"no data provided for pattern")
+DAT(233,"network has unconnected nodes")
+DAT(234,"network has an unconnected node with ID: ")
 
 // These errors apply only to API functions
 DAT(240,"nonexistent source")
@@ -60,6 +64,8 @@ DAT(259,"attempt to delete a node that still has links connected to it")
 DAT(260,"attempt to delete node assigned as a Trace Node")
 DAT(261,"attempt to delete a node or link contained in a control")
 DAT(262,"attempt to modify network structure while solver is active")
+DAT(263,"node is not a tank")
+DAT(264,"link is not a valve")
 
 // File errors
 DAT(301,"identical file names")

epyt_flow/EPANET/EPANET/SRC_engines/flowbalance.c

@@ -0,0 +1,186 @@
+/*
+ ******************************************************************************
+ Project:      OWA EPANET
+ Version:      2.3
+ Module:       flowbalance.c
+ Description:  computes components of network's flow balance
+ Authors:      see AUTHORS
+ Copyright:    see AUTHORS
+ License:      see LICENSE
+ Last Updated: 06/26/2024
+ ******************************************************************************
+*/
+
+#include "types.h"
+
+// Exported functions (declared in funcs.h)
+//void startflowbalance(Project *);
+//void updateflowbalance(Project *, long);
+//void endflowbalance(Project *);
+
+void startflowbalance(Project *pr)
+/*
+**-------------------------------------------------------------------
+**  Input:   none
+**  Output:  none
+**  Purpose: initializes components of the network's flow balance.
+**-------------------------------------------------------------------
+*/
+{
+    Hydraul *hyd = &pr->hydraul;
+    hyd->FlowBalance.totalInflow = 0.0;
+    hyd->FlowBalance.totalOutflow = 0.0;
+    hyd->FlowBalance.consumerDemand = 0.0;
+    hyd->FlowBalance.emitterDemand = 0.0;
+    hyd->FlowBalance.leakageDemand = 0.0;
+    hyd->FlowBalance.deficitDemand = 0.0;
+    hyd->FlowBalance.storageDemand = 0.0;
+    hyd->FlowBalance.ratio = 0.0;
+}    
+
+void updateflowbalance(Project *pr, long hstep)
+/*
+**-------------------------------------------------------------------
+**  Input:   hstep = time step (sec)
+**  Output:  none
+**  Purpose: updates components of the system flow balance.
+**-------------------------------------------------------------------
+*/
+{
+    Network *net = &pr->network;
+    Hydraul *hyd = &pr->hydraul;
+    Times   *time = &pr->times;
+
+    int i, j;
+    double v, dt, deficit, fullDemand;
+    SflowBalance flowBalance;
+    
+    // Determine current time interval in seconds
+    if (time->Dur == 0) dt = 1.0;
+    else if (time->Htime < time->Dur)
+    {
+        dt = (double) hstep;
+    }
+    else return;
+    
+    // Initialize local flow balance
+    flowBalance.totalInflow = 0.0;
+    flowBalance.totalOutflow = 0.0;
+    flowBalance.consumerDemand = 0.0;
+    flowBalance.emitterDemand = 0.0;
+    flowBalance.leakageDemand = 0.0;
+    flowBalance.deficitDemand = 0.0;
+    flowBalance.storageDemand = 0.0;
+    fullDemand = 0.0;
+    
+    // Initialize leakage loss
+    hyd->LeakageLoss = 0.0;
+
+    // Examine each junction node
+    for (i = 1; i <= net->Njuncs; i++) 
+    {
+        // Accumulate consumer demand flow
+        v = hyd->DemandFlow[i];
+        if (v < 0.0)
+            flowBalance.totalInflow += (-v);
+        else
+        {
+            fullDemand += hyd->FullDemand[i];
+            flowBalance.consumerDemand += v;
+            flowBalance.totalOutflow += v;
+        }
+        
+        // Accumulate emitter and leakage flow
+        v = hyd->EmitterFlow[i];
+        flowBalance.emitterDemand += v;
+        flowBalance.totalOutflow += v;
+        v = hyd->LeakageFlow[i];
+        flowBalance.leakageDemand += v;
+        flowBalance.totalOutflow += v;
+
+        // Accumulate demand deficit flow
+        if (hyd->DemandModel == PDA && hyd->FullDemand[i] > 0.0)
+        {
+            deficit = hyd->FullDemand[i] - hyd->DemandFlow[i];
+            if (deficit > 0.0)
+                flowBalance.deficitDemand += deficit;
+        }
+    }
+    
+    // Examine each tank/reservoir node
+    for (j = 1; j <= net->Ntanks; j++)
+    {
+        i = net->Tank[j].Node;
+        v = hyd->NodeDemand[i];
+
+        // For a reservoir node
+        if (net->Tank[j].A == 0.0)
+        {
+            if (v >= 0.0)
+                flowBalance.totalOutflow += v;
+            else
+                flowBalance.totalInflow += (-v);
+        }
+        
+        // For tank
+        else
+            flowBalance.storageDemand += v;
+    }
+    
+    // Find % leakage for current period
+    v = flowBalance.totalInflow;
+    if (flowBalance.storageDemand < 0.0) v += (-flowBalance.storageDemand);
+    if (v > 0.0)
+        hyd->LeakageLoss = flowBalance.leakageDemand / v * 100.0;
+
+    // Update flow balance for entire run
+    hyd->FlowBalance.totalInflow += flowBalance.totalInflow * dt;
+    hyd->FlowBalance.totalOutflow += flowBalance.totalOutflow * dt;
+    hyd->FlowBalance.consumerDemand += flowBalance.consumerDemand * dt;
+    hyd->FlowBalance.emitterDemand += flowBalance.emitterDemand * dt;
+    hyd->FlowBalance.leakageDemand += flowBalance.leakageDemand * dt;
+    hyd->FlowBalance.deficitDemand += flowBalance.deficitDemand * dt;
+    hyd->FlowBalance.storageDemand += flowBalance.storageDemand * dt;
+}
+
+void endflowbalance(Project *pr)
+/*
+**-------------------------------------------------------------------
+**  Input:   none
+**  Output:  none
+**  Purpose: finalizes components of the system flow balance.
+**-------------------------------------------------------------------
+*/
+{
+    Hydraul *hyd = &pr->hydraul;
+    Times   *time = &pr->times;
+    
+    double seconds, qin, qout, qstor, r;
+
+    if (time->Htime > 0)
+        seconds = time->Htime;
+    else
+        seconds = 1.0;        
+    hyd->FlowBalance.totalInflow /= seconds;
+    hyd->FlowBalance.totalOutflow /= seconds;
+    hyd->FlowBalance.consumerDemand /= seconds;
+    hyd->FlowBalance.emitterDemand /= seconds;
+    hyd->FlowBalance.leakageDemand /= seconds;
+    hyd->FlowBalance.deficitDemand /= seconds;
+    hyd->FlowBalance.storageDemand /= seconds;
+    
+    qin = hyd->FlowBalance.totalInflow;
+    qout = hyd->FlowBalance.totalOutflow;
+    qstor = hyd->FlowBalance.storageDemand;
+    if (qstor > 0.0)
+        qout += qstor;
+    else
+        qin -= qstor;
+    if (qin == qout)
+        r = 1.0;
+    else if (qin > 0.0)
+        r = qout / qin;
+    else
+        r = 0.0;
+    hyd->FlowBalance.ratio = r;
+}