Merge pull request #39 from mauriziocingi/dev-2.1

organize the division between DLL and CLE

build/Linux/Makefile

@@ -41,10 +41,13 @@ runcmdname = runepanet2.sh
 epanetincludedir = ../../include
 # Search path for sources
 epanetsrcdir = ../../src
-VPATH = $(epanetsrcdir):$(epanetincludedir)
+epanetrundir = ../../run
+VPATH = $(epanetsrcdir):$(epanetincludedir):$(epanetrundir)
 
 # Install directories
+#prefix = /usr/local # GNU standard -- requires superuser rights
 prefix =~
+#
 exec_prefix = $(prefix)
 libdir = $(exec_prefix)/lib
 bindir = $(exec_prefix)/bin
@@ -66,11 +69,11 @@ INSTALL_DATA = $(INSTALL) -m 644
 # Files for the shared object library
 epanet_objs=hash.o hydraul.o inpfile.o input1.o input2.o \
 	    input3.o mempool.o output.o quality.o report.o \
-	    rules.o smatrix.o
+	    rules.o smatrix.o epanet.o
 # Epanet header files
-epanet_heads=enumstxt.h funcs.h hash.h mempool.h text.h toolkit.h types.h vars.h
+epanet_heads=enumstxt.h funcs.h hash.h mempool.h text.h types.h vars.h
 # Epanet main program
-epanet_main=epanet
+epanet_main=main
 # Epanet main program header files
 epanet_main_heads=epanet2.h
 
@@ -78,11 +81,9 @@ epanet_main_heads=epanet2.h
 all: $(libname) $(exename)
 
 $(libname): $(epanet_objs)
-	$(CC) $(CFLAGS) $(CPPFLAGS) -D SOL -c $(epanetsrcdir)/$(epanet_main).c
+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@  $^
-	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $(epanet_main).o $^
 
-$(exename): $(libname) $(epanet_main_heads)
+$(exename): $(epanet_main).o $(epanet_main_heads)
-	$(CC) $(CFLAGS) $(CPPFLAGS) -D CLE -c $(epanetsrcdir)/$(epanet_main).c
 	$(CC) $(CFLAGS) -o $@ $(epanet_main).o -l$(epanetrootname) $(LDFLAGS)
 
 $(epanet_objs): $(epanet_heads)
@@ -95,7 +96,7 @@ install:
 	$(INSTALL_PROGRAM) -D $(exename) $(bindir)/$(exename)
 	$(INSTALL_PROGRAM) -D $(libname) $(libdir)/$(libname)
 	$(INSTALL_DATA) -D $(epanetincludedir)/epanet2.h $(includedir)/epanet2.h
-	$(INSTALL_PROGRAM) -D $(runcmdname) $(bindir)/$(runcmdname)
+	$(INSTALL_PROGRAM) -D $(runcmdname) ~/$(runcmdname)
 
 .PHONY: uninstall
 uninstall:

build/Linux/runepanet.sh.template

@@ -0,0 +1,3 @@
+#!/bin/sh
+export LD_LIBRARY_PATH=libdir:$LD_LIBRARY_PATH
+exec exename $*

build/MinGW/Makefile

@@ -52,7 +52,7 @@ epanet_heads=enumstxt.h funcs.h hash.h mempool.h text.h types.h vars.h epanet2.h
 # Epanet main program
 epanet_main=main
 # Epanet main program header files
-epanet_main_heads=epanet2.h text.h
+epanet_main_heads=epanet2.h
 
 .PHONY: all
 all: $(libname) $(exename)

include/epanet2.h

@@ -36,7 +36,6 @@
 // --- define DLLEXPORT
 #ifndef DLLEXPORT
   #ifdef WINDOWS
-    #define DLLDATA  __declspec(dllexport)
     #ifdef __cplusplus
       #define DLLEXPORT extern "C" __declspec(dllexport)
     #else
@@ -54,9 +53,6 @@
     #define DLLEXPORT
   #endif
 #endif
-#ifndef DLLDATA
-    #define DLLDATA
-#endif
 
 
 // --- Define the EPANET toolkit constants
@@ -287,7 +283,6 @@ extern "C" {
   int  DLLEXPORT ENsetcurvevalue(int index, int pnt, EN_API_FLOAT_TYPE x, EN_API_FLOAT_TYPE y);
   int  DLLEXPORT ENsetcurve(int index, EN_API_FLOAT_TYPE *x, EN_API_FLOAT_TYPE *y, int len);
   int  DLLEXPORT ENaddcurve(char *id);
-  char DLLDATA Warnflag;
   
 #if defined(__cplusplus)
 }

