wolfhece 2.1.22__py3-none-any.whl → 2.1.25__py3-none-any.whl

wolfhece/apps/version.py

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

wolfhece/cli.py

@@ -4,6 +4,11 @@ def check():
     from .apps.check_install import main
     main()
 
+def accept():
+    """ Main wolf application : Accept """
+    from .acceptability.cli import main
+    main()
+
 def wolf():
     """ Main wolf application : Map Manager"""
     from .apps.wolf import main

wolfhece/irm_qdf.py

@@ -102,6 +102,8 @@ class MontanaIRM():
         return rain*dur/60. #to obtains [mm.h^-1] as dur is in [min]
 
     def get_hyeto(self,durmax,T,r=0.5):
+        """ :param r: Decentration coefficient
+        """
         x = np.arange(10,durmax,1,dtype=np.float64)
         # y = [self.get_instantrain(curx,T) for curx in x]
 
@@ -234,7 +236,17 @@ class Qdf_IRM():
 
 
     def importfromwebsite(self,store_path='irm',verbose=False,waitingtime=.01):
-        """ Import des fichiers Excel pour toutes les communes depuis le site de l'IRM """
+        """ Import Excel files for 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).
+        """
         import requests
 
         if not path.exists(store_path):
@@ -251,7 +263,10 @@ class Qdf_IRM():
                 file.write(response.content)
                 file.close()
                 if verbose:
-                    print(myins)
+                    if callable(verbose):
+                        verbose(key/len(self.myloc.inscode2name))
+                    else:
+                        print(myins)
 
             sleep(waitingtime)
 
@@ -439,6 +454,8 @@ class Qdf_IRM():
         fig,ax = self.montana.plot_hyeto(durmax,T,r)
         ax.set_title(self.name + ' - code : ' + str(self.code))
 
+        return fig
+
     def plot_hyetos(self,durmax,r=.5):
 
         fig,ax = self.montana.plot_hyetos(durmax,r)

wolfhece/wolf_array.py

@@ -648,7 +648,7 @@ class header_wolf():
         if isinstance(filename, Path):
             filename = str(filename)
 
-        if filename.endswith('.tif'):
+        if filename.endswith('.tif') or filename.endswith('.tiff') :
             from osgeo import gdal
 
             raster:gdal.Dataset
@@ -681,7 +681,11 @@ class header_wolf():
 
             dtype = raster.GetRasterBand(1).DataType
 
-            if dtype in [1, 4]:
+            if dtype == 1:
+                self.wolftype = WOLF_ARRAY_FULL_INTEGER8
+            elif dtype in [2,3]:
+                self.wolftype = WOLF_ARRAY_FULL_INTEGER16
+            elif dtype in [4,5] :
                 self.wolftype = WOLF_ARRAY_FULL_INTEGER
             elif dtype ==6:
                 self.wolftype = WOLF_ARRAY_FULL_SINGLE
@@ -4854,7 +4858,10 @@ class WolfArray(Element_To_Draw, header_wolf):
             elif self.array.dtype == np.int32:
                 self.wolftype = WOLF_ARRAY_FULL_INTEGER
             elif self.array.dtype == np.uint8:
-                self.array = self.array.astype(np.int32)
+                logging.warning(_('Conversion of uint8 to int8'))
+                self.array = self.array.astype(np.int8)
+                self.wolftype = WOLF_ARRAY_FULL_INTEGER8
+            elif self.array.dtype == np.int8:
                 self.wolftype = WOLF_ARRAY_FULL_INTEGER8
 
             self.mask_data(self.nullvalue)
@@ -5697,6 +5704,8 @@ class WolfArray(Element_To_Draw, header_wolf):
                 dtype = np.int32
             elif self.wolftype in [WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_FULL_INTEGER16_2]:
                 dtype = np.int16
+            elif self.wolftype == WOLF_ARRAY_FULL_INTEGER8:
+                dtype = np.int8
 
         self.dx = myhead.dx
         self.dy = myhead.dy
@@ -6378,6 +6387,8 @@ class WolfArray(Element_To_Draw, header_wolf):
                 self.wolftype = WOLF_ARRAY_FULL_INTEGER
             elif locarray.dtype == np.int16:
                 self.wolftype = WOLF_ARRAY_FULL_INTEGER16
+            elif locarray.dtype == np.uint8:
+                self.wolftype = WOLF_ARRAY_FULL_INTEGER8
             elif locarray.dtype == np.int8:
                 self.wolftype = WOLF_ARRAY_FULL_INTEGER8
             else:
