wolfhece 2.2.23__py3-none-any.whl → 2.2.25__py3-none-any.whl

wolfhece/apps/check_install.py

@@ -8,6 +8,99 @@ Copyright (c) 2024 University of Liege. All rights reserved.
 This script and its content are protected by copyright law. Unauthorized
 copying or distribution of this file, via any medium, is strictly prohibited.
 """
+def test_conversion_LBT72_LBT08():
+
+    from pyproj.transformer import TransformerGroup
+
+    # Créer le groupe de transformateurs
+    tg = TransformerGroup(31370, 3812)
+
+    # Choisir le premier transformateur (ou un autre selon ton besoin)
+    transformer = tg.transformers[0]
+
+    print(transformer.description)
+    if '(3)' in transformer.description:
+        # This is the Belgian Lambert 72 + BD72 to ETRS89 (3) + Belgian Lambert 2008
+        return True
+    elif '(2)' in transformer.description:
+        # This is the Belgian Lambert 72 + BD72 to ETRS89 (2) + Belgian Lambert 2008
+        return False
+    elif '(1)' in transformer.description:
+        # This is the Belgian Lambert 72 + BD72 to ETRS89 (1) + Belgian Lambert 2008
+        return False
+    else:
+        # This is not the expected transformer
+        return False
+
+def test_conversion_LBT08_LBT72():
+
+    from pyproj.transformer import TransformerGroup
+
+    # Créer le groupe de transformateurs
+    tg = TransformerGroup(3812, 31370)
+
+    # Choisir le premier transformateur (ou un autre selon ton besoin)
+    transformer = tg.transformers[0]
+
+    print(transformer.description)
+    if '(3)' in transformer.description:
+        # This is the Belgian Lambert 72 + BD72 to ETRS89 (3) + Belgian Lambert 2008
+        return True
+    elif '(2)' in transformer.description:
+        # This is the Belgian Lambert 72 + BD72 to ETRS89 (2) + Belgian Lambert 2008
+        return False
+    elif '(1)' in transformer.description:
+        # This is the Belgian Lambert 72 + BD72 to ETRS89 (1) + Belgian Lambert 2008
+        return False
+    else:
+        # This is not the expected transformer
+        return False
+
+def test_transform_coordinates():
+    from pyproj.transformer import TransformerGroup
+    from pyproj import Transformer
+    import numpy as np
+    from wolfhece.Coordinates_operations import transform_coordinates
+    tg = TransformerGroup(31370, 3812)
+
+    ret = True
+
+    ret = ret and len(tg.transformers) > 0
+    ret = ret and len(tg.transformers) == 3
+    ret = ret and '(3)' in tg.transformers[0].description
+    ret = ret and '(2)' in tg.transformers[1].description
+    ret = ret and '(1)' in tg.transformers[2].description
+
+    tg_inv = TransformerGroup(3812, 31370)
+    ret = ret and len(tg_inv.transformers) > 0
+    ret = ret and len(tg_inv.transformers) == 3
+    ret = ret and '(3)' in tg_inv.transformers[0].description
+    ret = ret and '(2)' in tg_inv.transformers[1].description
+    ret = ret and '(1)' in tg_inv.transformers[2].description
+
+    tr = Transformer.from_crs(31370, 3812)
+
+    points = np.array([[100000, 200000], [110000, 210000], [120000, 220000]])
+
+    transformed_points_3 = tg.transformers[0].transform(points[:, 0], points[:, 1])
+    transformed_points_2 = tg.transformers[1].transform(points[:, 0], points[:, 1])
+    transformed_points_1 = tg.transformers[2].transform(points[:, 0], points[:, 1])
+    transformed_points = tr.transform(points[:, 0], points[:, 1])
+    transform_wolf = transform_coordinates(points, inputEPSG='EPSG:31370', outputEPSG='EPSG:3812')
+
+    # Convert to numpy arrays
+    transformed_points_3 = np.array(transformed_points_3).T
+    transformed_points_2 = np.array(transformed_points_2).T
+    transformed_points_1 = np.array(transformed_points_1).T
+    transformed_points = np.array(transformed_points).T
+
+    # Assert that the transformed points are equal
+    ret = ret and np.all(transformed_points_3 == transform_wolf)
+    ret = ret and np.all(transformed_points_3 == transformed_points)
+    ret = ret and not np.all(transformed_points_2 == transformed_points)
+    ret = ret and not np.all(transformed_points_1 == transformed_points)
+
+    return ret
 
 def main():
     # Check if installation is complete
@@ -32,17 +125,57 @@ def main():
         ret += 'Error during osgeo import - GDAL/OGR not/bad installed\n Please (re)install GDAL (64 bits version) from https://github.com/cgohlke/geospatial-wheels/releases\n\n'
         ret += 'Error : ' + str(e) + '\n\n'
 
+    if 'pyproj' in packages:
+        ret += 'PyProj seems installed\n\n'
+        try:
+            conv = test_conversion_LBT72_LBT08()
+
+            if conv:
+                ret += 'NTv2 conversion from Lambert 72 to Lambert 2008 seems available\n\n'
+            else:
+                ret += 'NTv2 conversion from Lambert 72 to Lambert 2008 seems NOT available\n\n'
+                ret += 'Please check if the PROJ data files are installed correctly - See OSGOE4W instructions\n\n'
+        except ImportError as e:
+            ret += 'PyProj not installed properly\n Please install PyProj from "pip install pyproj"\n\n'
+            ret += 'Error : ' + str(e) + '\n\n'
+
+        try:
+            conv = test_conversion_LBT08_LBT72()
+
+            if conv:
+                ret += 'NTv2 conversion from Lambert 2008 to Lambert 72 seems available\n\n'
+            else:
+                ret += 'NTv2 conversion from Lambert 2008 to Lambert 72 seems NOT available\n\n'
+                ret += 'Please check if the PROJ data files are installed correctly - See OSGOE4W instructions\n\n'
+        except ImportError as e:
+            ret += 'PyProj not installed properly\n Please install PyProj from "pip install pyproj"\n\n'
+            ret += 'Error : ' + str(e) + '\n\n'
+
+        try:
+            conv = test_transform_coordinates()
+            if conv:
+                ret += 'Transform coordinates function seems working fine\n\n'
+            else:
+                ret += 'Transform coordinates function seems NOT available\n\n'
+                ret += 'Please check if the PROJ data files are installed correctly - See OSGOE4W instructions\n\n'
+        except ImportError as e:
+            ret += 'PyProj not installed properly\n Please install PyProj from "pip install pyproj"\n\n'
+            ret += 'Error : ' + str(e) + '\n\n'
+
+    else:
+        ret += 'PyProj not installed\n Please install PyProj from "pip install pyproj"\n\n'
+
     if 'wolfgpu' in packages:
         ret += 'WolfGPU seems installed\n\n'
     else:
         ret += 'WolfGPU not installed\n Please install WolfGPU if needed\n\n'
 
-    try:
-        from wolf_libs import wolfpy
-        ret += 'Wolfpy accessible\n\n'
-    except ImportError as e:
-        ret += 'Wolfpy not accessible\n\n'
-        ret += 'Error : ' + str(e) + '\n\n'
+    # try:
+    #     from wolf_libs import wolfpy
+    #     ret += 'Wolfpy accessible\n\n'
+    # except ImportError as e:
+    #     ret += 'Wolfpy not accessible\n\n'
+    #     ret += 'Error : ' + str(e) + '\n\n'
 
     try:
         from ..PyGui import MapManager

wolfhece/apps/version.py

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

wolfhece/irm_qdf.py

@@ -746,4 +746,70 @@ class QDF_Belgium():
                     return None
             else:
                 logging.error(f"Name {key} not found in the data")
-                return None
+                return None
+
+
+class Climate_IRM():
+
+    def __init__(self, store_path= 'irm', ins:Literal['2018', '2019', '2025', 2018, 2019, 2025] = 2018) -> None:
+        self.store_path = Path(store_path)
+        self.localities = Localities(ins)
+
+        self._climate_data = {}
+
+    def __getitem__(self, key):
+        return self._climate_data[key]
+
+    @classmethod
+    def importfromwebsite(cls, store_path= 'irm', verbose:bool= False, waitingtime:float= .01, ins:Literal['2018', '2019', '2025', 2018, 2019, 2025] = 2018, ins_code: int = None):
+        """ Import Excel files for one or all municipalities from the IRM website
+
+        :param store_path: Where to store the downloaded data. Directory will be created if it doesn't exists.
+        :param verbose: If `True`, will print some progress information.
+                        If `False`, will do nothing.
+                        If a callable, then will call it with a float in [0, 1].
+                        0 means nothing downloaded, 1 means everything downloaded.
+
+        :param waitingtime: How long to wait (in seconds) betwenn the download
+                            of each station (will make sure we don't overwhelm IRM's website).
+
+        :param ins: The year of the INS codes to use.
+        :param code: Restricts the data download to a specific NIS code. `None` means full download.
+        """
+        import requests
+
+        myloc = Localities(ins)
+
+        if ins_code is not None:
+            codes_to_load = [ins_code]
+        else:
+            if not path.exists(store_path):
+                mkdir(store_path)
+            codes_to_load = myloc.inscode2name
+
+        for key,myins in enumerate(codes_to_load):
+            #chaîne URL du fichier Excel
+            url="https://www.meteo.be//resources//climatology//climateCity//pdf//climate_INS"+str(myins)+"_9120_fr.pdf"
+            #Obtention du fichiers depuis le site web de l'IRM
+            response=requests.get(url)
+
+            if str(response.content).find("Page not found")==-1 :
+
+                # Make sure we create the store path only if we have
+                # something to put inside.
+                if ins_code is not None and not path.exists(store_path):
+                    mkdir(store_path)
+
+                file=open(path.join(store_path,str(myins)+".pdf"), 'wb')
+                file.write(response.content)
+                file.close()
+                if verbose:
+                    if callable(verbose):
+                        verbose(key/len(codes_to_load))
+                    else:
+                        print(myins)
+            else:
+                #logging.error(response.content)
+                logging.error(f"Failed to load IRM data: {url} --> {response}")
+
+            sleep(waitingtime)

wolfhece/mesh2d/wolf2dprev.py

@@ -11484,7 +11484,8 @@ class prev_sim2D():
         if len(lst) == 0:
             logging.warning('No potential BC found -- Test can not be performed -- I continue anyway')
         else:
-            if i not in lst[0] or j not in lst[1]:
+            candidate_cells = list(zip(lst[0], lst[1]))
+            if (i, j) not in candidate_cells:
                 logging.error(f'Invalid indices ({i},{j}) - BC not added')
                 return
 
@@ -11506,7 +11507,8 @@ class prev_sim2D():
         if len(lst) == 0:
             logging.warning('No potential BC found -- Test can not be performed -- I continue anyway')
         else:
-            if i not in lst[0] or j not in lst[1]:
+            candidate_cells = list(zip(lst[0], lst[1]))
+            if (i, j) not in candidate_cells:
                 logging.error(f'Invalid indices ({i},{j}) - BC not added')
                 return
 

wolfhece/pypolygons_scen.py

@@ -445,6 +445,8 @@ class Polygons_Analyze(Zones):
                     return float(obj)
                 elif isinstance(obj, np.ndarray):
                     return obj.tolist()
+                elif isinstance(obj, tuple):
+                    return [list(lst1) for lst1 in obj]
                 elif obj == Wolfresults_2D:
                     return 'CPU'
                 elif obj == wolfres2DGPU:
@@ -919,7 +921,8 @@ class Polygons_Analyze(Zones):
                  operator:operators=operators.MEDIAN,
                  options:dict=None,
                  label=True,
-                 show=False):
+                 show=False,
+                 which_sim:str=None):
         """ Plot the values of the river polygons
 
         :param figax: tuple (fig, ax) for the plot