run/main.c

@@ -1,10 +1,19 @@
 #include <stdio.h>
+#include <string.h>
 #include "epanet2.h"
-#include "text.h"
+
+#define   MAXMSG         79       /* 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\n"
+#define FMT03  "\n Correct syntax is:\n epanet <input file> <output file>\n"
+#define FMT09  "\nEPANET completed.\n"
+#define FMT10  "\nEPANET completed. There are warnings."
+#define FMT11  "\nEPANET completed. There are errors."
+
 
 void  writeConsole(char *s);
 
-extern char Warnflag;
 
 /*
 ----------------------------------------------------------------
@@ -23,42 +32,89 @@ int   main(int argc, char *argv[])
  **  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, and
+ **  f1 = name of input file,
- **  f3 = name of binary output file (optional).
+ **  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[25];
+  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 < 3) {
+  if (argc < 2) {
     writeConsole(FMT03);
+    return(1);
+  }
+
+  /* set inputfile name */
+  f1 = argv[1];
+  if (argc > 2) {
+    /* set rptfile name */
+    f2 = argv[2];
   }
   else {
-    /* Call the main control function */
+    /* use stdout for rptfile */
-    f1 = argv[1];
+    f2 = blank;
-    f2 = argv[2];
+  }
   if (argc > 3) {
+    /* set binary output file name */
     f3 = argv[3];
   }
   else {
+    /* NO binary output*/
     f3 = blank;
   }
-    writeConsole(FMT01);
+
-    errcode = ENepanet(f1,f2,f3,NULL);
+  /* Call the main control function */
-    if (errcode > 0) {
+  if (strlen(f2)> 0) {
-      writeConsole(FMT11);
+     /* use stdout for progress messages */
-    }
+     errcode = ENepanet(f1,f2,f3,writeConsole);
-    else if (Warnflag > 0) {
-      writeConsole(FMT10);
   }
   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 {
+     ENgeterror(errcode, errmsg, MAXMSG);
+     writeConsole(errmsg);
+     if (errcode > MAXWARNCODE) {
+     	/* error */
+        writeConsole(FMT11);
+        return(errcode);
+     }
+     else {
+     	  /* warning */
+        writeConsole(FMT10);
+        return(0);
+     }
+  }
+
+
 }                                       /* End of main */
 
 
@@ -70,6 +126,8 @@ void  writeConsole(char *s)
  **----------------------------------------------------------------
  */
 {
-  fprintf(stdout,"%s",s);
+  fprintf(stdout,"%s\n",s);
   fflush(stdout);
 }
+
+

src/epanet.c

@@ -180,7 +180,7 @@ int DLLEXPORT ENepanet(char *f1, char *f2, char *f3, void (*pviewprog) (char *))
     ERRCODE(ENsolveQ());
     ERRCODE(ENreport());
     ENclose();
-    return(errcode);
+    return(MAX(errcode, Warnflag) );
 }
 
 
@@ -290,7 +290,7 @@ int DLLEXPORT ENclose()
    }                                                                           //(2.00.12 - LR)
 
    if (InFile  != NULL) { fclose(InFile);  InFile=NULL;  }
-   if (RptFile != NULL) { fclose(RptFile); RptFile=NULL; }
+   if (RptFile != NULL && RptFile != stdout) { fclose(RptFile); RptFile=NULL; }
    if (HydFile != NULL) { fclose(HydFile); HydFile=NULL; }
    if (OutFile != NULL) { fclose(OutFile); OutFile=NULL; }
   
@@ -3499,8 +3499,8 @@ void  writecon(char *s)
 */
 {
                                                     //(2.00.11 - LR)
-   fprintf(stdout,s);
+   //fprintf(stdout,s);
-   fflush(stdout);
+   //fflush(stdout);
 
 }
 
@@ -3514,14 +3514,12 @@ void writewin(char *s)
 **----------------------------------------------------------------
 */
 {
-#ifdef DLL
    char progmsg[MAXMSG+1];
    if (viewprog != NULL)
    {
       strncpy(progmsg,s,MAXMSG);
       viewprog(progmsg);
    }
-#endif
 }
 
 

src/output.c

@@ -503,6 +503,7 @@ int  savefinaloutput()
       ERRCODE(savetimestat(x,LINKHDR));
       if (!errcode) Nperiods = 1;
       fclose(TmpOutFile);
+      TmpOutFile=NULL;
       free(x);
    }