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

Added error code and description for wrong demand category index

Browse Source
This commit is contained in:
Elad Salomons
2015-06-30 19:39:06 +03:00
parent 91aa538adf
commit cdbd08acca
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/epanet.c
View File

@@ -3198,6 +3198,7 @@ char *geterrmsg(int errcode)
case 241: sprintf(Msg,ERR241,t_FUNCCALL,""); break; case 241: sprintf(Msg,ERR241,t_FUNCCALL,""); break;
case 250: sprintf(Msg,ERR250); break; case 250: sprintf(Msg,ERR250); break;
case 251: sprintf(Msg,ERR251); break; case 251: sprintf(Msg,ERR251); break;
case 253: sprintf(Msg,ERR253); break;
/* File Errors */ /* File Errors */
case 301: strcpy(Msg,ERR301); break; case 301: strcpy(Msg,ERR301); break;
@@ -3275,9 +3276,9 @@ void writewin(char *s)
int DLLEXPORT ENgetnumdemands(int nodeIndex, int *numDemands) int DLLEXPORT ENgetnumdemands(int nodeIndex, int *numDemands)
/*---------------------------------------------------------------- /*----------------------------------------------------------------
** Input: nodeIndex = index of node ** Input: nodeIndex = index of node
** Output: *numDemands = number of demand catagories ** Output: *numDemands = number of demand categories
** Returns: error code ** Returns: error code
** Purpose: retrieves the number of a demand catagories for a node ** Purpose: retrieves the number of a demand categories for a node
**---------------------------------------------------------------- **----------------------------------------------------------------
*/ */
{ {
@@ -3295,10 +3296,10 @@ int DLLEXPORT ENgetnumdemands(int nodeIndex, int *numDemands)
int DLLEXPORT ENgetbasedemand(int nodeIndex, int demandIdx, EN_API_FLOAT_TYPE *baseDemand) int DLLEXPORT ENgetbasedemand(int nodeIndex, int demandIdx, EN_API_FLOAT_TYPE *baseDemand)
/*---------------------------------------------------------------- /*----------------------------------------------------------------
** Input: nodeIndex = index of node ** Input: nodeIndex = index of node
** demandIdx = index of demand catagory ** demandIdx = index of demand category
** Output: *baseDemand = base demand for selected catagory ** Output: *baseDemand = base demand for selected category
** Returns: error code ** Returns: error code
** Purpose: retrieves the node's base demand for a catagory ** Purpose: retrieves the node's base demand for a category
**---------------------------------------------------------------- **----------------------------------------------------------------
*/ */
{ {
@@ -3322,10 +3323,10 @@ int DLLEXPORT ENgetbasedemand(int nodeIndex, int demandIdx, EN_API_FLOAT_TYPE *
int DLLEXPORT ENsetbasedemand(int nodeIndex, int demandIdx, EN_API_FLOAT_TYPE baseDemand) int DLLEXPORT ENsetbasedemand(int nodeIndex, int demandIdx, EN_API_FLOAT_TYPE baseDemand)
/*---------------------------------------------------------------- /*----------------------------------------------------------------
** Input: nodeIndex = index of node ** Input: nodeIndex = index of node
** demandIdx = index of demand catagory ** demandIdx = index of demand category
** baseDemand = base demand for selected catagory ** baseDemand = base demand for selected category
** Returns: error code ** Returns: error code
** Purpose: sets the node's base demand for a catagory ** Purpose: sets the node's base demand for a category
**---------------------------------------------------------------- **----------------------------------------------------------------
*/ */
{ {
@@ -3346,11 +3347,11 @@ int DLLEXPORT ENsetbasedemand(int nodeIndex, int demandIdx, EN_API_FLOAT_TYPE b
int DLLEXPORT ENgetdemandpattern(int nodeIndex, int demandIdx, int *pattIdx) int DLLEXPORT ENgetdemandpattern(int nodeIndex, int demandIdx, int *pattIdx)
/*---------------------------------------------------------------- /*----------------------------------------------------------------
** Input: nodeIndex = index of node ** Input: nodeIndex = index of node
** demandIdx = index of demand catagory ** demandIdx = index of demand category
** Output: *pattIdx = demand pattern index ** Output: *pattIdx = demand pattern index
** Returns: error code ** Returns: error code
** Purpose: retrieves the index of a demand pattern for a specific ** Purpose: retrieves the index of a demand pattern for a specific
** demand catagory of a node ** demand category of a node
**---------------------------------------------------------------- **----------------------------------------------------------------
*/ */
{ {

2
src/text.h
View File

@@ -493,6 +493,8 @@ AUTHOR: L. Rossman
#define ERR250 "Input Error 250: function call contains invalid format." #define ERR250 "Input Error 250: function call contains invalid format."
#define ERR251 "Input Error 251: function call contains invalid parameter code." #define ERR251 "Input Error 251: function call contains invalid parameter code."
#define ERR253 "Input Error 253: Function call error - No such demand category index."
#define ERR301 "File Error 301: identical file names." #define ERR301 "File Error 301: identical file names."
#define ERR302 "File Error 302: cannot open input file." #define ERR302 "File Error 302: cannot open input file."
#define ERR303 "File Error 303: cannot open report file." #define ERR303 "File Error 303: cannot open report file."