Add dedicated function assigncurvetypes and call it in openproject and EN_setflowunits

Author: andreArtelt

epanet-src/epanet.c

@@ -7,7 +7,7 @@
  Authors:      see AUTHORS
  Copyright:    see AUTHORS
  License:      see LICENSE
- Last Updated: 01/28/2026
+ Last Updated: 02/17/2026
  ******************************************************************************
 */
 
@@ -1477,6 +1477,9 @@ int DLLEXPORT EN_setflowunits(EN_Project p, int units)
 
     if (!p->Openflag) return 102;
 
+    // Make sure all curve types are correctly set
+    assigncurvetypes(net);
+
     // Determine unit system based on flow units
     qfactor = Ucf[FLOW];
     vfactor = Ucf[VOLUME];

epanet-src/funcs.h

@@ -7,7 +7,7 @@
  Authors:      see AUTHORS
  Copyright:    see AUTHORS
  License:      see LICENSE
- Last Updated: 04/23/2025
+ Last Updated: 02/17/2025
  ******************************************************************************
 */
 #ifndef FUNCS_H
@@ -40,6 +40,7 @@ int     findvalve(Network *, int);
 int     findpump(Network *, int);
 int     findpattern(Network *, const char *);
 int     findcurve(Network *, const char *);
+void    assigncurvetypes(Network *network);
 
 Pdemand finddemand(Pdemand, int);
 int     adddemand(Snode *, double, int, const char *);

epanet-src/project.c

@@ -99,49 +99,7 @@ int openproject(Project *pr, const char *inpFile, const char *rptFile,
     errmsg(pr, errcode);
 
     // Fix curve types
-    Network *net = &pr->network;
-
-    // Pump curves
-    for (int i = 1; i <= net->Npumps; i++)
-    {
-        Spump *pump = &net->Pump[i];
-
-        int j;
-        if ((j = pump->Hcurve) > 0) {
-            net->Curve[j].Type = PUMP_CURVE;
-        }
-        if ((j = pump->Ecurve) > 0) {
-            net->Curve[j].Type = EFFIC_CURVE;
-        }
-    }
-
-    // Tank volume curves
-    for (int i=1; i <= net->Ntanks; i++) {
-        Stank* tank = &net->Tank[i];
-
-        int j;
-        if ((j = tank->Vcurve) > 0) {
-            net->Curve[j].Type = VOLUME_CURVE;
-        }
-    }
-
-    // Valve curves
-    for (int i=1; i <= net->Nvalves; i++) {
-        Svalve* valve = &net->Valve[i];
-        Slink* link = &net->Link[valve->Link];
-
-        int j;
-        if (link->Type == PCV) {
-            if((j = valve->Curve) > 0) {
-                net->Curve[j].Type = VALVE_CURVE;
-            }
-        }
-        else if (link->Type == GPV){
-            if((j = valve->Curve) > 0) {
-                net->Curve[j].Type = HLOSS_CURVE;
-            }
-        }
-    }
+    assigncurvetypes(&pr->network);
 
     return errcode;
 }
@@ -1147,6 +1105,58 @@ int findcurve(Network *network, const char *id)
     return 0;
 }
 
+void assigncurvetypes(Network *network)
+/*----------------------------------------------------------------
+**  Input:   none
+**  Output:  none
+**  Returns: none
+**  Purpose: assign correct curve type to all curves
+**----------------------------------------------------------------
+*/
+{
+    // Pump curves
+    for (int i = 1; i <= network->Npumps; i++)
+    {
+        Spump *pump = &network->Pump[i];
+
+        int j;
+        if ((j = pump->Hcurve) > 0) {
+            network->Curve[j].Type = PUMP_CURVE;
+        }
+        if ((j = pump->Ecurve) > 0) {
+            network->Curve[j].Type = EFFIC_CURVE;
+        }
+    }
+
+    // Tank volume curves
+    for (int i=1; i <= network->Ntanks; i++) {
+        Stank* tank = &network->Tank[i];
+
+        int j;
+        if ((j = tank->Vcurve) > 0) {
+            network->Curve[j].Type = VOLUME_CURVE;
+        }
+    }
+
+    // Valve curves
+    for (int i=1; i <= network->Nvalves; i++) {
+        Svalve* valve = &network->Valve[i];
+        Slink* link = &network->Link[valve->Link];
+
+        int j;
+        if (link->Type == PCV) {
+            if((j = valve->Curve) > 0) {
+                network->Curve[j].Type = VALVE_CURVE;
+            }
+        }
+        else if (link->Type == GPV){
+            if((j = valve->Curve) > 0) {
+                network->Curve[j].Type = HLOSS_CURVE;
+            }
+        }
+    }
+}
+
 void adjustpattern(int *pat, int index)
 /*----------------------------------------------------------------
 ** Local function that modifies a reference to a deleted time pattern