Merge pull request #12 from sdteffen/pumpEN_MINORLOSS

Fix ENgetlinkvalue() for EN_MINORLOSS and pumps.
2014-01-06 10:11:37 -08:00
parent d1b02129dc 1cd06a2bed
commit 017e24be1c
1 changed files with 1 additions and 4 deletions
--- a/src/epanet.c
+++ b/src/epanet.c
@@ -1642,12 +1642,9 @@ int DLLEXPORT ENgetlinkvalue(int index, int code, float *value)
         break;

      case EN_MINORLOSS:
+         v = Link[index].Km;
         if (Link[index].Type != PUMP)
-         {
-            v = Link[index].Km;
            v *= (SQR(Link[index].Diam)*SQR(Link[index].Diam)/0.02517);
-         }
-         else v = 0.0;
         break;

      case EN_INITSTATUS: