Re-write of main.c

This commit is contained in:
Lew Rossman
2018-12-06 11:11:41 -05:00
parent 5f2cd402ef
commit 0930a64142

View File

@@ -3,121 +3,89 @@
Project: OWA EPANET Project: OWA EPANET
Version: 2.2 Version: 2.2
Module: main.c Module: main.c
Description: implementation of the CLI for EPANET Description: main stub for a command line executable version of EPANET
Authors: see AUTHORS Authors: see AUTHORS
Copyright: see AUTHORS Copyright: see AUTHORS
License: see LICENSE License: see LICENSE
Last Updated: 11/27/2018 Last Updated: 12/06/2018
****************************************************************************** ******************************************************************************
*/ */
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include "epanet2.h" #include "epanet2.h"
#define MAXMSG 255 /* Max. # characters in message text */ void writeConsole(char *s)
#define MAXWARNCODE 99 {
/* text copied here, no more need of include "text.h" */ fprintf(stdout, "\r%s", s);
#define FMT01 "\nEPANET Version %d.%d.%d\n" fflush(stdout);
#define FMT03 "\nUsage:\n %s <input_filename> <report_filename> [<binary_filename>]\n" }
#define FMT09 "\n\nEPANET completed.\n"
#define FMT10 "\nEPANET completed. There are warnings.\n"
#define FMT11 "\nEPANET completed. There are errors.\n"
int main(int argc, char *argv[])
void writeConsole(char *s);
/*
----------------------------------------------------------------
Entry point used to compile a stand-alone executable.
----------------------------------------------------------------
*/
int main(int argc, char *argv[])
/*-------------------------------------------------------------- /*--------------------------------------------------------------
** Input: argc = number of command line arguments ** Input: argc = number of command line arguments
** *argv[] = array of command line arguments ** *argv[] = array of command line arguments
** Output: none ** Output: none
** Purpose: main program segment ** Purpose: main program stub for command line EPANET
** **
** Command line for stand-alone operation is: ** Command line for stand-alone operation is:
** progname f1 f2 f3 ** progname f1 f2 f3
** where progname = name of executable this code was compiled to, ** where progname = name of executable this code was compiled to,
** f1 = name of input file, ** f1 = name of input file,
** f2 = name of report file (optional, stdout if left blank) ** f2 = name of report file
** f3 = name of binary output file (optional, nullfile if left blank). ** f3 = name of binary output file (optional).
**-------------------------------------------------------------- **--------------------------------------------------------------
*/ */
{ {
char *f1,*f2,*f3; char *f1,*f2,*f3;
char blank[] = ""; char blank[] = "";
char errmsg[MAXMSG+1]=""; char errmsg[256] = "";
int errcode; int errcode;
int version; int version;
int major; int major;
int minor; int minor;
int patch; int patch;
// Check for proper number of command line arguments
if (argc < 3)
{
printf(
"\nUsage:\n %s <input_filename> <report_filename> [<binary_filename>]\n",
argv[0]);
return 0;
}
/* get version from DLL and trasform in Major.Minor.Patch format // Get version number and display in Major.Minor.Patch format
instead of hardcoded version */ ENgetversion(&version);
ENgetversion(&version); major = version/10000;
major= version/10000; minor = (version%10000)/100;
minor= (version%10000)/100; patch = version%100;
patch= version%100; printf("\n... Running EPANET Version %d.%d.%d\n", major, minor, patch);
printf(FMT01, major, minor, patch);
// Assign pointers to file names
/* Check for proper number of command line arguments */ f1 = argv[1];
if (argc < 2) {
printf(FMT03, argv[0]);
return(1);
}
/* set inputfile name */
f1 = argv[1];
if (argc > 2) {
/* set rptfile name */
f2 = argv[2]; f2 = argv[2];
} if (argc > 3) f3 = argv[3];
else { else f3 = blank;
/* use stdout for rptfile */
f2 = blank;
}
if (argc > 3) {
/* set binary output file name */
f3 = argv[3];
}
else {
/* NO binary output*/
f3 = blank;
}
/* Call the main control function */ // Run EPANET
errcode = ENepanet(f1,f2,f3,NULL); errcode = ENepanet(f1, f2, f3, &writeConsole);
/* Error/Warning check */ // Blank out the last progress message
if (errcode == 0) { printf("\r ");
/* no errors */
printf(FMT09); // Check for errors/warnings and report accordingly
return(0); if (errcode == 0)
} {
else { printf("\n... EPANET ran successfully.\n");
if (errcode > MAXWARNCODE) printf("\n Fatal Error: "); }
ENgeterror(errcode, errmsg, MAXMSG); else if (errcode < 100)
printf("%s\n", errmsg); {
if (errcode > MAXWARNCODE) { printf("\n... EPANET ran with warnings - check the Status Report.\n");
// error // }
printf(FMT11); else
return(errcode); {
} ENgeterror(errcode, errmsg, 256);
else { printf("\n... EPANET failed with ERROR %d: %s.\n", errcode, errmsg);
// warning // }
printf(FMT10); return errcode;
return(0); }
}
}
} /* End of main */