@@ -6791,7 +6802,7 @@ class WolfArray(Element_To_Draw, header_wolf):
         if self.array is None:
             return
 
-        if self.wolftype in [WOLF_ARRAY_FULL_INTEGER, WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_FULL_INTEGER16_2]:
+        if self.wolftype in [WOLF_ARRAY_FULL_INTEGER, WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_FULL_INTEGER16_2, WOLF_ARRAY_FULL_INTEGER8]:
             value=int(value)
 
         if value is not None:
@@ -7139,6 +7150,7 @@ class WolfArray(Element_To_Draw, header_wolf):
             return
 
         if self.wolftype != WOLF_ARRAY_FULL_SINGLE:
+            # FIXME: Currently, only float32 is supported in Cython/OpenGL library
             self._tmp_float32 = self.array.astype(dtype=np.float32)
         else:
             self._tmp_float32 = None

{wolfhece-2.1.22.dist-info → wolfhece-2.1.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.22
+Version: 2.1.25
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 License: AGPL-v3 License
 Project-URL: Homepage, https://uee.uliege.be/hece

{wolfhece-2.1.22.dist-info → wolfhece-2.1.25.dist-info}/RECORD

@@ -6,12 +6,12 @@ wolfhece/ManageParams.py,sha256=Wgt5Zh7QBtyiwTAltPHunSLqt4XuVuRH76GTUrXabS4,219
 wolfhece/Model1D.py,sha256=-cMz-ePSYzrKVVDidiDOz6cojEZ3y6u9gIb7RPwT6Y8,476593
 wolfhece/PyConfig.py,sha256=oGSL1WsLM9uinlNP4zGBLK3uHPmBfduUi7R-VtWuRFA,8034
 wolfhece/PyCrosssections.py,sha256=f4dNYRUGZKePruaaBiTcn5vlrw8TFTj9XwTDrdiF_uU,112450
-wolfhece/PyDraw.py,sha256=xGMogLlksiVz6o6p9URnkQD9a6w3e92cJN8RgS47aRo,389804
+wolfhece/PyDraw.py,sha256=WMu6lRmC9JJkcRFoj-pkDpRrkaEWRyOMHer3zwZ42Qs,390207
 wolfhece/PyGui.py,sha256=8UWyaYwiHD9juDbPs__pmCXIDoM8r9_bGKLf29xVGZI,103140
 wolfhece/PyGuiHydrology.py,sha256=r8kcY2eGAQzSwVtLpyMUiBL5xBpMBsi7ovs0PgStGWw,14648
 wolfhece/PyHydrographs.py,sha256=GKK8U0byI45H9O_e4LAOOi7Aw0Tg7Q0Lx322stPg5IQ,3453
 wolfhece/PyPalette.py,sha256=Vl5RrBIC_a5-mZKUtBd5kG0mif946B7OtS3fnehkmOc,25012
-wolfhece/PyParams.py,sha256=Aj8kcT044abwBYU_OiEcJWcyNVqxYithNfbzdHyI-QA,97072
+wolfhece/PyParams.py,sha256=R3AWcb7Mhixwnw4iONSN4gk1DOXKcJR2lj7jaIml4B8,97085
 wolfhece/PyPictures.py,sha256=-mJB0JL2YYiEK3D7_ssDkvYiMWK4ve9kXhozQXNeSx8,2216
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=dHTjyYYTn0F_NWerlAOBKHV79RUzEEtMJMldQtVc1Cs,40092
@@ -24,7 +24,7 @@ wolfhece/ReadDataDCENN.py,sha256=4OMDBgkZ_v7OWmVhyQ-reab7MPxGhFEDY2qS8yThhdM,124
 wolfhece/Results2DGPU.py,sha256=-EGeWQcg_XsDh3XOqnuEnFgPSoAD4q0YUjM7u8ESRD8,23038
 wolfhece/__init__.py,sha256=FRDE8PiJAWxX9PMXsShRMZ8YADAY4WIgKMRh52rmhiw,23
 wolfhece/_add_path.py,sha256=nudniS-lsgHwXXq5o626XRDzIeYj76GoGKYt6lcu2Nc,616
-wolfhece/cli.py,sha256=rHxZGgs_R776VCWhs36pYFoiuiQycwgGTVOLK-JNzjE,1937
+wolfhece/cli.py,sha256=uCqg3KSRH1t-PVu1yVbBv9TPgbheG-vF9p3uWCHIEeY,2051
 wolfhece/color_constants.py,sha256=Snc5RX11Ydi756EkBp_83C7DiAQ_Z1aHD9jFIBsosAU,37121
 wolfhece/drawing_obj.py,sha256=BztOcAQ6A7_bDLnbrl3JysfwfD_aG7nu3PSVKyEZStE,3742
 wolfhece/flow_SPWMI.py,sha256=mdiupyOem6_FZ0OSKn8Vq5Nmr9Av-j83d2YyRPLZFlQ,20658
@@ -32,7 +32,7 @@ wolfhece/friction_law.py,sha256=vMr6BgVVV2JqhPDjBtZBtosDIZcbykZxw-fKxiJzd4M,5200
 wolfhece/gpuview.py,sha256=Lq17jV2ytQShUuvi1UE_A1-6Q0IojsKxrKhkYHRf_8w,23437
 wolfhece/import_ascfiles.py,sha256=jg4urcLdSgFS1Knvh7AVGJqM44qc_uYDNrR568tMh-A,4167
 wolfhece/ins.py,sha256=0aU1mo4tYbw64Gwzrqbh-NCTH1tukmk0mpPHjRPHZXU,12661
-wolfhece/irm_qdf.py,sha256=749SlAXiN1oXp5tfBJoPNJWxydQlY55K0qvIM5YexlM,15436
+wolfhece/irm_qdf.py,sha256=7XeyPxy7fYbR5T4si6huCyBx1_AwoIogzNEOpu9U-xg,16234
 wolfhece/ismember.py,sha256=fkLvaH9fhx-p0QrlEzqa6ySO-ios3ysjAgXVXzLgSpY,2482
 wolfhece/multiprojects.py,sha256=K40kM09xNkQSjiwANTsA4CpaW7KEkawpBkpoiehk9yo,21251
 wolfhece/picc.py,sha256=UCWX1Y6Xb-iviI4qF-MgBSDZDWQn_tlKNfKRBUY75ow,8504
@@ -48,7 +48,7 @@ wolfhece/rain_SPWMI.py,sha256=YqsF-yFro3y_a6MfVRFfr-Rxi7NR1gl_i8VX7scmzes,13548
 wolfhece/test_Results2DGPU.py,sha256=NOJ_hFXrcLSQXS1dtsqXRQltqIZtDSHMz_EgAJ2_FHU,307
 wolfhece/textpillow.py,sha256=zEfLrKhfCDyMaVuQOUjHqz6MGKeQ4aewMxOsWi5-wKI,13832
 wolfhece/tools_mpl.py,sha256=q8Yc4aukPPiUcEzREvZRM_em67XqXaahdoaNt0DETfE,266
-wolfhece/wolf_array.py,sha256=uYyymkYRDOk43GK7Wn91IKCJ5CmjLiMIgXReRFTkzuc,342457
+wolfhece/wolf_array.py,sha256=UYDl1jturybJuId6O9vOyFGqh88p3Hs8fB-vZQJ-qhM,343148
 wolfhece/wolf_hist.py,sha256=JpRXvzJLUP-RkSkvth3DQWglgTMFI2ZEUDb4RYOfeeI,3284
 wolfhece/wolf_texture.py,sha256=llQ7aV8scWXIkhpri9XjaPejzoBJsGfsln2ZnlRbFkU,16270
 wolfhece/wolf_tiles.py,sha256=F2JsJHdAP8fIffNJdG_J26bonCIRtIwMmxKFqdSCRDA,10088
@@ -56,6 +56,13 @@ wolfhece/wolf_vrt.py,sha256=un5CKzAUmzSsjLXK7YLnQEWz8FLoafXJs8oqUvS_-h0,10271
 wolfhece/wolf_zi_db.py,sha256=Ok0MxQYZMMLRJN1QY-HSplLhUzzb6gkXgBQ3ihhLQHk,12669
 wolfhece/wolfresults_2D.py,sha256=U42Rz8fWQ6Zb2nvzPGvj6eHz_i_RNkmK056AuLDSYgs,165557
 wolfhece/xyz_file.py,sha256=aQOcTHkHRhXHxL_WxTHwzygp6e47San7SHSpxKQU0dw,5457
+wolfhece/acceptability/Parallels.py,sha256=ABb5sL659MFRpqzGDdQ4GdhQgxWhiGFM6S0goueA3iM,2767
+wolfhece/acceptability/__init__.py,sha256=hfgoPKLDpX7drN1Vpvux-_5Lfyc_7feT2C2zQr5v-Os,258
+wolfhece/acceptability/acceptability.py,sha256=37QojUHfLVS0HffZpUsR0uXZ7LBDFogKD3xmOEPIlQU,17555
+wolfhece/acceptability/acceptability1.py,sha256=rf1Bu2JuyOPwMxvez7z5vCXrePAV486hyVM5g1f40g4,13045
+wolfhece/acceptability/acceptability_gui.py,sha256=zzbHd_e90fLhbgrdBlnWmBWBO8ZBwb8vikhl-2Rdy0M,12020
+wolfhece/acceptability/cli.py,sha256=pIh9hIbM5RQFh3EBQJB2jWJ8F2M4l-D6qGoewXROE1M,7102
+wolfhece/acceptability/func.py,sha256=mPRkaL8KTrhNM5EUP7XYrRABiAU3EjdHULWotfH1mkc,39430
 wolfhece/apps/ManageParams.py,sha256=heg5L4fMn0ettR7Bad_Q680o_JWnTbe3WFkL_9IziAk,312
 wolfhece/apps/Optimisation_hydro.py,sha256=mHazBazTUGyxPbHPXhaQim8vqIeOOuKPjH0B48VWduA,374
 wolfhece/apps/WolfPython.png,sha256=K3dcbeZUiJCFNwOAAlGMaRGLJ56yM8WD2I_0bk0xT1g,104622
@@ -66,7 +73,7 @@ wolfhece/apps/check_install.py,sha256=jrKR-njqnpIh6ZJqvP6KbDUPVCfwTNQj4glQhcyzs9
 wolfhece/apps/curvedigitizer.py,sha256=avWERHuVxPnJBOD_ibczwW_XG4vAenqWS8W1zjhBox8,4898
 wolfhece/apps/isocurrent.py,sha256=4XnNWPa8mYUK7V4zdDRFrHFIXNG2AN2og3TqWKKcqjY,3811
 wolfhece/apps/splashscreen.py,sha256=LkEVMK0eCc84NeCWD3CGja7fuQ_k1PrZdyqD3GQk_8c,2118
-wolfhece/apps/version.py,sha256=zxkGhL5-N1mwERa9B0LJ3RZUGCtqNlavCXcY1H1TFx0,388
+wolfhece/apps/version.py,sha256=3tjS1KgJ1KExAqk4j6HlhrS28CEnx3_u6g7IqbpXhKU,388
 wolfhece/apps/wolf.py,sha256=gqfm-ZaUJqNsfCzmdtemSeqLw-GVdSVix-evg5WArJI,293
 wolfhece/apps/wolf2D.py,sha256=gWD9ee2-1pw_nUxjgRaJMuSe4kUT-RWhOeoTt_Lh1mM,267
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -274,8 +281,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=yGbU_JsF56jsmms0gh7mxa
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=wCxGRnE3kzEkWlWA6-3X8ADOFux_B0a5QWJ2GnXTgJw,4709
 wolfhece/wintab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/wintab/wintab.py,sha256=8A-JNONV6ujgsgG3lM5Uw-pVgglPATwKs86oBzzljoc,7179
-wolfhece-2.1.22.dist-info/METADATA,sha256=JUhQi9mzKdTMu9aWvC1QPRi78EWvlHpyKguRgwKccI4,2307
-wolfhece-2.1.22.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-wolfhece-2.1.22.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.1.22.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.22.dist-info/RECORD,,
+wolfhece-2.1.25.dist-info/METADATA,sha256=eDmM0tzjHw8ps37PcYqx-Jg0EBLEhEuANdH0iKfCYuE,2307
+wolfhece-2.1.25.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+wolfhece-2.1.25.dist-info/entry_points.txt,sha256=MAG6NrF64fcxiVNb2g1JPYPGcn9C0HWtqqNurB83oX0,330
+wolfhece-2.1.25.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.25.dist-info/RECORD,,

{wolfhece-2.1.22.dist-info → wolfhece-2.1.25.dist-info}/entry_points.txt

@@ -1,7 +1,10 @@
+[console_scripts]
+wolf_accept = wolfhece.cli:accept
+wolf_check = wolfhece.cli:check
+
 [gui_scripts]
 wolf = wolfhece.cli:wolf
 wolf2d = wolfhece.cli:wolf2d
-wolfcheck = wolfhece.cli:check
 wolfcompare = wolfhece.cli:compare
 wolfdigitizer = wolfhece.cli:digitizer
 wolfhydro = wolfhece.cli:hydro