From 114bc4713cb455c71e4c82bb54d3c4292f7685fa Mon Sep 17 00:00:00 2001 From: Marios Kyriakou Date: Wed, 22 Aug 2018 19:37:27 +0300 Subject: [PATCH 01/10] fix addnode --- src/epanet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/epanet.c b/src/epanet.c index 03d1300..675f49f 100644 --- a/src/epanet.c +++ b/src/epanet.c @@ -4362,7 +4362,7 @@ int DLLEXPORT EN_addnode(EN_Project *p, char *id, EN_NodeType nodeType) { } } } else { - nIdx = net->Nnodes++; + nIdx = net->Nnodes+1; node = &net->Node[nIdx]; coord = &net->Coord[nIdx]; net->Ntanks++; From 29aa45febb2c67db4c521386041fed40f6bb1e8f Mon Sep 17 00:00:00 2001 From: Marios Kyriakou Date: Wed, 22 Aug 2018 22:32:30 +0300 Subject: [PATCH 02/10] Syntax for the epanet executable --- run/main.c | 2 +- src/text.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/run/main.c b/run/main.c index bda132f..04f9ee2 100644 --- a/run/main.c +++ b/run/main.c @@ -6,7 +6,7 @@ #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 FMT03 "\n Correct syntax is:\n\n\t %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/text.h b/src/text.h index 85159a9..ff12ecd 100755 --- a/src/text.h +++ b/src/text.h @@ -340,7 +340,7 @@ AUTHOR: L. Rossman "******************************************************************" #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 FMT03 "\n Correct syntax is:\n\n\t %s \n" #define FMT04 "\n Cannot use duplicate file names." #define FMT05 "\n Cannot open input file " #define FMT06 "\n Cannot open report file " From 1f4c3a0819bc5f53fe781edc1c9af9462ad7ef51 Mon Sep 17 00:00:00 2001 From: Marios Kyriakou Date: Thu, 23 Aug 2018 14:53:20 +0300 Subject: [PATCH 03/10] remove dublicate definition Add include text.h --- run/main.c | 7 +------ src/text.h | 10 +++++----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/run/main.c b/run/main.c index bda132f..f227616 100644 --- a/run/main.c +++ b/run/main.c @@ -1,15 +1,10 @@ #include #include +#include #include "epanet2.h" #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 FMT09 "\n\nEPANET completed." -#define FMT10 "\nEPANET completed. There are warnings." -#define FMT11 "\nEPANET completed. There are errors." void writeConsole(char *s); diff --git a/src/text.h b/src/text.h index 85159a9..ffc3991 100755 --- a/src/text.h +++ b/src/text.h @@ -338,17 +338,17 @@ AUTHOR: L. Rossman "* Version %d.%d *" #define LOGO6 \ "******************************************************************" -#define FMT01 "\n... EPANET Version %d.%d\n" +#define FMT01 "\nEPANET Version %d.%d.%d" #define FMT02 "\n o Retrieving network data" -#define FMT03 "\n Correct syntax is:\n %s \n" +#define FMT03 "\nUsage:\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 FMT09 "\n\nEPANET completed.\n" +#define FMT10 "\n\nEPANET completed. There are warnings.\n" +#define FMT11 "\n\nEPANET 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" From 219e46a4674e85c05ae86b71fc7402a5da8a4c42 Mon Sep 17 00:00:00 2001 From: Marios Kyriakou Date: Thu, 23 Aug 2018 14:54:48 +0300 Subject: [PATCH 04/10] Revert "remove dublicate definition" This reverts commit 1f4c3a0819bc5f53fe781edc1c9af9462ad7ef51. --- run/main.c | 7 ++++++- src/text.h | 10 +++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/run/main.c b/run/main.c index f227616..bda132f 100644 --- a/run/main.c +++ b/run/main.c @@ -1,10 +1,15 @@ #include #include -#include #include "epanet2.h" #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 FMT09 "\n\nEPANET completed." +#define FMT10 "\nEPANET completed. There are warnings." +#define FMT11 "\nEPANET completed. There are errors." void writeConsole(char *s); diff --git a/src/text.h b/src/text.h index ffc3991..85159a9 100755 --- a/src/text.h +++ b/src/text.h @@ -338,17 +338,17 @@ AUTHOR: L. Rossman "* Version %d.%d *" #define LOGO6 \ "******************************************************************" -#define FMT01 "\nEPANET Version %d.%d.%d" +#define FMT01 "\n... EPANET Version %d.%d\n" #define FMT02 "\n o Retrieving network data" -#define FMT03 "\nUsage:\n %s []\n" +#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\nEPANET completed.\n" -#define FMT10 "\n\nEPANET completed. There are warnings.\n" -#define FMT11 "\n\nEPANET completed. There are errors.\n" +#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" From 8808a01641fd02b3319e5ab0ed0b9e18cb4652f2 Mon Sep 17 00:00:00 2001 From: Marios Kyriakou Date: Thu, 23 Aug 2018 14:58:26 +0300 Subject: [PATCH 05/10] remove dublicate definition Add include text.h --- run/main.c | 7 +------ src/text.h | 10 +++++----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/run/main.c b/run/main.c index 04f9ee2..f227616 100644 --- a/run/main.c +++ b/run/main.c @@ -1,15 +1,10 @@ #include #include +#include #include "epanet2.h" #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\n\t %s \n" -#define FMT09 "\n\nEPANET completed." -#define FMT10 "\nEPANET completed. There are warnings." -#define FMT11 "\nEPANET completed. There are errors." void writeConsole(char *s); diff --git a/src/text.h b/src/text.h index ff12ecd..ffc3991 100755 --- a/src/text.h +++ b/src/text.h @@ -338,17 +338,17 @@ AUTHOR: L. Rossman "* Version %d.%d *" #define LOGO6 \ "******************************************************************" -#define FMT01 "\n... EPANET Version %d.%d\n" +#define FMT01 "\nEPANET Version %d.%d.%d" #define FMT02 "\n o Retrieving network data" -#define FMT03 "\n Correct syntax is:\n\n\t %s \n" +#define FMT03 "\nUsage:\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 FMT09 "\n\nEPANET completed.\n" +#define FMT10 "\n\nEPANET completed. There are warnings.\n" +#define FMT11 "\n\nEPANET 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" From 842b7e64d1e9bd24637d0b9a351d5cbc1386cbe1 Mon Sep 17 00:00:00 2001 From: Marios Kyriakou Date: Thu, 23 Aug 2018 16:26:13 +0300 Subject: [PATCH 06/10] replace to "text.h" --- run/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/main.c b/run/main.c index f227616..2351dc9 100644 --- a/run/main.c +++ b/run/main.c @@ -1,6 +1,6 @@ #include #include -#include +#include "text.h" #include "epanet2.h" #define MAXMSG 255 /* Max. # characters in message text */ From 4025d197b2d550e2cffc3875f616ab38f9a29807 Mon Sep 17 00:00:00 2001 From: Marios Kyriakou Date: Thu, 23 Aug 2018 16:47:31 +0300 Subject: [PATCH 07/10] Revert "replace to "text.h"" This reverts commit 842b7e64d1e9bd24637d0b9a351d5cbc1386cbe1. --- run/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/main.c b/run/main.c index 2351dc9..f227616 100644 --- a/run/main.c +++ b/run/main.c @@ -1,6 +1,6 @@ #include #include -#include "text.h" +#include #include "epanet2.h" #define MAXMSG 255 /* Max. # characters in message text */ From 0e6cc51d819aa2eec27faa3921bb9ecdf9aecfa2 Mon Sep 17 00:00:00 2001 From: Marios Kyriakou Date: Thu, 23 Aug 2018 16:47:52 +0300 Subject: [PATCH 08/10] Revert "remove dublicate definition" This reverts commit 8808a01641fd02b3319e5ab0ed0b9e18cb4652f2. --- run/main.c | 7 ++++++- src/text.h | 10 +++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/run/main.c b/run/main.c index f227616..04f9ee2 100644 --- a/run/main.c +++ b/run/main.c @@ -1,10 +1,15 @@ #include #include -#include #include "epanet2.h" #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\n\t %s \n" +#define FMT09 "\n\nEPANET completed." +#define FMT10 "\nEPANET completed. There are warnings." +#define FMT11 "\nEPANET completed. There are errors." void writeConsole(char *s); diff --git a/src/text.h b/src/text.h index ffc3991..ff12ecd 100755 --- a/src/text.h +++ b/src/text.h @@ -338,17 +338,17 @@ AUTHOR: L. Rossman "* Version %d.%d *" #define LOGO6 \ "******************************************************************" -#define FMT01 "\nEPANET Version %d.%d.%d" +#define FMT01 "\n... EPANET Version %d.%d\n" #define FMT02 "\n o Retrieving network data" -#define FMT03 "\nUsage:\n %s []\n" +#define FMT03 "\n Correct syntax is:\n\n\t %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\nEPANET completed.\n" -#define FMT10 "\n\nEPANET completed. There are warnings.\n" -#define FMT11 "\n\nEPANET completed. There are errors.\n" +#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" From 6d99867af6fa2f9fb62f0733b550d6ace0f86b08 Mon Sep 17 00:00:00 2001 From: Marios Kyriakou Date: Thu, 23 Aug 2018 16:59:02 +0300 Subject: [PATCH 09/10] update comment FMT01, FMT03, FMT09, FMT10, FMT11 in text.h --- run/main.c | 4 ++-- src/text.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/run/main.c b/run/main.c index 04f9ee2..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\n\t %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/text.h b/src/text.h index ff12ecd..942184b 100755 --- a/src/text.h +++ b/src/text.h @@ -338,17 +338,17 @@ AUTHOR: L. Rossman "* Version %d.%d *" #define LOGO6 \ "******************************************************************" -#define FMT01 "\n... EPANET Version %d.%d\n" +//#define FMT01 "\nEPANET Version %d.%d.%d\n" #define FMT02 "\n o Retrieving network data" -#define FMT03 "\n Correct syntax is:\n\n\t %s \n" +//#define FMT03 "\nUsage:\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 FMT09 "\n\nEPANET completed.\n" +//#define FMT10 "\n\nEPANET completed. There are warnings.\n" +//#define FMT11 "\n\nEPANET 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" From f4a57a969eb0d32e7d913ea21f84c61b06927e28 Mon Sep 17 00:00:00 2001 From: Marios Kyriakou Date: Sat, 25 Aug 2018 13:15:33 +0300 Subject: [PATCH 10/10] delete comment strings --- src/text.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/text.h b/src/text.h index 942184b..b5140ef 100755 --- a/src/text.h +++ b/src/text.h @@ -338,17 +338,12 @@ AUTHOR: L. Rossman "* Version %d.%d *" #define LOGO6 \ "******************************************************************" -//#define FMT01 "\nEPANET Version %d.%d.%d\n" #define FMT02 "\n o Retrieving network data" -//#define FMT03 "\nUsage:\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\nEPANET completed.\n" -//#define FMT10 "\n\nEPANET completed. There are warnings.\n" -//#define FMT11 "\n\nEPANET 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"