@@ -929,6 +932,8 @@ class Polygons_Analyze(Zones):
         :param options: options for the plot
         :param label: show the labels or not
         :param show: show the plot or not
+        :param which_sim: simulation to plot (if None, all simulations are plotted)
+        :return: tuple (fig, ax) of the plot
         """
 
         if figax is None:
@@ -1022,9 +1027,9 @@ class Polygons_Analyze(Zones):
         figax=(fig,ax)
         self.plot_unk(figax, stored_values_unk.WATERLEVEL, which_group, operator, options={'color':'blue', 'linewidth':2}, label=True, show=False)
 
-        ax.set_ylabel(_('Water leval [mDNG]'))
+        ax.set_ylabel(_('Water surface elevation [mDNG]'))
         ax.set_xlabel(_('Abscissa from upstream [m]'))
-        fig.suptitle(self.myname + ' -- ' +_('Water surface profile'))
+        fig.suptitle(self.myname + ' -- ' +_('Water surface elevation'))
 
         if show:
             fig.show()
@@ -1055,10 +1060,10 @@ class Polygons_Analyze(Zones):
         return fig,ax
 
     def plot_stage(self,
-                       figax=None,
-                       which_group=None,
-                       operator:operators=operators.MEDIAN,
-                       show=False):
+                   figax=None,
+                   which_group=None,
+                   operator:operators=operators.MEDIAN,
+                   show=False):
         """ Plot the water stage /water level
 
         :param figax: tuple (fig, ax) for the plot