Merge pull request #895 from OpenWaterAnalytics/dev-Flow_Balance_Fix

Fixes flow balance bug for halted runs

Author: LRossman

src/flowbalance.c

@@ -16,7 +16,7 @@
 // Exported functions (declared in funcs.h)
 //void startflowbalance(Project *);
 //void updateflowbalance(Project *, long);
-//void endflowbalance(Project *);
+//void endflowbalance(Project *, long);
 
 void startflowbalance(Project *pr)
 /*
@@ -143,7 +143,7 @@ void updateflowbalance(Project *pr, long hstep)
     hyd->FlowBalance.storageDemand += flowBalance.storageDemand * dt;
 }
 
-void endflowbalance(Project *pr)
+void endflowbalance(Project *pr, long tFinal)
 /*
 **-------------------------------------------------------------------
 **  Input:   none
@@ -153,12 +153,11 @@ void endflowbalance(Project *pr)
 */
 {
     Hydraul *hyd = &pr->hydraul;
-    Times   *time = &pr->times;
 
     double seconds, qin, qout, qstor, r;
 
-    if (time->Htime > 0)
-        seconds = time->Htime;
+    if (tFinal > 0)
+        seconds = tFinal;
     else
         seconds = 1.0;        
     hyd->FlowBalance.totalInflow /= seconds;

src/funcs.h

@@ -215,6 +215,6 @@ int     leakagehasconverged(Project *);
 
 void    startflowbalance(Project *);
 void    updateflowbalance(Project *, long);
-void    endflowbalance(Project *);
+void    endflowbalance(Project *, long);
 
 #endif

src/hydraul.c

@@ -243,6 +243,7 @@ int  nexthyd(Project *pr, long *tstep)
     Hydraul *hyd = &pr->hydraul;
     Times   *time = &pr->times;
 
+    long  tNow = time->Htime;
     long  hydstep;         // Actual time step
     int   errcode = 0;     // Error code
 
@@ -280,7 +281,7 @@ int  nexthyd(Project *pr, long *tstep)
     // No more time remains - force completion of analysis
     else
     {
-        endflowbalance(pr);
+        endflowbalance(pr, tNow);
         if (pr->report.Statflag) writeflowbalance(pr);
         time->Htime++;
         if (pr->quality.OpenQflag) time->Qtime++;