Merge branch 'dev' into contributor-lr

2018-08-24 16:09:21 -04:00
parent 364e4987d8 761199b08e
commit f495d2c707
11 changed files with 467 additions and 47 deletions
--- a/src/types.h
+++ b/src/types.h
@@ -151,8 +151,9 @@ typedef enum {
  V_CURVE,       /*    volume curve                      */
  P_CURVE,       /*    pump curve                        */
  E_CURVE,       /*    efficiency curve                  */
-  H_CURVE
-} CurveType;     /*    head loss curve                   */
+  H_CURVE,       /*    head loss curve                   */
+  G_CURVE        /*    General\default curve             */
+} CurveType;

 typedef enum {
  CONST_HP,      /*    constant horsepower              */