diff --git a/run/main.c b/run/main.c index bda132f..ed79edf 100644 --- a/run/main.c +++ b/run/main.c @@ -5,8 +5,8 @@ #define MAXMSG 255 /* Max. # characters in message text */ #define MAXWARNCODE 99 /* text copied here, no more need of include "text.h" */ -#define FMT01 "\nEPANET Version %d.%d.%d" -#define FMT03 "\n Correct syntax is:\n %s \n" +#define FMT01 "\nEPANET Version %d.%d.%d\n" +#define FMT03 "\nUsage:\n %s []\n" #define FMT09 "\n\nEPANET completed." #define FMT10 "\nEPANET completed. There are warnings." #define FMT11 "\nEPANET completed. There are errors." diff --git a/src/epanet.c b/src/epanet.c index 0829902..5e5afe5 100644 --- a/src/epanet.c +++ b/src/epanet.c @@ -4737,7 +4737,7 @@ int DLLEXPORT EN_addnode(EN_ProjectHandle ph, char *id, EN_NodeType nodeType) { } } } else { - nIdx = net->Nnodes++; + nIdx = net->Nnodes+1; node = &net->Node[nIdx]; coord = &net->Coord[nIdx]; net->Ntanks++; diff --git a/src/text.h b/src/text.h index 0e2d9de..656b3c2 100755 --- a/src/text.h +++ b/src/text.h @@ -347,17 +347,12 @@ AUTHOR: L. Rossman "* Version %d.%d *" #define LOGO6 \ "******************************************************************" -#define FMT01 "\n... EPANET Version %d.%d\n" #define FMT02 "\n o Retrieving network data" -#define FMT03 "\n Correct syntax is:\n %s \n" #define FMT04 "\n Cannot use duplicate file names." #define FMT05 "\n Cannot open input file " #define FMT06 "\n Cannot open report file " #define FMT07 "\n Cannot open 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 FMT15 "\n o Computing water quality at hour " #define FMT16 "\n o Transferring results to file"