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

Revert "remove dublicate definition"

Browse Source 
This reverts commit 8808a01641.
This commit is contained in:
Marios Kyriakou
2018-08-23 16:47:52 +03:00
parent 4025d197b2
commit 0e6cc51d81
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
run/main.c
View File

@@ -1,10 +1,15 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <text.h>
#include "epanet2.h" #include "epanet2.h"
#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" */
#define FMT01 "\nEPANET Version %d.%d.%d"
#define FMT03 "\n Correct syntax is:\n\n\t %s <input file> <report file> <binary output file (optional)>\n"
#define FMT09 "\n\nEPANET completed."
#define FMT10 "\nEPANET completed. There are warnings."
#define FMT11 "\nEPANET completed. There are errors."
void writeConsole(char *s); void writeConsole(char *s);

10
src/text.h
View File

@@ -338,17 +338,17 @@ AUTHOR: L. Rossman
"* Version %d.%d *" "* Version %d.%d *"
#define LOGO6 \ #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 FMT02 "\n o Retrieving network data"
#define FMT03 "\nUsage:\n %s <input_filename> <report_filename> [<binary_filename>]\n" #define FMT03 "\n Correct syntax is:\n\n\t %s <input file> <report file> <binary output file (optional)>\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\nEPANET completed.\n" #define FMT09 "\n\n... EPANET completed.\n"
#define FMT10 "\n\nEPANET completed. There are warnings.\n" #define FMT10 "\n\n... EPANET completed. There are warnings.\n"
#define FMT11 "\n\nEPANET completed. There are errors.\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"