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

Ignore errors in coords. read from file

Browse Source 
Ignores errors when reading node & link vertex coordinates from an input file. Also when saving a project to an input file, the [DEMANDS] section only includes non-zero demands.
See issues #603 and #174 .
This commit is contained in:
Lew Rossman
2023-01-26 12:50:26 -05:00
parent 7dab25e867
commit f60102105a
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/inpfile.c
View File

@@ -332,6 +332,7 @@ int saveinpfile(Project *pr, const char *fname)
node = &net->Node[i]; node = &net->Node[i];
for (demand = node->D; demand != NULL; demand = demand->next) for (demand = node->D; demand != NULL; demand = demand->next)
{ {
if (demand->Base == 0.0) continue;
sprintf(s, " %-31s %14.6f", node->ID, ucf * demand->Base); sprintf(s, " %-31s %14.6f", node->ID, ucf * demand->Base);
if ((j = demand->Pat) > 0) sprintf(s1, " %-31s", net->Pattern[j].ID); if ((j = demand->Pat) > 0) sprintf(s1, " %-31s", net->Pattern[j].ID);
else strcpy(s1, " "); else strcpy(s1, " ");

28
src/input3.c
View File

@@ -700,11 +700,14 @@ int coordata(Project *pr)
/* /*
**-------------------------------------------------------------- **--------------------------------------------------------------
** Input: none ** Input: none
** Output: returns error code ** Output: returns 0
** Purpose: processes coordinate data ** Purpose: processes node coordinate data
** Format: ** Format:
** [COORD] ** [COORD]
** id x y ** id x y
**
** Note: since node coords. are not used in any computations,
** invalid data are simply ignored.
**-------------------------------------------------------------- **--------------------------------------------------------------
*/ */
{ {
@@ -716,12 +719,12 @@ int coordata(Project *pr)
Snode *node; Snode *node;
// Check for valid node ID // Check for valid node ID
if (parser->Ntokens < 3) return 201; if (parser->Ntokens < 3) return 0;
if ((j = findnode(net, parser->Tok[0])) == 0) return setError(parser, 0, 203); if ((j = findnode(net, parser->Tok[0])) == 0) return 0;
// Check for valid data // Check for valid data
if (!getfloat(parser->Tok[1], &x)) return setError(parser, 1, 202); if (!getfloat(parser->Tok[1], &x)) return 0;
if (!getfloat(parser->Tok[2], &y)) return setError(parser, 2, 202); if (!getfloat(parser->Tok[2], &y)) return 0;
// Save coord data // Save coord data
node = &net->Node[j]; node = &net->Node[j];
@@ -734,11 +737,14 @@ int vertexdata(Project *pr)
/* /*
**-------------------------------------------------------------- **--------------------------------------------------------------
** Input: none ** Input: none
** Output: returns error code ** Output: returns 0
** Purpose: processes link vertex data ** Purpose: processes link vertex data
** Format: ** Format:
** [VERTICES] ** [VERTICES]
** id x y ** id x y
**
** Note: since vertex coords. are not used in any computations,
** invalid data are simply ignored.
**-------------------------------------------------------------- **--------------------------------------------------------------
*/ */
{ {
@@ -749,12 +755,12 @@ int vertexdata(Project *pr)
double x, y; double x, y;
// Check for valid link ID // Check for valid link ID
if (parser->Ntokens < 3) return 201; if (parser->Ntokens < 3) return 0;
if ((j = findlink(net, parser->Tok[0])) == 0) return setError(parser, 0, 204); if ((j = findlink(net, parser->Tok[0])) == 0) return 0;
// Check for valid coordinate data // Check for valid coordinate data
if (!getfloat(parser->Tok[1], &x)) return setError(parser, 1, 202); if (!getfloat(parser->Tok[1], &x)) return 0;
if (!getfloat(parser->Tok[2], &y)) return setError(parser, 2, 202); if (!getfloat(parser->Tok[2], &y)) return 0;
// Add to link's list of vertex points // Add to link's list of vertex points
return addlinkvertex(&net->Link[j], x, y); return addlinkvertex(&net->Link[j], x, y);