Merge branch 'fix-unit-conv-bug' into dev

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
  ******************************************************************************
 */
 
@@ -1470,7 +1470,7 @@ int DLLEXPORT EN_setflowunits(EN_Project p, int units)
 {
     Network *net = &p->network;
 
-    int i, j, oldUnitFlag;
+    int i, j;
     double qfactor, vfactor, hfactor, efactor, pfactor, dfactor, xfactor, yfactor;
     double dcf, pcf, hcf, qcf;
     double *Ucf = p->Ucf;
@@ -1485,7 +1485,6 @@ int DLLEXPORT EN_setflowunits(EN_Project p, int units)
     pfactor = Ucf[PRESSURE];
     dfactor = Ucf[DEMAND];
 
-    oldUnitFlag = p->parser.Unitsflag;
     p->parser.Flowflag = units;
     switch (units)
     {
@@ -1501,23 +1500,17 @@ int DLLEXPORT EN_setflowunits(EN_Project p, int units)
         p->parser.Unitsflag = US;
         break;
     }
-
-    // Revise pressure units depending on flow units
-    if (oldUnitFlag != p->parser.Unitsflag)
-    {
-        if (p->parser.Unitsflag == US) p->parser.Pressflag = PSI;
-        else p->parser.Pressflag = METERS;
-    }
     initunits(p);
 
-    // Update pressure units in rules
+    // Update units in rules
     dcf =  Ucf[DEMAND] / dfactor;
     pcf =  Ucf[PRESSURE] / pfactor;
     hcf =  Ucf[HEAD] / hfactor;
     qcf =  Ucf[FLOW] / qfactor;
     updateruleunits(p, dcf, pcf, hcf, qcf);
 
-    //update curves
+    //update curves after making sure that all curve types are correctly set
+    assigncurvetypes(net);
     for (i = 1; i <= net->Ncurves; i++)
     {
         switch (net->Curve[i].Type)

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

@@ -97,6 +97,10 @@ int openproject(Project *pr, const char *inpFile, const char *rptFile,
         pr->Openflag = TRUE;
     }
     errmsg(pr, errcode);
+
+    // Fix curve types
+    assigncurvetypes(&pr->network);
+
     return errcode;
 }
 
@@ -1101,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