Merge remote-tracking branch 'refs/remotes/upstream/dev' into dev-swig

2018-01-24 14:34:49 -05:00
parent 691c65878b dcd1c6dd10
commit 5e3ab5428d
12 changed files with 435 additions and 195 deletions
--- a/src/input2.c
+++ b/src/input2.c
@@ -400,6 +400,7 @@ int getpumpparams(EN_Project *pr)
        return (200);
      }
      curve = &net->Curve[j];
+      curve->Type = P_CURVE;
      n = curve->Npts;
      if (n == 1) {  /* Only a single h-q point supplied so use generic */
        pump->Ptype = POWER_FUNC; /* power function curve.   */