wolfhece 2.1.60__py3-none-any.whl → 2.1.62__py3-none-any.whl

wolfhece/apps/version.py

@@ -5,7 +5,7 @@ class WolfVersion():
 
         self.major = 2
         self.minor = 1
-        self.patch = 60
+        self.patch = 62
 
     def __str__(self):
 

wolfhece/libs/__init__.py

@@ -30,29 +30,41 @@ FORTRAN_DLLS = ['libifcoremd.dll',
                 'svml_dispmd.dll',
                 'libiomp5md.dll']
 
-from site import getsitepackages
+from site import getsitepackages, getusersitepackages
 
-def find_Librarybin(test):
+def find_Librarybin(which, test):
     """ Searching Library/bin folder """
 
     interpreter_path = Path(sys.executable).parent
-    sites = getsitepackages()
+    sites = sys.path
 
     candidate = interpreter_path / 'Library/bin'
+    print(f'Searching {which} in {candidate}')
     if candidate.exists():
         if (candidate/test).exists():
+            print(f"Found {which} in {candidate}")
+            return candidate
+
+    candidate = interpreter_path.parent / 'Library/bin'
+    print(f'Searching {which} in {candidate}')
+    if candidate.exists():
+        if (candidate/test).exists():
+            print(f"Found {which} in {candidate}")
             return candidate
 
     for cursite in sites:
-        candidate = Path(cursite) / 'Library/bin'
-        if candidate.exists():
-            if (candidate/test).exists():
-                return candidate
+        if 'site-packages' in cursite:
+            candidate = Path(cursite).parent.parent / 'Library/bin'
+            print(f'Searching {which} in {candidate}')
+            if candidate.exists():
+                if (candidate/test).exists():
+                    print(f"Found {which} in {candidate}")
+                    return candidate
 
     return None
 
-mkl_path = find_Librarybin(MKL_DLLS[0])
-fortran_path = find_Librarybin(FORTRAN_DLLS[0])
+mkl_path = find_Librarybin('MKL', MKL_DLLS[0])
+fortran_path = find_Librarybin('FORTRAN', FORTRAN_DLLS[0])
 
 if mkl_path is None:
     print("MKL package not found -- Please install MKL with 'pip install mkl'")

{wolfhece-2.1.60.dist-info → wolfhece-2.1.62.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.60
+Version: 2.1.62
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 License: Copyright (c) 2024 University of Liege. All rights reserved.
 Project-URL: Homepage, https://uee.uliege.be/hece

{wolfhece-2.1.60.dist-info → wolfhece-2.1.62.dist-info}/RECORD

@@ -72,7 +72,7 @@ wolfhece/apps/check_install.py,sha256=SG024u18G7VRLKynbp7DKD1jImtHwuWwN4bJWHm-YH
 wolfhece/apps/curvedigitizer.py,sha256=Yps4bcayzbsz0AoVc_dkSk35dEhhn_esIBy1Ziefgmk,5334
 wolfhece/apps/isocurrent.py,sha256=dagmGR8ja9QQ1gwz_8fU-N052hIw-W0mWGVkzLu6C7I,4247
 wolfhece/apps/splashscreen.py,sha256=SrustmIQeXnsiD-92OzjdGhBi-S7c_j-cSvuX4T6rtg,2929
-wolfhece/apps/version.py,sha256=JxmjSazuCXVG7m7Z0RPKfHDtapKv30Ya4LTjYWXXdPg,388
+wolfhece/apps/version.py,sha256=2Eqfk37LOVeJu7LaxMXP5FneU0J06xuUj1Lm1dSfARM,388
 wolfhece/apps/wolf.py,sha256=j_CgvsL8rwixbVvVD5Z0s7m7cHZ86gmFLojKGuetMls,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -175,7 +175,7 @@ wolfhece/lazviewer/viewer/viewer.exe,sha256=pF5nwE8vMWlEzkk-SOekae9zpOsPhTWhZbqa
 wolfhece/lazviewer/viewer/viewer.py,sha256=8_MQCaQOS0Z_oRPiGoRy1lq-aCirReX3hWEBjQID0ig,24665
 wolfhece/libs/MSVCP140.dll,sha256=2GrBWBI6JFuSdZLIDMAg_qKcjErdwURGbEYloAypx3o,565640
 wolfhece/libs/WolfDll.dll,sha256=E8SeV0AHVXW5ikAQuVtijqIvaYx7UIMeqvnnsmTMCT8,132934144
-wolfhece/libs/__init__.py,sha256=eAA6dNfD15XEuBk24yYUtSRpFc6MpJ_g42F_05gtRSA,2651
+wolfhece/libs/__init__.py,sha256=smtUW6nf3L0ZEDFkn33k08ruo_xac78HULBV0FvhuuU,3230
 wolfhece/libs/api-ms-win-crt-heap-l1-1-0.dll,sha256=r0euvgZa8vBFoZ8g7H5Upuc8DD6aUQimMJWnIyt1OBo,19720
 wolfhece/libs/api-ms-win-crt-math-l1-1-0.dll,sha256=ol0GVN6wzqGu8Ym6IXTQ8TvfUvCY06nsNtFeS_swxJk,27912
 wolfhece/libs/api-ms-win-crt-runtime-l1-1-0.dll,sha256=NxpEq5FhSowm0Vm-uHKntD9WnLX6yK2pms6Y8mSjtQM,23304
@@ -283,8 +283,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=8PlMYrb_8jI8h9F0_EagpM
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=ORy7fz4dcp691qKzaOZHrRLZ0uXNhL-LIHxmpDGL6BI,5007
 wolfhece/wintab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/wintab/wintab.py,sha256=8A-JNONV6ujgsgG3lM5Uw-pVgglPATwKs86oBzzljoc,7179
-wolfhece-2.1.60.dist-info/METADATA,sha256=BCXpcCPuPZ8Kpe_9bCPZoPTvQ69o041Ia9aF6uyAxmA,2541
-wolfhece-2.1.60.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-wolfhece-2.1.60.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
-wolfhece-2.1.60.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.60.dist-info/RECORD,,
+wolfhece-2.1.62.dist-info/METADATA,sha256=xLug9OiofWGaHbIy0NuNvpS_V4S2ujMvlRV1JVz3Byw,2541
+wolfhece-2.1.62.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+wolfhece-2.1.62.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
+wolfhece-2.1.62.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.62.dist-info/RECORD,,