epyt-flow 0.14.1__py3-none-any.whl → 0.14.2__py3-none-any.whl

epyt_flow/EPANET/EPANET/SRC_engines/main.c

@@ -0,0 +1,93 @@
+/*
+ ******************************************************************************
+ Project:      OWA EPANET
+ Version:      2.2
+ Module:       main.c
+ Description:  main stub for a command line executable version of EPANET
+ Authors:      see AUTHORS
+ Copyright:    see AUTHORS
+ License:      see LICENSE
+ Last Updated: 12/07/2018
+ ******************************************************************************
+*/
+
+#include <stdio.h>
+#include "epanet2.h"
+
+void  writeConsole(char *s)
+{
+    fprintf(stdout, "\r%s", s);
+    fflush(stdout);
+}
+
+int  main(int argc, char *argv[])
+/*--------------------------------------------------------------
+ **  Input:   argc    = number of command line arguments
+ **           *argv[] = array of command line arguments
+ **  Output:  none
+ **  Purpose: main program stub for command line EPANET
+ **
+ **  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
+ **  f3 = name of binary output file (optional).
+ **--------------------------------------------------------------
+ */
+{
+    char *f1,*f2,*f3;
+    char blank[] = "";
+    char errmsg[256] = "";
+    int  errcode;
+    int  version;
+    int  major;
+    int  minor;
+    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 number and display in Major.Minor.Patch format
+    ENgetversion(&version);
+    major = version/10000;
+    minor = (version%10000)/100;
+    patch = version%100;
+    printf("\n... Running EPANET Version %d.%d.%d\n", major, minor, patch);
+  
+    // Assign pointers to file names
+    f1 = argv[1];
+    f2 = argv[2];
+    if (argc > 3) f3 = argv[3];
+    else          f3 = blank;
+
+    // Run EPANET
+    errcode = ENepanet(f1, f2, f3, &writeConsole);
+
+    // Blank out the last progress message
+    printf("\r                                                               ");
+
+    // Check for errors/warnings and report accordingly
+    if (errcode == 0)
+    {
+        printf("\n... EPANET ran successfully.\n");
+        return 0;
+    }
+    else if (errcode < 100)
+    {
+        printf("\n... EPANET ran with warnings - check the Status Report.\n");
+        return 0;
+    }
+    else
+    {
+        ENgeterror(errcode, errmsg, 255);
+        printf("\n... EPANET failed with %s.\n", errmsg);
+        return 100;
+    }
+}

epyt_flow/EPANET/EPANET/SRC_engines/mempool.c

@@ -1,15 +1,15 @@
 /*
  ******************************************************************************
  Project:      OWA EPANET
- Version:      2.3
+ Version:      2.2
  Module:       mempool.c
  Description:  a simple fast poooled memory allocation package
  Authors:      see AUTHORS
  Copyright:    see AUTHORS
  License:      see LICENSE
- Last Updated: 08/02/2023
+ Last Updated: 05/15/2019
 
- This module is based on code by Steve Hill in Graphics Gems III,
+ This module is based code by Steve Hill in Graphics Gems III,
  David Kirk (ed.), Academic Press, Boston, MA, 1992
  ******************************************************************************
 */
@@ -72,11 +72,7 @@ struct Mempool * mempool_create()
     if (mempool == NULL) return NULL;
     mempool->first = createMemBlock();
     mempool->current = mempool->first;
-    if (mempool->first == NULL)
-    {
-        free(mempool);
-        return NULL;
-    }
+    if (mempool->first == NULL) return NULL;
     return mempool;
 }
 

epyt_flow/EPANET/EPANET/SRC_engines/mempool.h

@@ -1,24 +1,24 @@
-/*
- ******************************************************************************
- Project:      OWA EPANET
- Version:      2.3
- Module:       mempool.h
- Description:  header for a simple pooled memory allocator
- Authors:      see AUTHORS
- Copyright:    see AUTHORS
- License:      see LICENSE
- Last Updated: 11/27/2018
- ******************************************************************************
-*/
-
-#ifndef MEMPOOL_H
-#define MEMPOOL_H
-
-struct Mempool;
-
-struct Mempool * mempool_create();
-void   mempool_delete(struct Mempool *mempool);
-void   mempool_reset(struct Mempool *mempool);
-char * mempool_alloc(struct Mempool *mempool, size_t size);
-
+/*
+ ******************************************************************************
+ Project:      OWA EPANET
+ Version:      2.2
+ Module:       mempool.h
+ Description:  header for a simple pooled memory allocator
+ Authors:      see AUTHORS
+ Copyright:    see AUTHORS
+ License:      see LICENSE
+ Last Updated: 11/27/2018
+ ******************************************************************************
+*/
+
+#ifndef MEMPOOL_H
+#define MEMPOOL_H
+
+struct Mempool;
+
+struct Mempool * mempool_create();
+void   mempool_delete(struct Mempool *mempool);
+void   mempool_reset(struct Mempool *mempool);
+char * mempool_alloc(struct Mempool *mempool, size_t size);
+
 #endif

epyt_flow/EPANET/EPANET/SRC_engines/output.c

@@ -1,13 +1,13 @@
 /*
 ******************************************************************************
 Project:      OWA EPANET
-Version:      2.3
+Version:      2.2
 Module:       output.c
 Description:  binary file read/write routines
 Authors:      see AUTHORS
 Copyright:    see AUTHORS
 License:      see LICENSE
-Last Updated: 08/13/2022
+Last Updated: 05/13/2019
 ******************************************************************************
 */
 
@@ -567,7 +567,6 @@ int linkoutput(Project *pr, int j, REAL4 *x, double ucf)
               case FCV:
                 x[i] = (REAL4)(setting * pr->Ucf[FLOW]); break;
               case TCV:
-              case PCV:
                 x[i] = (REAL4)setting; break;
               default: x[i] = 0.0f;
             }
@@ -588,8 +587,8 @@ int linkoutput(Project *pr, int j, REAL4 *x, double ucf)
 
       case FRICTION:  // Friction factor
         // f = 2ghd/(Lu^2) where f = friction factor
-        // u = velocity, g = grav. accel., h = head
-        // loss, d = diam., & L = pipe length
+        // u = velocity, g = grav. accel., h = head loss
+        //loss, d = diam., & L = pipe length
         for (i = 1; i <= net->Nlinks; i++)
         {
             if (net->Link[i].Type <= PIPE && ABS(hyd->LinkFlow[i]) > TINY)