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

Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into copy-dev-swig

Browse Source
This commit is contained in:
Michael Tryby
2018-08-27 09:40:20 -04:00
parent bdc05058ca 13011ae71c
commit f03e954dc8
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
run/main.c
View File

@@ -5,8 +5,8 @@
#define MAXMSG 255 /* Max. # characters in message text */ #define MAXMSG 255 /* Max. # characters in message text */
#define MAXWARNCODE 99 #define MAXWARNCODE 99
/* text copied here, no more need of include "text.h" */ /* text copied here, no more need of include "text.h" */
#define FMT01 "\nEPANET Version %d.%d.%d" #define FMT01 "\nEPANET Version %d.%d.%d\n"
#define FMT03 "\n Correct syntax is:\n %s <input file> <output file>\n" #define FMT03 "\nUsage:\n %s <input_filename> <report_filename> [<binary_filename>]\n"
#define FMT09 "\n\nEPANET completed." #define FMT09 "\n\nEPANET completed."
#define FMT10 "\nEPANET completed. There are warnings." #define FMT10 "\nEPANET completed. There are warnings."
#define FMT11 "\nEPANET completed. There are errors." #define FMT11 "\nEPANET completed. There are errors."

2
src/epanet.c
View File

@@ -4737,7 +4737,7 @@ int DLLEXPORT EN_addnode(EN_ProjectHandle ph, char *id, EN_NodeType nodeType) {
} }
} }
} else { } else {
nIdx = net->Nnodes++; nIdx = net->Nnodes+1;
node = &net->Node[nIdx]; node = &net->Node[nIdx];
coord = &net->Coord[nIdx]; coord = &net->Coord[nIdx];
net->Ntanks++; net->Ntanks++;

5
src/text.h
View File

@@ -347,17 +347,12 @@ AUTHOR: L. Rossman
"* Version %d.%d *" "* Version %d.%d *"
#define LOGO6 \ #define LOGO6 \
"******************************************************************" "******************************************************************"
#define FMT01 "\n... EPANET Version %d.%d\n"
#define FMT02 "\n o Retrieving network data" #define FMT02 "\n o Retrieving network data"
#define FMT03 "\n Correct syntax is:\n %s <input file> <output file>\n"
#define FMT04 "\n Cannot use duplicate file names." #define FMT04 "\n Cannot use duplicate file names."
#define FMT05 "\n Cannot open input file " #define FMT05 "\n Cannot open input file "
#define FMT06 "\n Cannot open report file " #define FMT06 "\n Cannot open report file "
#define FMT07 "\n Cannot open output file " #define FMT07 "\n Cannot open output file "
#define FMT08 "\n Cannot open temporary output file" #define FMT08 "\n Cannot open temporary output file"
#define FMT09 "\n\n... EPANET completed.\n"
#define FMT10 "\n\n... EPANET completed. There are warnings.\n"
#define FMT11 "\n\n... EPANET completed. There are errors.\n"
#define FMT14 "\n o Computing hydraulics at hour " #define FMT14 "\n o Computing hydraulics at hour "
#define FMT15 "\n o Computing water quality at hour " #define FMT15 "\n o Computing water quality at hour "
#define FMT16 "\n o Transferring results to file" #define FMT16 "\n o Transferring results to file"