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

Code cleanup

Browse Source
This commit is contained in:
Lew Rossman
2024-07-19 11:04:19 -04:00
parent 5894b67d81
commit cbf543f1b5
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/leakage.c
View File

@@ -56,7 +56,7 @@ static void convert_pipe_to_node_leakage(Project *pr);
static void init_node_leakage(Project *pr); static void init_node_leakage(Project *pr);
static int leakage_headloss(Project* pr, int i, double *hfa, static int leakage_headloss(Project* pr, int i, double *hfa,
double *gfa, double *hva, double *gva); double *gfa, double *hva, double *gva);
static void eval_leak_headloss(double RQtol, double q, double c, static void eval_leak_headloss(double q, double c,
double n, double *hloss, double *hgrad); double n, double *hloss, double *hgrad);
static void add_lower_barrier(double q, double *hloss, double *hgrad); static void add_lower_barrier(double q, double *hloss, double *hgrad);
@@ -470,7 +470,7 @@ int leakage_headloss(Project* pr, int i, double *hfa, double *gfa,
*gfa = 0.0; *gfa = 0.0;
} }
else else
eval_leak_headloss(hyd->RQtol, hyd->Leakage[i].qfa, hyd->Leakage[i].cfa, eval_leak_headloss(hyd->Leakage[i].qfa, hyd->Leakage[i].cfa,
0.5, hfa, gfa); 0.5, hfa, gfa);
if (hyd->Leakage[i].cva == 0.0) if (hyd->Leakage[i].cva == 0.0)
{ {
@@ -478,17 +478,16 @@ int leakage_headloss(Project* pr, int i, double *hfa, double *gfa,
*gva = 0.0; *gva = 0.0;
} }
else else
eval_leak_headloss(hyd->RQtol, hyd->Leakage[i].qva, hyd->Leakage[i].cva, eval_leak_headloss(hyd->Leakage[i].qva, hyd->Leakage[i].cva,
1.5, hva, gva); 1.5, hva, gva);
return TRUE; return TRUE;
} }
void eval_leak_headloss(double RQtol, double q, double c, double n, void eval_leak_headloss(double q, double c, double n,
double *hloss, double *hgrad) double *hloss, double *hgrad)
/* /*
**-------------------------------------------------------------- **--------------------------------------------------------------
** Input: RQtol = low gradient tolerance (ft/cfs) ** Input: q = leakage flow rate (cfs)
** q = leakage flow rate (cfs)
** c = leakage head loss coefficient ** c = leakage head loss coefficient
** n = leakage head loss exponent ** n = leakage head loss exponent
** Output: hloss = leakage head loss (ft) ** Output: hloss = leakage head loss (ft)
@@ -504,16 +503,6 @@ void eval_leak_headloss(double RQtol, double q, double c, double n,
{ {
n = 1.0 / n; n = 1.0 / n;
*hgrad = n * c * pow(fabs(q), n - 1.0); *hgrad = n * c * pow(fabs(q), n - 1.0);
// Use linear head loss function for small gradient
/* if (*hgrad < RQtol)
{
*hgrad = RQtol / n;
*hloss = (*hgrad) * q;
}
// Otherwise use normal leakage head loss function
else */
*hloss = (*hgrad) * q / n; *hloss = (*hgrad) * q / n;
// Prevent leakage from going negative // Prevent leakage from going negative