wolfhece 2.2.32__py3-none-any.whl → 2.2.33__py3-none-any.whl

wolfhece/PyVertexvectors.py

@@ -3589,6 +3589,32 @@ class vector:
         """ Alias for surface """
         return self.surface
 
+    def interpolate_coordinates(self):
+        """
+        Interpole les valeurs Z des vertices sur base des seules valeurs connues,
+        càd autre que infinity ou -99999 ou 99999.
+        """
+
+        sz = self.get_sz()
+        s = sz[0]
+        z = sz[1]
+
+        # Remove -99999 and empty values
+        valid_indices = np.where((z != -99999.) & (z != 99999.) & (z != '') & (np.isfinite(z)))[0]
+        if len(valid_indices) == 0:
+            logging.warning(_('No valid z values to interpolate'))
+            return
+
+        f = interp1d(s[valid_indices], z[valid_indices])
+
+        for k in range(self.nbvertices):
+            if k not in valid_indices:
+                z = f(s[k])
+                self.myvertices[k].z = z
+
+        self.update_lengths()
+        self._reset_listogl()
+
 class zone:
     """
     Objet de gestion d'informations vectorielles

wolfhece/Results2DGPU.py

@@ -274,9 +274,18 @@ class wolfres2DGPU(Wolfresults_2D):
                  idx: str = '',
                  plotted: bool = True,
                  mapviewer=None,
-                 store = None):
+                 store = None,
+                 load_from_cache:bool = True) -> None:
 
         fname = Path(fname)
+
+        # Test if fname is an url
+        if str(fname).startswith('http:') or str(fname).startswith('https:'):
+            from .pydownloader import download_gpu_simulation, DATADIR
+            ret = download_gpu_simulation(fname, DATADIR / fname.name, load_from_cache = load_from_cache)
+            assert isinstance(ret, ResultsStore), _("Download failed or did not return a ResultsStore instance")
+            fname = DATADIR / fname.name
+
         self._nap = None
 
         if not fname.name.lower() == 'simul_gpu_results':

wolfhece/apps/version.py

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

wolfhece/pydownloader.py

@@ -36,6 +36,11 @@ class DownloadFiles(Enum):
     VECFILES = ('vec', 'vec.extra')
     VECZFILES = ('vecz', 'vecz.extra')
     PROJECTFILES = ('proj',)
+    NUMPYFILES = ('npy',)
+    NPZFILES = ('npz',)
+    JSONFILES = ('json',)
+    TXTFILES = ('txt',)
+    CSVFILES = ('csv',)
 
 class DonwloadDirectories(Enum):
     """ Enum to define the directories for downloads. """
@@ -43,6 +48,7 @@ class DonwloadDirectories(Enum):
 
 
 GITLAB_EXAMPLE = 'https://gitlab.uliege.be/HECE/wolf_examples/-/raw/main'
+GITLAB_EXAMPLE_GPU = 'https://gitlab.uliege.be/HECE/wolfgpu_examples/-/raw/main'
 DATADIR = Path(__file__).parent / 'data' / 'downloads'
 
 def clean_url(url: str) -> str:
@@ -63,6 +69,10 @@ def clean_url(url: str) -> str:
     cleaned_url = re.sub(r'(?<!:)//+', '/', cleaned_url)
     # Convert Backslashes to forward slashes
     cleaned_url = cleaned_url.replace('\\', '/')
+
+    cleaned_url = cleaned_url.replace(':/', '://')
+    cleaned_url = cleaned_url.replace(':///', '://')
+
     # Ensure the URL starts with http:// or https://
     if not cleaned_url.startswith(('http://', 'https://', 'ftp://')):
         raise ValueError(f"Invalid URL: {url}. Must start with http://, https://, or ftp://")
@@ -171,6 +181,77 @@ def toys_dataset(dir:str, file:str, load_from_cache:bool = True):
     destination = DATADIR / dir / file
     return download_file(url, destination, load_from_cache=load_from_cache)
 
+def download_gpu_simulation(url:str, destination:str | Path, load_from_cache:bool = True):
+    """ Download a GPU simulation file from the WOLFHECE dataset.
+
+    :param url: The URL of the GPU simulation file to download.
+    :param destination: The path where the file will be saved.
+    :param load_from_cache: If True, will not download the file if it already exists.
+    :type url: str
+    :type destination: str | Path
+    :type load_from_cache: bool
+    """
+
+    url = str(url).strip()
+    url = clean_url(url)
+    destination = Path(destination)
+
+    files = ['NAP.npy', 'bathymetry.npy', 'bridge_roof.npy', 'bridge_deck.npy', 'h.npy', 'manning.npy', 'qx.npy', 'qy.npy', 'parameters.json']
+    dir_res = 'simul_gpu_results'
+    res_files = ['metadata.json', 'nap.npz', 'nb_results.txt', 'sim_times.csv']
+
+    try:
+        for file in files:
+            try:
+                download_file(f"{url}/{file}", destination / file, load_from_cache=load_from_cache)
+            except Exception as e:
+                logging.error(f"Error downloading file {file} from {url}: {e}")
+
+        url = url + '/' + dir_res
+        destination = destination / dir_res
+        for file in res_files:
+            try:
+                download_file(f"{url}/{file}", destination / file, load_from_cache=load_from_cache)
+            except Exception as e:
+                logging.error(f"Error downloading result file {file} from {url}: {e}")
+
+        with open(destination / 'nb_results.txt', 'r') as f:
+            nb_results = int(f.read().strip())
+
+        for i in range(1,nb_results+1):
+            # h_0000001.npz
+            # qx_0000001.npz
+            # qy_0000001.npz
+            for file in ['h', 'qx', 'qy']:
+                try:
+                    download_file(f"{url}/{file}_{i:07d}.npz", destination / f'{file}_{i:07d}.npz', load_from_cache=load_from_cache)
+                except Exception as e:
+                    logging.error(f"Error downloading result file {file}_{i:07d}.npz from {url}: {e}")
+
+        from wolfgpu.results_store import ResultsStore
+        rs = ResultsStore(destination)
+
+    except Exception as e:
+        logging.error(f"Error downloading GPU dataset {dir}: {e}")
+        rs = None
+
+    return rs
+
+def toys_gpu_dataset(dir:str, dirweb:str = None, load_from_cache:bool = True):
+    """ Download toy simulatoin files from the WOLFHECE dataset for GPU.
+
+    :param dir: The directory where the file will be saved.
+    :param dirweb: The directory of the files to download.
+    :type dir: str
+    :type dirweb: str
+    :return: The path to the downloaded file.
+    """
+
+    if dirweb is None:
+        dirweb = dir
+
+    return download_gpu_simulation(f"{GITLAB_EXAMPLE_GPU}/{dirweb}", DATADIR / dir, load_from_cache=load_from_cache)
+
 if __name__ == "__main__":
     # Example usage
     print(download_file(r'https:\\gitlab.uliege.be\HECE\wolf_examples\-\raw\main\Extract_part_array\extraction.vec'))
@@ -180,3 +261,4 @@ if __name__ == "__main__":
     print(download_file('https://gitlab.uliege.be/HECE/wolf_examples/-/raw/main/Array_Theux_Pepinster/mnt.tif'))
     print(download_file('https://gitlab.uliege.be/HECE/wolf_examples/-/raw/main/PICC/PICC_Vesdre.shp'))
     print(toys_dataset('Extract_part_array', 'extraction.vec'))
+    rs = toys_gpu_dataset('channel_w_archbridge_fully_man004')

{wolfhece-2.2.32.dist-info → wolfhece-2.2.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.2.32
+Version: 2.2.33
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece

{wolfhece-2.2.32.dist-info → wolfhece-2.2.33.dist-info}/RECORD

@@ -17,13 +17,13 @@ wolfhece/PyParams.py,sha256=BgTAwxxq831rYEq_KLcFBX_upjiSUpVtfoQnCxCNWUI,100443
 wolfhece/PyPictures.py,sha256=m1kY0saW6Y9Q0bDCo47lW6XxDkBrbQG-Fd8uVn8G5ic,2514
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=a56oY1NB45QnwARg96Tbnq-z-mhZKFkYOkFOO1lNtlk,51056
-wolfhece/PyVertexvectors.py,sha256=MXoqgHVRMvpUOngqpErwT68JwUJo9FhEl1H4HB10-Zk,352574
+wolfhece/PyVertexvectors.py,sha256=ljKJJuo1M9_RVryZiWKJZ8kB_4CuRZ1pOMeT8UeA6rM,353394
 wolfhece/PyWMS.py,sha256=XcSlav5icct2UwV7K2r7vpxa5rKZWiHkp732lI94HFI,31534
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
 wolfhece/RatingCurve_xml.py,sha256=cUjReVMHFKtakA2wVey5zz6lCgHlSr72y7ZfswZDvTM,33891
 wolfhece/ReadDataDCENN.py,sha256=vm-I4YMryvRldjXTvRYEUCxZsjb_tM7U9yj6OaPyD0k,1538
-wolfhece/Results2DGPU.py,sha256=GTu7PMuwfH-xH8J7sVr6zq2CTkGKF24fG1ujEW62PtM,31598
+wolfhece/Results2DGPU.py,sha256=ljMEKHGMbmIAZE6UmMmYDMFqFAwjzxxVUmZdHHb6aME,32106
 wolfhece/__init__.py,sha256=EnpZ2yDEXueP7GAKV0uA2vAwMiZFyBjDAFcL5Y7LzbM,1850
 wolfhece/_add_path.py,sha256=mAyu85CQHk0KgUI6ZizweeQiw1Gdyea9OEjGLC6lLA4,916
 wolfhece/analyze_poly.py,sha256=2uNdnRy828jR-aFNg9fx-8aHqXuRAg-hNQpvQ3g2qL8,60837
@@ -51,7 +51,7 @@ wolfhece/pidcontroller.py,sha256=PHYenOdzfyPK2pXAhyRolCxMSMRd2AFza0eVMafpPHk,520
 wolfhece/pyGui1D.py,sha256=9g7OS3YiKsqy--6y0cBD7x2gaqTTYFXWkxImpgnTA20,121937
 wolfhece/pybridges.py,sha256=bFAqjL4ColeJtwvyCPGQ8VllWoq1RbVWXxFrdfrvqm8,65954
 wolfhece/pydike.py,sha256=dRb6qGkqoTXjf107KcajcIk1F_FuMPaOZLSwixT3dgA,11196
-wolfhece/pydownloader.py,sha256=7vcxzllphhQcH0nEI2NwX-HC0bKhOVpDkODq54oFMbU,7136
+wolfhece/pydownloader.py,sha256=sf8E_R_VgKG7TQJpW0Di3Obyp4d8WhIdfNBGRjsa738,10351
 wolfhece/pylogging.py,sha256=4TI8hgBB65z-zpvU5Rfa2jkPXPhJaqXjHVPwbcdzTNc,4528
 wolfhece/pypolygons_scen.py,sha256=NWaNeK0RSUeOkgukeogK9FLmQiDjGZ9yhqs9208fojM,46237
 wolfhece/pyshields.py,sha256=KMtUO5kD0lisKnJD1NsDz-qaY5DpFcmS4O3WkXtUSmo,27898
@@ -89,7 +89,7 @@ wolfhece/apps/curvedigitizer.py,sha256=lEJJwgAfulrrWQc-U6ij6sj59hWN3SZl4Yu1kQxVz
 wolfhece/apps/hydrometry.py,sha256=lhhJsFeb4zGL4bNQTs0co85OQ_6ssL1Oy0OUJCzhfYE,656
 wolfhece/apps/isocurrent.py,sha256=dagmGR8ja9QQ1gwz_8fU-N052hIw-W0mWGVkzLu6C7I,4247
 wolfhece/apps/splashscreen.py,sha256=EdGDN9NhudIiP7c3gVqj7dp4MWFB8ySizM_tpMnsgpE,3091
-wolfhece/apps/version.py,sha256=YFwBEBJyNYr5L7c5L4vBndUtZOBO27tL7NJgOCGDkW0,388
+wolfhece/apps/version.py,sha256=1i-0asUH6zmMJgbSbFf4H99faPoXlxUxEtZ2Ap3WZ74,388
 wolfhece/apps/wolf.py,sha256=mRnjYsUu4KIsRuamdQWAINFMuwN4eJgMo9erG-hkZ70,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -308,8 +308,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=u4C7CXe_bUyGKx7c_Bi0x9
 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.2.32.dist-info/METADATA,sha256=P-q8Ge4qvtiLISYIb4XbpDkwbCdh5KMPx-3k10Xr6qg,2729
-wolfhece-2.2.32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wolfhece-2.2.32.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
-wolfhece-2.2.32.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.2.32.dist-info/RECORD,,
+wolfhece-2.2.33.dist-info/METADATA,sha256=e7XIIwS1G_1LrlL2gk4Ao3ljTeGKT8afnrJE6ugVjow,2729
+wolfhece-2.2.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wolfhece-2.2.33.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
+wolfhece-2.2.33.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.2.33.dist-info/RECORD,,