Addresses issue #161

Adds new options HEADERROR and FLOWCHANGE to provide more rigorous criteria for hydraulic convergence. Also breaks HYDRAUL.C into 3 separate files to improve code readability.

src/main.c

@@ -0,0 +1,135 @@
+#include <stdio.h>
+#include <string.h>
+#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 <input file> <output file>\n"
+#define FMT09  "\n\nEPANET completed."
+#define FMT10  "\nEPANET completed. There are warnings."
+#define FMT11  "\nEPANET completed. There are errors."
+
+
+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
+ **           *argv[] = array of command line arguments
+ **  Output:  none
+ **  Purpose: main program segment
+ **
+ **  Command line for stand-alone operation is:
+ **    progname f1  f2  f3
+ **  where progname = name of executable this code was compiled to,
+ **  f1 = name of input file,
+ **  f2 = name of report file (optional, stdout if left blank)
+ **  f3 = name of binary output file (optional, nullfile if left blank).
+ **--------------------------------------------------------------
+ */
+{
+  char *f1,*f2,*f3;
+  char blank[] = "";
+  char errmsg[MAXMSG+1]="";
+  int  errcode;
+  int  version;
+  char s[256];
+  int major;
+  int minor;
+  int patch;
+
+  /* get version from DLL and trasform in Major.Minor.Patch format
+  instead of hardcoded version */
+  ENgetversion(&version);
+  major=  version/10000;
+  minor=  (version%10000)/100;
+  patch=  version%100;
+  sprintf(s,FMT01, major , minor, patch);
+  writeConsole(s);
+
+  
+  /* Check for proper number of command line arguments */
+  if (argc < 2) {
+    sprintf(s, FMT03, argv[0]);
+    writeConsole(s);
+    return(1);
+  }
+
+  /* set inputfile name */
+  f1 = argv[1];
+  if (argc > 2) {
+    /* set rptfile name */
+    f2 = argv[2];
+  }
+  else {
+    /* 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 */
+  if (strlen(f2)> 0) {
+     /* use stdout for progress messages */
+     //errcode = ENepanet(f1,f2,f3,writeConsole);
+     errcode = ENepanet(f1, f2, f3, NULL);
+  }
+  else {
+     /* use stdout for reporting, no progress messages */
+     errcode = ENepanet(f1,f2,f3,NULL);
+  }
+
+  /* Error/Warning check   */
+  if (errcode == 0) {
+     /* no errors */
+     writeConsole(FMT09);
+     return(0);
+  }
+  else {
+     if (errcode > MAXWARNCODE) printf("\n    Fatal Error: ");
+     ENgeterror(errcode, errmsg, MAXMSG);
+     writeConsole(errmsg);
+     if (errcode > MAXWARNCODE) {
+     	// error //
+        writeConsole(FMT11);
+        return(errcode);
+     }
+     else {
+     	  // warning //
+        writeConsole(FMT10);
+        return(0);
+     }
+  }
+
+}                                       /* End of main */
+
+
+void  writeConsole(char *s)
+/*----------------------------------------------------------------
+ **  Input:   text string
+ **  Output:  none
+ **  Purpose: writes string of characters to console
+ **----------------------------------------------------------------
+ */
+{
+  fprintf(stdout,"%s\n",s);
+  fflush(stdout);
+}
+
+