Update epanet.py

OpenWaterAnalytics · Mar 23, 2024 · 1cc5b30 · 1cc5b30
1 parent 73f4556
commit 1cc5b30
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/epyt/epanet.py b/epyt/epanet.py
@@ -12807,7 +12807,7 @@ def __init__(self, version=2.2, msx=False):
         libname = f"epanet2"
         ops = platform.system().lower()
         if ops in ["windows"]:
-            self.LibEPANET = resource_filename("epyt", os.path.join("libraries", "win", '64bit', f"{libname}2.dll"))
+            self.LibEPANET = resource_filename("epyt", os.path.join("libraries", "win", f"{libname}.dll"))
         elif ops in ["darwin"]:
             self.LibEPANET = resource_filename("epyt", os.path.join("libraries", f"mac/lib{libname}.dylib"))
         else:
@@ -15637,8 +15637,7 @@ class epanetmsxapi:
     def __init__(self, filename=None):
         ops = platform.system().lower()
         if ops in ["windows"]:
-            self.MSXLibEPANET = resource_filename("epyt", os.path.join("libraries", "win", 'epanet2_2', '64bit',
-                                                                       "epanetmsx.dll"))
+            self.MSXLibEPANET = resource_filename("epyt", os.path.join("libraries", "win", "epanetmsx.dll"))
         elif ops in ["darwin"]:
             self.MSXLibEPANET = resource_filename("epyt", os.path.join("libraries", "mac", "epanetmsx.dylib"))
         else:
@@ -15647,6 +15646,10 @@ def __init__(self, filename=None):
         self.msx_lib = cdll.LoadLibrary(self.MSXLibEPANET)
         self.MSXLibEPANETPath = os.path.dirname(self.MSXLibEPANET)
 
+        # Error ~ function
+        self.msx_error = self.msx_lib.MSXgeterror
+        self.msx_error.argtypes = [c_int, c_char_p, c_int]
+
         # msx opens starts here
         if filename is not None:
             """  Open .msx file
@@ -15667,10 +15670,6 @@ def __init__(self, filename=None):
                 print("MSX file opened successfully.")
             # msx open ends here
 
-        # Error ~ function
-        self.msx_error = self.msx_lib.MSXgeterror
-        self.msx_error.argtypes = [c_int, c_char_p, c_int]
-
     def MSXopen(self, filename):
         """  Open .msx file
                     msx.MSXopen(filename)