Merge branch 'dev'

OpenWaterAnalytics · Apr 19, 2024 · 02ae224 · 02ae224
2 parents 85d0946 + 3849a45
commit 02ae224
Show file tree

Hide file tree

Showing 16 changed files with 329 additions and 350 deletions.
diff --git a/epyt/__init__.py b/epyt/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 __author__ = """Marios S. Kyriakou"""
 __email__ = "[email protected]"
-__version__ = "1.0.9-beta.6"
+__version__ = "1.1.0"
 __msxversion__ = "2.0.0"
 __copyright__ = """Copyright 2022, KIOS Research and Innovation Center of Excellence (KIOS CoE), 
 University of Cyprus (www.kios.org.cy)."""

diff --git a/epyt/epanet.py b/epyt/epanet.py
diff --git a/epyt/examples/python/EX6_load_two_inp_files.py b/epyt/examples/python/EX6_load_two_inp_files.py
@@ -9,8 +9,8 @@
 from epyt import epanet
 
 # Load networks
-d1 = epanet('Net1.inp')
-d2 = epanet('Net2.inp')
+d1 = epanet('Net1.inp', ph=True)
+d2 = epanet('Net2.inp', ph=True)
 
 # Close any open figures
 d1.plot_close()

diff --git a/epyt/examples/python/EX_to_excel_json.py b/epyt/examples/python/EX_to_excel_json.py
@@ -41,10 +41,10 @@
 """ -------------------  excel ---------------------------- """
 # Create a .xlsx excel file and save all the values of each attribute
 # in seperate sheet
-comp_values.to_excel("to_excel_seperate_values_example")
+# comp_values.to_excel("to_excel_seperate_values_example")
 
 # Create a .xlsx excel file and save all the values in a sheet
-comp_values.to_excel("to_excel_all_values_example", allValues=True)
+# comp_values.to_excel("to_excel_all_values_example", allValues=True)
 
 # Create a .xlsx excel file and select multiple attributes to be 
 # displayed in seperate sheets

diff --git a/epyt/examples/python/Toolkit_EX4_Network_Building.py b/epyt/examples/python/Toolkit_EX4_Network_Building.py
@@ -15,7 +15,7 @@
 
 # Create an empty INP file
 testinp = 'TESTING.inp'
-d = epanet(testinp, 'CREATE')
+d = epanet(testinp, 'CREATE', ph=True)
 
 # Initialize epanet flow units 
 d.initializeEPANET(d.ToolkitConstants.EN_GPM, d.ToolkitConstants.EN_HW)
@@ -69,7 +69,7 @@
 
 # Save the project for future use
 d.saveInputFile(testinp)
-d = epanet(testinp)
+d = epanet(testinp, ph=True)
 d.plot()
 d.plot_show()
 d.deleteProject()
diff --git a/epyt/examples/python/Toolkit_api_EX2_using_MSX_functions.py b/epyt/examples/python/Toolkit_api_EX2_using_MSX_functions.py
@@ -8,7 +8,7 @@
 inpname = os.path.join(dirname, 'msx-examples', 'net2-cl2.inp')
 msxname = os.path.join(dirname, 'msx-examples', 'net2-cl2.msx')
 
-d = epanet(inpname, msx=True)
+d = epanet(inpname)
 msx = epanetmsxapi(msxname)
 MSX_SPECIES = 3
 ss = list(range(1, d.LinkCount + 1))

diff --git a/epyt/libraries/glnx/epanetmsx b/epyt/libraries/glnx/epanetmsx
diff --git a/epyt/libraries/glnx/libepanet2 b/epyt/libraries/glnx/libepanet2
diff --git a/epyt/libraries/mac/epanetmsx b/epyt/libraries/mac/epanetmsx
diff --git a/epyt/libraries/mac/libepanet2 b/epyt/libraries/mac/libepanet2
diff --git a/epyt/libraries/win/epanet2.dll b/epyt/libraries/win/epanet2.dll
diff --git a/epyt/libraries/win/epanet2.exe b/epyt/libraries/win/epanet2.exe
diff --git a/epyt/libraries/win/epanetmsx.exe b/epyt/libraries/win/epanetmsx.exe
diff --git a/epyt/tests/general_unit_test.py b/epyt/tests/general_unit_test.py
diff --git a/epyt/tests/net1_unit_test.py b/epyt/tests/net1_unit_test.py
@@ -8,7 +8,7 @@ def setUp(self):
         """Call before every test case."""
         # Create EPANET object using the INP file
         inp_name = 'Net1.inp'
-        self.epanetClass = epanet(inp_name)
+        self.epanetClass = epanet(inp_name, ph=False)
 
     def tearDown(self):
         """Call after every test case."""

diff --git a/epyt/tests/test_unit_MSX.py b/epyt/tests/test_unit_MSX.py
@@ -12,7 +12,7 @@ def setUp(self):
         # Create EPANET object using the INP file
         inpname = os.path.join(DIRNAME, 'msx-examples', 'Net3-NH2CL.inp')
         msxfile = os.path.join(DIRNAME, 'msx-examples', 'Net3-NH2CL.msx')
-        self.epanetClass = epanet(inpname, msx=True)
+        self.epanetClass = epanet(inpname)
         self.msxClass = self.epanetClass.loadMSXFile(msxfile)
 
     def tearDown(self):
@@ -253,7 +253,7 @@ def test_MSXgetqual(self):
         self.msxClass.MSXclose()
         self.epanetClass.unload()
         inpname = os.path.join(DIRNAME, 'msx-examples', 'net2-cl2.inp')
-        self.epanetClass = epanet(inpname, msx=True)
+        self.epanetClass = epanet(inpname)
         file_path = os.path.join(DIRNAME, 'msx-examples', 'net2-cl2.msx')
         self.msxClass = self.epanetClass.loadMSXFile(file_path)
 
@@ -270,10 +270,10 @@ def test_MSXgetqual(self):
                 self.assertEqual(self.msxClass.MSXgetqual(0, 1, 1), 0.8,
                                  'Wrong get qual comment output')
             if c == 85:
-                self.assertEqual(self.msxClass.MSXgetqual(0, 1, 1), 0.7991662288393907,
+                self.assertEqual(self.msxClass.MSXgetqual(0, 1, 1), 0.7991666666666667,
                                  'Wrong  get qual comment output')
             if c == 660:
-                self.assertEqual(self.msxClass.MSXgetqual(0, 1, 1), 0.7999999830262526,
+                self.assertEqual(self.msxClass.MSXgetqual(0, 1, 1), 0.8,
                                  'Wrong  get qual comment output')
             if tleft <= 0:
                 break