JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

InitSetting added to Link struct

Browse Source 
Addresses issue #823.
This commit is contained in:
Lew Rossman
2025-04-19 12:54:45 -04:00
parent 179ec25d20
commit 30c20770b3
6 changed files with 85 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/hydraul.c
View File

@@ -1,13 +1,13 @@
/*
******************************************************************************
Project: OWA EPANET
Version: 2.2
Version: 2.3
Module: hydraul.c
Description: implements EPANET's hydraulic engine
Authors: see AUTHORS
Copyright: see AUTHORS
License: see LICENSE
Last Updated: 06/26/2024
Last Updated: 04/19/2025
******************************************************************************
*/
@@ -71,7 +71,7 @@ int openhyd(Project *pr)
if (!errcode) for (i = 1; i <= pr->network.Nlinks; i++)
{
link = &pr->network.Link[i];
initlinkflow(pr, i, link->Status, link->Kc);
initlinkflow(pr, i, link->InitStatus, link->Kc);
}
else closehyd(pr);
return errcode;
@@ -124,9 +124,12 @@ void inithyd(Project *pr, int initflag)
link->ResultIndex = i;
// Initialize status and setting
hyd->LinkStatus[i] = link->Status;
hyd->LinkSetting[i] = link->Kc;
hyd->LinkStatus[i] = link->InitStatus;
hyd->LinkSetting[i] = link->InitSetting;
// Set runtime setting of non-ACTIVE valves to "MISSING"
if (link->Type >= PRV && link->InitStatus != ACTIVE) link->Kc = MISSING;
// Compute flow resistance
resistcoeff(pr, i);