Merge pull request #282 from LRossman/lrossman-dev

Fixes zero flow (#164) and D-W eqn. (#199) issues

Author: michaeltryby

README.md

@@ -18,4 +18,3 @@ A step-by-step tutorial on how to contribute to EPANET using GitHub is also [ava
 __Note:__ This repository is not affiliated with, or endorsed by, the USEPA. For the last "official" release of EPANET (2.00.12 UI and Toolkit) please go to the [EPA's GitHub repo](https://github.com/USEPA/Water-Distribution-Network-Model) or [the USEPA website](http://www2.epa.gov/water-research/epanet). It is also not the graphical user interface version. This is the hydraulic and water quality solver engine.
 
 However, if you are interested in extending EPANET for academic, personal, or commercial use, then you've come to the right place. For community discussion, FAQ, and roadmapping of the project, go to the [Community Forum](http://community.wateranalytics.org/category/epanet). 
-

src/funcs.h

@@ -178,11 +178,12 @@ int     hydsolve(EN_Project *pr, int *,double *);   /* Solves network equations
 void    resistcoeff(EN_Project *pr, int k);         /* Finds pipe flow resistance */
 void    headlosscoeffs(EN_Project *pr);             // Finds link head loss coeffs.
 void    matrixcoeffs(EN_Project *pr);               /* Finds hyd. matrix coeffs.  */
-double  emitflowchange(EN_Project *pr, int i);      /* Change in emitter outflow  */
-double  demandflowchange(EN_Project *pr, int i,     // Change in demand outflow
-                         double dp, double n);
-void    demandparams(EN_Project *pr, double *dp,    // PDA function parameters
-                     double *n); 
+void    emitheadloss(EN_Project *pr, int,           // Finds emitter head loss
+                     double *, double *);           
+double  demandflowchange(EN_Project *pr, int,       // Change in demand outflow
+                         double, double);
+void    demandparams(EN_Project *pr, double *,      // PDA function parameters
+                     double *); 
 
 /* ----------- SMATRIX.C ---------------*/
 int     createsparse(EN_Project *pr);               /* Creates sparse matrix      */