epyt-flow 0.14.0__tar.gz → 0.14.1__tar.gz

{epyt_flow-0.14.0 → epyt_flow-0.14.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: epyt-flow
-Version: 0.14.0
+Version: 0.14.1
 Summary: EPyT-Flow -- EPANET Python Toolkit - Flow
 Author-email: André Artelt <aartelt@techfak.uni-bielefeld.de>, "Marios S. Kyriakou" <kiriakou.marios@ucy.ac.cy>, "Stelios G. Vrachimis" <vrachimis.stelios@ucy.ac.cy>
 License-Expression: MIT
@@ -20,7 +20,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: epyt>=1.2.1
+Requires-Dist: epyt>=1.2.2
 Requires-Dist: requests>=2.31.0
 Requires-Dist: scipy>=1.11.4
 Requires-Dist: u-msgpack-python>=2.8.0

{epyt_flow-0.14.0 → epyt_flow-0.14.1}/REQUIREMENTS.txt

@@ -1,4 +1,4 @@
-epyt>=1.2.1
+epyt>=1.2.2
 requests>=2.31.0
 scipy>=1.11.4
 u-msgpack-python>=2.8.0

epyt_flow-0.14.1/epyt_flow/EPANET/EPANET/SRC_engines/AUTHORS

@@ -0,0 +1,60 @@
+# Authors ordered alphabetically.
+
+Authors with Contributions in the Public Domain:
+Lewis Rossman <LRossman@cinci.rr.com>
+Michael Tryby <tryby.michael@epa.gov>
+
+Version 2.0
+Lewis Rossman <LRossman@cinci.rr.com>
+
+Authors with Contributions Subject to Copyright (see LICENSE):
+Except where noted.
+
+Version 2.1
+Jinduan	Chen <jinduan.uc@gmail.com>
+Maurizio Cingi <mrzcng2@gmail.com>
+Demetrios Eliades <eldemet@gmail.com>
+Will Furnass <will@thearete.co.uk>
+Milad Ghiami <milad.ghiami67@gmail.com>
+Sam Hatchett <samhatchett@gmail.com>
+Mike Kane <muke195@gmail.com>
+Marios Kyriakou <mariosmsk@gmail.com>
+Steffen	Macke <sdteffen@sdteffen.de>
+Angela Marchi <angela.marchi@adelaide.edu.au>
+Bryant McDonnell <bemcdonnell@gmail.com>
+Lew Rossman <LRossman@cinci.rr.com>
+Elad Salomons <selad@optiwater.com>
+Feng Shang <fengshang72@gmail.com>	
+Yunier Soad <yunier.soad@gmail.com>
+Tom Taxon <tntaxon@anl.gov>
+Michael	Tryby <tryby.michael@epa.gov> (Contributions in the Public Domain)
+James Uber <jim@citilogics.com>
+Hyoungmin Woo <hyoungmin.woo@gmail.com>
+
+Version 2.2
+Demetrios Eliades <eldemet@gmail.com>
+Sam Hatchett <samhatchett@gmail.com>
+Abel Heinsbroek <mail@abelheinsbroek.nl>
+Marios Kyriakou <mariosmsk@gmail.com>
+Lewis Rossman <LRossman@cinci.rr.com>
+Elad Salomons <selad@optiwater.com>
+Markus Sunela <markus.sunela@fluidit.fi>
+Michael Tryby <tryby.michael@epa.gov> (Contributions in the Public Domain)
+
+Version 2.3
+Luke Butler <lukepbutler@gmail.com>
+Demetrios Eliades <eldemet@gmail.com>
+Sam Hatchett <samhatchett@gmail.com>
+Abel Heinsbroek <mail@abelheinsbroek.nl>
+Robert Janke <janke.robert@epa.gov>
+Marios Kyriakou <mariosmsk@gmail.com>
+Corey McNeish  
+0tkl <tkl.zhaoqing@gmail.com>
+Lewis Rossman <LRossman@cinci.rr.com>
+Elad Salomons <selad@optiwater.com>
+Alex Sinske 
+Sahand Tashak 
+Yu Chun Tsao 
+James Uber <jim@citilogics.com>
+Oscar Vegas Niño <ovegas141279@gmail.com>
+Dennis Zanutto <dennis.zanutto@kwrwater.nl>

{epyt_flow-0.14.0 → epyt_flow-0.14.1}/epyt_flow/EPANET/EPANET/SRC_engines/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 (see AUTHORS)
+Copyright (c) 2019 (See AUTHORS)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,8 +9,8 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice, list of authors, and this permission notice shall 
+be included in all copies or substantial portions of the Software. 
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

{epyt_flow-0.14.0 → epyt_flow-0.14.1}/epyt_flow/EPANET/EPANET/SRC_engines/enumstxt.h

@@ -1,13 +1,13 @@
 /*
  *****************************************************************************
  Project:      OWA EPANET
- Version:      2.2
+ Version:      2.3
  Module:       enumstxt.h
  Description:  text strings for enumerated data types
  Authors:      see AUTHORS
  Copyright:    see AUTHORS
  License:      see LICENSE
- Last Updated: 06/20/2019
+ Last Updated: 03/10/2025
  ******************************************************************************
 */
 
@@ -27,7 +27,8 @@ char *LinkTxt[]         = {w_CV,
                            w_PBV,
                            w_FCV,
                            w_TCV,
-                           w_GPV};
+                           w_GPV,
+                           w_PCV};
 
 char *StatTxt[]         = {t_XHEAD,
                            t_TEMPCLOSED,
@@ -58,7 +59,8 @@ char *RptFlowUnitsTxt[] = {u_CFS,
                            u_LPM,
                            u_MLD,
                            u_CMH,
-                           u_CMD};
+                           u_CMD,
+                           u_CMS};
 
 char *FlowUnitsTxt[]    = {w_CFS,
                            w_GPM, 
@@ -69,11 +71,14 @@ char *FlowUnitsTxt[]    = {w_CFS,
                            w_LPM, 
                            w_MLD, 
                            w_CMH,
-                           w_CMD};
+                           w_CMD,
+                           w_CMS};
 
 char *PressUnitsTxt[]   = {w_PSI,
                            w_KPA,
-                           w_METERS};
+                           w_METERS,
+                           w_BAR,
+                           w_FEET};
 
 char *DemandModelTxt[] = { w_DDA,
                            w_PDA,
@@ -110,6 +115,18 @@ char *MixTxt[]          = {w_MIXED,
 char *RptFlagTxt[]      = {w_NO,
                            w_YES,
                            w_FULL};
+                           
+char *BackflowTxt[]     = {w_NO,
+                           w_YES,
+                           NULL};
+                           
+char *CurveTypeTxt[]    = {c_VOLUME,
+                           c_PUMP,
+                           c_EFFIC,
+                           c_HEADLOSS,
+                           c_GENERIC,
+                           c_VALVE,
+                           NULL};                           
 
 char *SectTxt[]         = {s_TITLE,     s_JUNCTIONS, s_RESERVOIRS,
                            s_TANKS,     s_PIPES,     s_PUMPS,
@@ -120,7 +137,7 @@ char *SectTxt[]         = {s_TITLE,     s_JUNCTIONS, s_RESERVOIRS,
                            s_REACTIONS, s_MIXING,    s_REPORT,
                            s_TIMES,     s_OPTIONS,   s_COORDS,
                            s_VERTICES,  s_LABELS,    s_BACKDROP,
-                           s_TAGS,      s_END,
+                           s_TAGS,      s_LEAKAGE,   s_END,
                            NULL};
 
 char *Fldname[]         = {t_ELEV,      t_DEMAND,    t_HEAD,