wolfhece 2.1.29__py3-none-any.whl → 2.1.30__py3-none-any.whl

wolfhece/acceptability/acceptability.py

@@ -38,6 +38,14 @@ class steps_vulnerability(Enum):
     APPLY_MODIFS = 2
     MATCH_SIMUL = 3
 
+class steps_acceptability(Enum):
+    """ 
+    Enum for the steps in the acceptability computation
+    """
+    COMPUTE_LOCAL_ACCEPT = 1
+    LOAD_FROM_FILES      = 2
+    COMPUTE_MEAN_ACCEPT  = 3
+
 def Base_data_creation(main_dir:str = 'Data', 
                        Original_gdb:str = 'GT_Resilence_dataRisques202010.gdb', 
                        Study_area:str = 'Bassin_Vesdre.shp', 
@@ -85,7 +93,6 @@ def Base_data_creation(main_dir:str = 'Data',
         logging.error("The necessary files are missing - Verify logs for more information")
         return
     
-    manager.change_dir()
     done = []
 
     if 1 in steps or 6 in steps or steps_base_data_creation.PREPROCESS_VULNCODE in steps or steps_base_data_creation.CLIP_GDB in steps:
@@ -210,8 +217,6 @@ def Base_data_creation(main_dir:str = 'Data',
 
         done.append(steps_base_data_creation.DATABASE_TO_RASTER)
 
-    manager.restore_dir()
-
     return done
 
 def Database_to_raster(main_dir:str = 'Data',
@@ -245,16 +250,12 @@ def Database_to_raster(main_dir:str = 'Data',
         logging.error("The necessary files are missing - Verify logs for more information")
         return
 
-    manager.change_dir()
-
     logging.info("Convert vectors to raster based on their vulnerability values")
     
     attributes = ["Vulne", "Code"]
     for cur_attrib in attributes:
         parallel_v2r(manager, cur_attrib, resolution, number_procs, convert_to_sparse=True)
 
-    manager.restore_dir()
-
 def Vulnerability(main_dir:str = 'Data',
                   scenario:str = 'Scenario1',
                   Study_area:str = 'Bassin_Vesdre.shp',
@@ -300,7 +301,6 @@ def Vulnerability(main_dir:str = 'Data',
 
     logging.info("Starting VULNERABILITY computations at {} m resolution".format(resolution))
     
-    manager.change_dir()
     done = []	
     
     if 1 in steps or steps_vulnerability.CREATE_RASTERS in steps:
@@ -362,24 +362,24 @@ def Vulnerability(main_dir:str = 'Data',
 
         done.append(steps_vulnerability.MATCH_SIMUL)
 
-    manager.restore_dir()
-
     return done
 
 def Acceptability(main_dir:str = 'Vesdre',
                   scenario:str = 'Scenario1',
                   Study_area:str = 'Bassin_Vesdre.shp',
                   coeff_auto:bool = True,
-                  Ponderation_csv:str = 'Ponderation.csv'):
+                  Ponderation_csv:str = 'Ponderation.csv',
+                  resample_size:int = 100,
+                  steps:list[int] | list[steps_acceptability] = [1,2,3]):
     """ Compute acceptability for the scenario """
     
+    done = []
+
     manager = Accept_Manager(main_dir, 
                              Study_area, 
                              scenario=scenario,
                              Ponderation_csv=Ponderation_csv)
 
-    manager.change_dir()
-
     # Load the vulnerability raster **for the scenario**
     vulne = gdal.Open(str(manager.OUT_VULN))
 
@@ -395,7 +395,7 @@ def Acceptability(main_dir:str = 'Vesdre',
 
     # Convert to numpy array
     vulne = vulne.GetRasterBand(1).ReadAsArray() 
-    riv = riv.GetRasterBand(1).ReadAsArray()    
+    riv   = riv.GetRasterBand(1).ReadAsArray()    
 
     # Get the return periods available
     return_periods = manager.get_return_periods()
@@ -403,116 +403,140 @@ def Acceptability(main_dir:str = 'Vesdre',
     # Prepare the river bed filter
     # Useful as we iterate over the return periods
     # and the river bed is the same for all return periods
-    ij_riv = np.where(riv == 1)
-    
-    # Compute acceptability for each return period
-    for curT in tqdm(return_periods):
-
-        # Load the **FILLED** modelled water depth for the return period
-        model_h = gdal.Open(str(manager.get_sim_file_for_return_period(curT)))
-        # Convert to numpy array
-        model_h = model_h.GetRasterBand(1).ReadAsArray()
-
-        # Set nan if the water depth is 0.
-        # 'nan' is a good choice as it will not be considered in the computation.
-        model_h[model_h == 0] = np.nan
-        # Set nan in the river bed
-        model_h[ij_riv] = np.nan
-
-        logging.info("Return period {}".format(curT))
-        # Compute the local acceptability for the return period
-        compute_acceptability(manager, model_h, vulne, curT, (geotrans, proj))
-
-    # At this point, the local acceptability for each return period is computed
-    # and stored in tiff files in the TEMP/SutyArea/scenario/Q_FILES directory
+    ij_riv = np.argwhere(riv == 1)
     
-    # Get the list of Q files
-    qs = manager.get_q_files()
     # Initialize the dictionary to store the acceptability values
-    q_dict = {}
+    part_accept = {}
 
-    # Iterate over the return periods
-    for curT in return_periods:
-        logging.info("vm"+str(curT))
+    if 1 in steps or steps_acceptability.COMPUTE_LOCAL_ACCEPT in steps:
+        # Compute acceptability for each return period
+        for curT in tqdm(return_periods):
 
-        # We set the filename from the return period, not the "qs" list
-        q_filename = manager.TMP_QFILES / "Q{}.tif".format(curT)
-        
-        # Check if the file exists
-        assert q_filename.exists(), "The file {} does not exist".format(q_filename)
-        # Check if the file is in the "qs" list
-        assert q_filename in qs, "The file {} is not in the list of Q files".format(q_filename)
-
-        # Load the Q file for the return period
-        tmp_data = gdal.Open(str(q_filename))
-        # Convert to numpy array
-        q_dict["vm"+str(curT)] = tmp_data.GetRasterBand(1).ReadAsArray()
-
-        # Force the deletion of the variable, rather than waiting for the garbage collector
-        # May be useful if the files are large
-        del tmp_data
-
-    # Pointing the last return period, maybe 1000 but not always
-    array_t1000 = q_dict["vm{}".format(return_periods[-1])]
-    # Get the indices where the value is -99999
-    # We will force the same mask for all lower return periods
-    ij_t1000 = np.where(array_t1000 == -99999)
-
-    # Iterate over the return periods
-    for curT in return_periods:
-      
-      if curT != return_periods[-1]:
-        logging.info(curT)
-        
-        # Alias
-        tmp_array = q_dict["vm{}".format(curT)]
-        
-        # Set the -99999 values to 0
-        tmp_array[tmp_array == -99999] = 0.
-        # Set the masked values, for the last return period, to nan
-        tmp_array[ij_t1000] = np.nan
-
-    # # Load the ponderation file
-    # pond = pd.read_csv(dirsnames.PONDERATION_CSV)
-    # # Set the index to the interval, so we can use the interval as a key
-    # pond.set_index("Interval", inplace=True)
-
-    # Get ponderations for the return periods
-    if coeff_auto:
-        pond = manager.get_ponderations()
-        assert pond["Ponderation"].sum() > 0.999999 and pond["Ponderation"].sum()<1.0000001, "The sum of the ponderations is not equal to 1"
-
-    elif manager.is_valid_ponderation_csv:
-        pond = pd.read_csv(manager.PONDERATION_CSV)
-        pond.set_index("Interval", inplace=True)
-    else:
-        logging.error("The ponderation file is missing")
-        logging.info("Please provide the ponderation file or set 'coeff_auto' to True")
-        return
+            # Load the **FILLED** modelled water depth for the return period
+            model_h = gdal.Open(str(manager.get_sim_file_for_return_period(curT)))
+            # Convert to numpy array
+            model_h = model_h.GetRasterBand(1).ReadAsArray()
+
+            assert model_h.shape == vulne.shape, "The shape of the modelled water depth is different from the vulnerability raster"
+
+            # Set 0. if the water depth is 0.
+            model_h[model_h == 0] = 0
+            # Set 0. in the river bed
+            model_h[ij_riv[:,0], ij_riv[:,1]] = 0
+
+            assert model_h[ij_riv[0][0], ij_riv[0][1]] == 0, "The river bed is not set to 0 in the modelled water depth"
+            assert model_h.max() > 0, "The maximum water depth is 0"
+            if model_h.min() < 0:
+                logging.warning("The minimum water depth is negative - {} cells".format(np.count_nonzero(model_h<0)))
+                logging.warning("Setting the negative values to 0")
+                model_h[model_h < 0] = 0
+
+            logging.info("Return period {}".format(curT))
+
+            # Compute the local acceptability for the return period
+            part_accept[curT] = compute_acceptability(manager, model_h, vulne, curT, (geotrans, proj))
+
+        done.append(steps_acceptability.COMPUTE_LOCAL_ACCEPT)
 
-    assert len(pond) == len(return_periods), "The number of ponderations is not equal to the number of return periods"
+        # At this point, the local acceptability for each return period is computed
+        # and stored in tiff files in the TEMP/SutyArea/scenario/Q_FILES directory.
+        # The arrays are also stored in the part_accept dictionary.
 
-    # Initialize the combined acceptability matrix -- Ponderate mean of the local acceptability
-    comb = np.zeros(q_dict["vm{}".format(return_periods[-1])].shape)
+    if 2 in steps or steps_acceptability.LOAD_FROM_FILES in steps:
+        # Load/Reload the acceptability values from files
+
+        if 1 in steps or steps_acceptability.COMPUTE_LOCAL_ACCEPT in steps:
+            # We have computed/updted the acceptibility values.
+            # We do not need to reload them.
+            logging.warning("The acceptability values have been computed in step 1 - avoid reloading")
+            logging.info("If you want to reload the acceptability values, please remove step 1 from the list of steps")
+        else:
     
-    for curT in return_periods:
-         comb += q_dict["vm{}".format(curT)] * pond["Ponderation"][curT]
+            # Get the list of Q files
+            qs = manager.get_q_files()
+
+            # Iterate over the return periods
+            for curT in return_periods:
+                logging.info(curT)
+
+                # We set the filename from the return period, not the "qs" list
+                q_filename = manager.TMP_QFILES / "Q{}.tif".format(curT)
+                
+                # Check if the file exists
+                assert q_filename.exists(), "The file {} does not exist".format(q_filename)
+                # Check if the file is in the "qs" list
+                assert q_filename in qs, "The file {} is not in the list of Q files".format(q_filename)
+
+                # Load the Q file for the return period
+                tmp_data = gdal.Open(str(q_filename))
+                # Convert to numpy array
+                part_accept[curT] = tmp_data.GetRasterBand(1).ReadAsArray()
+
+        done.append(steps_acceptability.LOAD_FROM_FILES)
+
+    if 3 in steps or steps_acceptability.COMPUTE_MEAN_ACCEPT in steps:
+
+        assert len(part_accept) == len(return_periods), "The number of acceptability files is not equal to the number of return periods"
+
+        # Pointing the last return period, maybe 1000 but not always
+        array_tmax = part_accept[return_periods[-1]]
+
+        # Get ponderations for the return periods
+        if coeff_auto:
+            logging.info("Automatic ponderation")
+            pond = manager.get_ponderations()
+            assert pond["Ponderation"].sum() > 0.999999 and pond["Ponderation"].sum()<1.0000001, "The sum of the ponderations is not equal to 1"
+
+        elif manager.is_valid_ponderation_csv:
+            logging.info("Manual ponderation")
+            # Load the ponderation file
+            pond = pd.read_csv(manager.PONDERATION_CSV)
+            # Set the index to the interval, so we can use the interval as a key
+            pond.set_index("Interval", inplace=True)
+        
+        else:
+            logging.error("The ponderation file is missing")
+            logging.info("Please provide the ponderation file or set 'coeff_auto' to True")
+            return -1
 
-    y_pixels, x_pixels = comb.shape  # number of pixels in x
+        assert len(pond) == len(return_periods), "The number of ponderations is not equal to the number of return periods"
 
-    # Set up output GeoTIFF
-    driver = gdal.GetDriverByName('GTiff')
-    dataset = driver.Create(str(manager.OUT_ACCEPT), x_pixels, y_pixels, 1, gdal.GDT_Float32, options=["COMPRESS=LZW"])
-    dataset.GetRasterBand(1).WriteArray(comb.astype(np.float32))   
-    dataset.SetGeoTransform(geotrans)
-    dataset.SetProjection(proj)
-    dataset.FlushCache()
-    del(dataset)
+        # Initialize the combined acceptability matrix -- Ponderate mean of the local acceptability
+        comb = np.zeros(part_accept[return_periods[-1]].shape, dtype=np.float32)
+        
+        for curT in return_periods:
+            assert part_accept[curT].dtype == np.float32, "The dtype of the acceptability matrix is not np.float32"
+            assert part_accept[curT].shape == comb.shape, "The shape of the acceptability matrix is not the right one"
 
-    # Resample to 100m
-    Agg = gdal.Warp(str(manager.OUT_ACCEPT_100M), str(manager.OUT_ACCEPT), xRes=100, yRes=100, resampleAlg='Average')
-    del(Agg)
+            comb += part_accept[curT] * float(pond["Ponderation"][curT])
 
-    manager.restore_dir()
+        y_pixels, x_pixels = comb.shape  # number of pixels in x
 
-    return 0
+        # Set up output GeoTIFF
+        driver = gdal.GetDriverByName('GTiff')
+        dataset = driver.Create(str(manager.OUT_ACCEPT), 
+                                x_pixels, y_pixels, 
+                                1, 
+                                gdal.GDT_Float32, 
+                                options=["COMPRESS=LZW"])
+        
+        assert comb.dtype == np.float32, "The dtype of the combined acceptability matrix is not np.float32"
+
+        dataset.GetRasterBand(1).WriteArray(comb)   
+        dataset.SetGeoTransform(geotrans)
+        dataset.SetProjection(proj)
+        dataset.FlushCache()
+        dataset=None
+
+        # Resample to XXm
+        Agg = gdal.Warp(str(manager.OUT_ACCEPT_100M), 
+                        str(manager.OUT_ACCEPT), 
+                        xRes=resample_size, 
+                        yRes=resample_size, 
+                        resampleAlg='Average')
+        Agg.FlushCache()
+        Agg = None
+
+        done.append(steps_acceptability.COMPUTE_MEAN_ACCEPT)
+
+    return done

wolfhece/acceptability/func.py

@@ -1328,9 +1328,9 @@ def compute_vulnerability4scenario(manager:Accept_Manager):
             array_mod = gdal.Open(str(curfile))
             array_mod = np.array(array_mod.GetRasterBand(1).ReadAsArray())
 
-            ij = np.where(array_mod == 1)
-            array_vuln[ij] = 1
-            array_code[ij] = 1
+            ij = np.argwhere(array_mod == 1)
+            array_vuln[ij[:,0], ij[:,1]] = 1
+            array_code[ij[:,0], ij[:,1]] = 1
 
     dst_filename= str(manager.TMP_VULN)
     y_pixels, x_pixels = array_vuln.shape  # number of pixels in x
@@ -1382,11 +1382,20 @@ def match_vulnerability2sim(inRas:Path, outRas:Path, MODREC:Path):
     ds = gdal.Translate(outRas, ds, projWin = [minx, maxy, maxx, miny])
     ds = None
 
+
+@nb.jit(nopython=True, boundscheck=False, inline='always')
+def update_accept(accept, model_h, ij, bounds, loc_accept):
+    for idx in range(len(bounds)):
+        for i,j in ij:
+            if bounds[idx,0] < model_h[i,j] <= bounds[idx,1]:
+                accept[i,j] = loc_accept[idx]
+
 def compute_acceptability(manager:Accept_Manager,
            model_h:np.ndarray,
            vulnerability:np.ndarray,
            interval:int,
-           geo_projection):
+           geo_projection:tuple,
+           save_to_file:bool=True) -> np.ndarray:
 
     """
     Compute the local acceptability based on :
@@ -1394,7 +1403,7 @@ def compute_acceptability(manager:Accept_Manager,
         - the water depth
         - the matrices
 
-    :param dirsnames: the Dirs_Names object from the calling function
+    :param manager: the Accept_Manager object from the calling function
     :param model_h: the water depth matrix
     :param vulnerability: the vulnerability matrix
     :param interval: the return period
@@ -1404,48 +1413,48 @@ def compute_acceptability(manager:Accept_Manager,
 
     logging.info(interval)
 
-    Qfile = pd.read_csv(manager.POINTS_CSV)
+    points_accept = pd.read_csv(manager.POINTS_CSV)
 
-    Qfile = Qfile[Qfile["Interval"]==interval]
-    Qfile = Qfile.reset_index()
+    points_accept = points_accept[points_accept["Interval"]==interval]
+    points_accept = points_accept.reset_index()
 
-    x,y = vulnerability.shape
-    accept = np.zeros((x,y))
+    accept = np.zeros(vulnerability.shape, dtype=np.float32)
 
-    ij_1 = np.where(vulnerability == 1)
-    ij_2 = np.where(vulnerability == 2)
-    ij_3 = np.where(vulnerability == 3)
-    ij_4 = np.where(vulnerability == 4)
-    ij_5 = np.where(vulnerability == 5)
+    bounds = np.asarray([[0., 0.02], [0.02, 0.3], [0.3, 1], [1, 2.5], [2.5, 1000]], dtype=np.float32)
 
-    bounds = [(0., 0.02), (0.02, 0.3), (0.3, 1), (1, 2.5), (2.5, 1000)]
+    for i in range(1,6):
+        ij = np.argwhere(vulnerability == i)
 
-    accept_1 = [Qfile["h-0"][4], Qfile["h-0.02"][4], Qfile["h-0.3"][4], Qfile["h-1"][4], Qfile["h-2.5"][4]]
-    accept_2 = [Qfile["h-0"][3], Qfile["h-0.02"][3], Qfile["h-0.3"][3], Qfile["h-1"][3], Qfile["h-2.5"][3]]
-    accept_3 = [Qfile["h-0"][2], Qfile["h-0.02"][2], Qfile["h-0.3"][2], Qfile["h-1"][2], Qfile["h-2.5"][2]]
-    accept_4 = [Qfile["h-0"][1], Qfile["h-0.02"][1], Qfile["h-0.3"][1], Qfile["h-1"][1], Qfile["h-2.5"][1]]
-    accept_5 = [Qfile["h-0"][0], Qfile["h-0.02"][0], Qfile["h-0.3"][0], Qfile["h-1"][0], Qfile["h-2.5"][0]]
+        idx_pts = 5-i
+        accept_pts = [points_accept["h-0"][idx_pts], 
+                      points_accept["h-0.02"][idx_pts], 
+                      points_accept["h-0.3"][idx_pts], 
+                      points_accept["h-1"][idx_pts], 
+                      points_accept["h-2.5"][idx_pts]]
+        
+        update_accept(accept, model_h, ij, bounds, accept_pts)
 
-    accept[:,:] = -99999
-    for ij, loc_accept in zip([ij_1, ij_2, ij_3, ij_4, ij_5], [accept_1, accept_2, accept_3, accept_4, accept_5]):
-        if len(ij[0]) > 0:
-            for idx, (min_bound, max_bound) in enumerate(bounds):
-                loc_ij = np.where((model_h[ij] > min_bound) & (model_h[ij] <= max_bound))
-                accept[ij[0][loc_ij], ij[1][loc_ij]] = loc_accept[idx]
+    if save_to_file:
+        #save raster
+        dst_filename = str(manager.TMP_QFILES / "Q{}.tif".format(interval))
 
-    #save raster
-    dst_filename = str(manager.TMP_QFILES / "Q{}.tif".format(interval))
+        y_pixels, x_pixels = accept.shape  # number of pixels in x
+        driver = gdal.GetDriverByName('GTiff')
+        dataset = driver.Create(dst_filename, 
+                                x_pixels, y_pixels, 
+                                1, 
+                                gdal.GDT_Float32,  
+                                options=["COMPRESS=LZW"])
 
-    y_pixels, x_pixels = accept.shape  # number of pixels in x
-    driver = gdal.GetDriverByName('GTiff')
-    dataset = driver.Create(dst_filename, x_pixels, y_pixels, 1, gdal.GDT_Float32,  options=["COMPRESS=LZW"])
-    dataset.GetRasterBand(1).WriteArray(accept.astype(np.float32))
+        dataset.GetRasterBand(1).WriteArray(accept.astype(np.float32))
 
-    geotrans, proj = geo_projection
-    dataset.SetGeoTransform(geotrans)
-    dataset.SetProjection(proj)
-    dataset.FlushCache()
-    dataset = None
+        geotrans, proj = geo_projection
+        dataset.SetGeoTransform(geotrans)
+        dataset.SetProjection(proj)
+        dataset.FlushCache()
+        dataset = None
+
+    return accept
 
 def shp_to_raster(vector_fn:str, raster_fn:str, pixel_size:float = 1., manager:Accept_Manager = None):
     """

wolfhece/apps/version.py

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

wolfhece/libs/WolfOGL.c

@@ -20436,7 +20436,7 @@ static PyObject *__pyx_f_7wolfogl_mapColor(float __pyx_v_zValue, __Pyx_memviewsl
  *     if zValue <= colorValues[0]:
  *         return colorPalette[0,:]             # <<<<<<<<<<<<<<
  *     elif (zValue >= colorValues[paletteSize-1]):
- *         return colorPalette[-1,:]
+ *         return colorPalette[paletteSize-1,:]
  */
     __Pyx_XDECREF(__pyx_r);
     __pyx_t_3.data = __pyx_v_colorPalette.data;
@@ -20473,7 +20473,7 @@ __pyx_t_4 = __pyx_memoryview_fromslice(__pyx_t_3, 1, (PyObject *(*)(char *)) __p
  *     if zValue <= colorValues[0]:
  *         return colorPalette[0,:]
  *     elif (zValue >= colorValues[paletteSize-1]):             # <<<<<<<<<<<<<<
- *         return colorPalette[-1,:]
+ *         return colorPalette[paletteSize-1,:]
  *     else:
  */
   __pyx_t_1 = (__pyx_v_paletteSize - 1);
@@ -20483,7 +20483,7 @@ __pyx_t_4 = __pyx_memoryview_fromslice(__pyx_t_3, 1, (PyObject *(*)(char *)) __p
     /* "WolfOGL.pyx":1585
  *         return colorPalette[0,:]
  *     elif (zValue >= colorValues[paletteSize-1]):
- *         return colorPalette[-1,:]             # <<<<<<<<<<<<<<
+ *         return colorPalette[paletteSize-1,:]             # <<<<<<<<<<<<<<
  *     else:
  *         for i in range(1,paletteSize):
  */
@@ -20492,7 +20492,7 @@ __pyx_t_4 = __pyx_memoryview_fromslice(__pyx_t_3, 1, (PyObject *(*)(char *)) __p
     __pyx_t_3.memview = __pyx_v_colorPalette.memview;
     __PYX_INC_MEMVIEW(&__pyx_t_3, 1);
     {
-    Py_ssize_t __pyx_tmp_idx = -1L;
+    Py_ssize_t __pyx_tmp_idx = (__pyx_v_paletteSize - 1);
     Py_ssize_t __pyx_tmp_stride = __pyx_v_colorPalette.strides[0];
         __pyx_t_3.data += __pyx_tmp_idx * __pyx_tmp_stride;
 }
@@ -20513,13 +20513,13 @@ __pyx_t_4 = __pyx_memoryview_fromslice(__pyx_t_3, 1, (PyObject *(*)(char *)) __p
  *     if zValue <= colorValues[0]:
  *         return colorPalette[0,:]
  *     elif (zValue >= colorValues[paletteSize-1]):             # <<<<<<<<<<<<<<
- *         return colorPalette[-1,:]
+ *         return colorPalette[paletteSize-1,:]
  *     else:
  */
   }
 
   /* "WolfOGL.pyx":1587
- *         return colorPalette[-1,:]
+ *         return colorPalette[paletteSize-1,:]
  *     else:
  *         for i in range(1,paletteSize):             # <<<<<<<<<<<<<<
  *             if zValue <= colorValues[i]:
@@ -20756,7 +20756,7 @@ __pyx_t_4 = __pyx_memoryview_fromslice(__pyx_t_3, 1, (PyObject *(*)(char *)) __p
       }
 
       /* "WolfOGL.pyx":1587
- *         return colorPalette[-1,:]
+ *         return colorPalette[paletteSize-1,:]
  *     else:
  *         for i in range(1,paletteSize):             # <<<<<<<<<<<<<<
  *             if zValue <= colorValues[i]:

wolfhece/libs/WolfOGL.pyx

@@ -1582,7 +1582,7 @@ cpdef mapColor(float zValue, double[:] colorValues, int paletteSize, double[:,:]
     if zValue <= colorValues[0]:
         return colorPalette[0,:]
     elif (zValue >= colorValues[paletteSize-1]):
-        return colorPalette[-1,:]
+        return colorPalette[paletteSize-1,:]
     else:
         for i in range(1,paletteSize):
             if zValue <= colorValues[i]:

{wolfhece-2.1.29.dist-info → wolfhece-2.1.30.dist-info}/METADATA

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

{wolfhece-2.1.29.dist-info → wolfhece-2.1.30.dist-info}/RECORD

@@ -58,11 +58,10 @@ wolfhece/wolfresults_2D.py,sha256=wF-wIyqpTrUJX_fT-QCVuNxLZCgUsqK9ptGz8izpyIQ,16
 wolfhece/xyz_file.py,sha256=aQOcTHkHRhXHxL_WxTHwzygp6e47San7SHSpxKQU0dw,5457
 wolfhece/acceptability/Parallels.py,sha256=wpCdwkqR6PAFeRkV5TvSSL33Vf368j-bvYcl7D1Y-sc,3695
 wolfhece/acceptability/__init__.py,sha256=hfgoPKLDpX7drN1Vpvux-_5Lfyc_7feT2C2zQr5v-Os,258
-wolfhece/acceptability/acceptability.py,sha256=usCGc5Yn9zqA9RxZDxCL957_SOEbLVfjAqZ7EBCoi0A,22184
-wolfhece/acceptability/acceptability1.py,sha256=rf1Bu2JuyOPwMxvez7z5vCXrePAV486hyVM5g1f40g4,13045
+wolfhece/acceptability/acceptability.py,sha256=xhLwqVqUjlBm29yQK23cr9pr87Z5PB3Lzr1Kw8DA5D4,24145
 wolfhece/acceptability/acceptability_gui.py,sha256=zzbHd_e90fLhbgrdBlnWmBWBO8ZBwb8vikhl-2Rdy0M,12020
 wolfhece/acceptability/cli.py,sha256=pIh9hIbM5RQFh3EBQJB2jWJ8F2M4l-D6qGoewXROE1M,7102
-wolfhece/acceptability/func.py,sha256=cEhCNITNtByR8Yu8JNddzN4NpUNczABykPALOULJLh8,61206
+wolfhece/acceptability/func.py,sha256=z4CI2OYtVa1vfC_v5dEhgG3uA1IijppfwewJMBDPt6g,61192
 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
@@ -73,7 +72,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=EjEjZGuWV-8ZfHhnFH4XLrrtB-YpzPDVhFzRrjgFUzI,2624
-wolfhece/apps/version.py,sha256=Qdfdhlr83QguXgzhqvMXWV1V9PBFkF57mUmEltEzFbM,388
+wolfhece/apps/version.py,sha256=DOnhV0acM8wlohylXhs6wwbgGzeJWQwuSC3SgXqFsRg,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
@@ -173,8 +172,8 @@ 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/WolfOGL.c,sha256=wYazkWV1hDvO41YM4bDZOgYBBfoDYedc-DDgShBGiZA,1753612
-wolfhece/libs/WolfOGL.pyx,sha256=NR-PLXp6KvxsyU1xHaacIxve3nKC-KPGhZsTdXj9E1w,80267
+wolfhece/libs/WolfOGL.c,sha256=Dm_4cI9NHFAMhs4cskjcQStpeIYjedOrHPqlcHeQVAk,1753700
+wolfhece/libs/WolfOGL.pyx,sha256=YmA3NPLt9zPo-UarGnz33dFdSmAc2Vaul5I1_0EWYKo,80278
 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
@@ -202,7 +201,7 @@ wolfhece/libs/vcomp100.dll,sha256=NKvXc8hc4MrFa9k8ErALA6OmldGfR3zidaZPCZhMVJI,57
 wolfhece/libs/vcruntime140.dll,sha256=YYMpkONk3KW_osYdkw8ArKrm0aqjEwOSQDRVrpoRJaU,89880
 wolfhece/libs/vcruntime140_1.dll,sha256=FVS1gClo_bJwWmfLthWF6VYLnkKdBDpap0LvPJu_tr8,37240
 wolfhece/libs/verify_license.cp310-win_amd64.pyd,sha256=-lobNXvqiN7vNl7zzrZWOBPsGW13qT77JWiSy2D3FCk,92672
-wolfhece/libs/wolfogl.cp310-win_amd64.pyd,sha256=Yj-fHOu02Ln24hKcIvCmMZAV7VDBpNxeSZXpDe44iWY,286720
+wolfhece/libs/wolfogl.cp310-win_amd64.pyd,sha256=K6HTq5bFSRv9y-k6wbdO4qMPJcZQKvozCYThsltx6Yk,286720
 wolfhece/libs/wolfpy.cp310-win_amd64.pyd,sha256=6omqEaxmQll-Gg24e90wVomAB9rO_tyyOES2FewXn58,36457472
 wolfhece/libs/zlib1.dll,sha256=E9a0e62VgmG1A8ohZzhVCmmfGtbyXxXu4aFeADTNJ30,77824
 wolfhece/libs/GL/gl.h,sha256=IhsS_fOLa8GW9MpiLZebe9QYRy6uIB_qK_uQMWMOoeg,46345
@@ -281,8 +280,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.29.dist-info/METADATA,sha256=CR6XfFiJ-Gm_rvZi-D7OXxMjiwMk0SiImv_sX1p_4kc,2356
-wolfhece-2.1.29.dist-info/WHEEL,sha256=-oYQCr74JF3a37z2nRlQays_SX2MqOANoqVjBBAP2yE,91
-wolfhece-2.1.29.dist-info/entry_points.txt,sha256=MAG6NrF64fcxiVNb2g1JPYPGcn9C0HWtqqNurB83oX0,330
-wolfhece-2.1.29.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.29.dist-info/RECORD,,
+wolfhece-2.1.30.dist-info/METADATA,sha256=3IcGhCz-MaGj4jP2HATNkudS-Ae869L61Ec7nyjt5rE,2356
+wolfhece-2.1.30.dist-info/WHEEL,sha256=rWxmBtp7hEUqVLOnTaDOPpR-cZpCDkzhhcBce-Zyd5k,91
+wolfhece-2.1.30.dist-info/entry_points.txt,sha256=MAG6NrF64fcxiVNb2g1JPYPGcn9C0HWtqqNurB83oX0,330
+wolfhece-2.1.30.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.30.dist-info/RECORD,,

{wolfhece-2.1.29.dist-info → wolfhece-2.1.30.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.0.3)
+Generator: setuptools (71.0.4)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

wolfhece/acceptability/acceptability1.py

@@ -1,211 +0,0 @@
-# import pandas as pd
-# import Parallels
-# import os
-# import func
-# from osgeo import gdal
-# import fiona
-# import glob
-# import numpy as np
-# import geopandas as gpd
-
-# def Vulnerability2(main_dir, resolution):
-#     os.chdir(main_dir)
-#     print("STEP2: convert vectors to raster based on their vulnerability values")
-#     layer = fiona.listlayers(os.getcwd()+"//TEMP//DATABASES//SA_database_final_V.gpkg")
-#     database = os.getcwd()+"//TEMP//DATABASES//SA_database_final_V.gpkg"
-#     extent = os.getcwd()+"//INPUT//STUDY_AREA//Bassin_SA.shp"
-#     pixel=resolution
-#     attribute = "Vulne"
-#     parallel_v2r(layer, database, extent, attribute, pixel)
-#     attribute = "Code"
-#     parallel_v2r(layer, database, extent, attribute, pixel) 
-
-# def base_data_creation(main_dir, Original_gdb, Study_Area, CaPa_Walloon, PICC_Walloon):
-#     #Change the directory
-#     os.chdir(main_dir)
-#     # Step 1, Clip GDB data
-#     file_path=os.getcwd()+"//INPUT//DATABASE//"+str(Original_gdb)
-#     Study_Area=os.getcwd()+"//INPUT//STUDY_AREA//"+str(Study_Area)
-#     data_type="OpenfileGDB"
-#     number_procs = 8
-#     output_gpkg = os.getcwd()+"//TEMP//DATABASES//SA_database.gpkg"
-#     paths = pd.read_csv(os.getcwd()+"//INPUT//CSVs//Vulnerability_matrix_new1.csv", sep=",", encoding='latin-1')
-#     paths["subfolder"]=None
-#     x, y = paths.shape
-#     for i in range(x):
-#        a=paths["Path"][i].split('/')
-#        paths["subfolder"][i]=a[1]
-#     layers = paths["subfolder"].to_list()
-#     Parallels.parallel_gpd_clip(layers, file_path, Study_Area, output_gpkg, data_type, number_procs)
-#     # Step 2, Clip Cadaster data
-#     file_path=os.getcwd()+"//INPUT//DATABASE//"+str(CaPa_Walloon)
-#     data_type='GPKG'
-#     number_procs = 8
-#     output_gpkg = os.getcwd()+"//TEMP//DATABASES//SA_CaPa.gpkg"
-#     layers = ["CaBu", "CaPa"]
-#     Parallels.parallel_gpd_clip(layers, file_path, Study_Area, output_gpkg, data_type, number_procs)
-#     # Step 3, Clip PICC data
-#     file_path=os.getcwd()+"//INPUT//DATABASE//"+str(PICC_Walloon)
-#     data_type='OpenfileGDB'
-#     number_procs = 8
-#     output_gpkg = os.getcwd()+"//TEMP//DATABASES//SA_PICC.gpkg"
-#     layers=['CONSTR_BATIEMPRISE']
-#     Parallels.parallel_gpd_clip(layers, file_path, Study_Area, output_gpkg, data_type, number_procs)
-# 	#Step 4, create database based on changes in report
-#     input_database=os.getcwd()+"//TEMP//DATABASES//SA_database.gpkg"
-#     layers = fiona.listlayers(os.getcwd()+"//TEMP//DATABASES//SA_database.gpkg")
-#     walous = ["WALOUS_2018_LB72_112", "WALOUS_2018_LB72_31", "WALOUS_2018_LB72_32", "WALOUS_2018_LB72_331",
-#             "WALOUS_2018_LB72_332", "WALOUS_2018_LB72_333", "WALOUS_2018_LB72_34"]
-#     data_type="GPKG"
-#     PICC = gpd.read_file(os.getcwd()+"//TEMP//DATABASES//SA_PICC.gpkg", driver="GPKG", layer = 'CONSTR_BATIEMPRISE')
-#     CaPa = gpd.read_file(os.getcwd()+"//TEMP//DATABASES//SA_CaPa.gpkg", driver='GPKG', layer= 'CaPa')
-#     output_database = os.getcwd()+"//TEMP//DATABASES//SA_database_final.gpkg"
-#     for i in range(len(layers)):
-#         print(i)
-#         func.data_modification(input_database, data_type, layers[i], walous, output_database, PICC, CaPa)
-#     func.shp_to_raster(os.getcwd()+"//INPUT//DATABASE//CE_IGN_TOP10V/CE_IGN_TOP10V.shp", os.getcwd()+"//TEMP//DATABASES//CE_IGN_TOP10V.tiff")
-#     #Pre-processing for Vulnerability
-#     layers = fiona.listlayers(os.getcwd()+"//TEMP//DATABASES//SA_database_final.gpkg")
-#     paths = pd.read_csv(os.getcwd()+"//INPUT//CSVs//Vulnerability_matrix_new1.csv", sep=",", encoding='latin-1')
-#     paths[["name", "name1"]] = paths["Path"].str.split("/", expand=True)
-#     names = paths["name1"].to_list()
-#     list_shp = list(set(names).difference(layers))
-#     print("Excluded layers due to no features in shapefiles:")
-#     print(list_shp)
-#     paths1 =paths[~paths["name1"].isin(list_shp)]
-#     a,b = paths1.shape
-#     print("STEP1: Saving the database for Vulnerability with attributes Vulne and Code")
-#     for i in range(a):
-#            shp = gpd.read_file(os.getcwd()+"//TEMP//DATABASES//SA_database_final.gpkg",
-#                                             driver='GPKG',
-#                                             layer=paths1["name1"][i])
-#            x, y = shp.shape
-#            if x > 0:
-#              shp["Path"] = paths["name1"][i]
-#              shp["Vulne"] = paths["Vulne"][i]
-#              shp["Code"] = paths["Code"][i]
-#              shp = shp[["geometry", "Path", "Vulne","Code"]]
-#              shp.to_file(os.getcwd()+"//TEMP//DATABASES//SA_database_final_V.gpkg",
-#                                         driver='GPKG',
-#                                         layer=paths["name1"][i])
-#     print("STEP2: convert vectors to raster based on their vulnerability values")
-#     layer = fiona.listlayers(os.getcwd()+"//TEMP//DATABASES//SA_database_final_V.gpkg")
-#     database = os.getcwd()+"//TEMP//DATABASES//SA_database_final_V.gpkg"
-#     extent = os.getcwd()+"//INPUT//STUDY_AREA//Bassin_SA.shp"
-#     attribute = "Vulne"
-#     Parallels.parallel_v2r(layer, database, extent, attribute)
-#     attribute = "Code"
-#     Parallels.parallel_v2r(layer, database, extent, attribute)    
-# #
-# def Vulnerability(main_dir,sc,AOI):
-#     print("Starting VULNERABILITY computations at 1 m resolution")
-#     os.chdir(main_dir)
-# #    layers = fiona.listlayers(os.getcwd()+"//TEMP//DATABASES//SA_database_final.gpkg")
-# #    # load the paths from csv with Vulne values
-# #    paths = pd.read_csv(os.getcwd()+"//INPUT//CSVs//Vulnerability_matrix_new1.csv", sep=",", encoding='latin-1')
-# #    paths[["name", "name1"]] = paths["Path"].str.split("/", expand=True)
-# #    #names = paths["name1"].to_list()
-# #    # loop for loading all shapefiles with the names matching with vulnerability matrix
-# #    names = paths["name1"].to_list()
-# #    list_shp = list(set(names).difference(layers))
-# #    print("Excluded layers due to no features in shapefiles:")
-# #    print(list_shp)
-# #    paths1 =paths[~paths["name1"].isin(list_shp)]
-# #    a,b = paths1.shape
-# #    print("STEP1: Saving the database for Vulnerability with attributes Vulne and Code")
-# #    for i in range(a):
-# #           shp = gpd.read_file(os.getcwd()+"//TEMP//DATABASES//SA_database_final.gpkg",
-# #                                            driver='GPKG',
-# #                                            layer=paths1["name1"][i])
-# #           x, y = shp.shape
-# #           if x > 0:
-# #             shp["Path"] = paths["name1"][i]
-# #             shp["Vulne"] = paths["Vulne"][i]
-# #             shp["Code"] = paths["Code"][i]
-# #             shp = shp[["geometry", "Path", "Vulne","Code"]]
-# #             shp.to_file(os.getcwd()+"//TEMP//DATABASES//SA_database_final_V.gpkg",
-# #                                        driver='GPKG',
-# #                                        layer=paths["name1"][i])
-# #    print("STEP2: convert vectors to raster based on their vulnerability values")
-# #    layer = fiona.listlayers(os.getcwd()+"//TEMP//DATABASES//SA_database_final_V.gpkg")
-# #    database = os.getcwd()+"//TEMP//DATABASES//SA_database_final_V.gpkg"
-# #    extent = os.getcwd()+"//INPUT//STUDY_AREA//Bassin_SA.shp"
-# #    attribute = "Vulne"
-# #    Parallels.parallel_v2r(layer, database, extent, attribute)
-# #    attribute = "Code"
-# #    Parallels.parallel_v2r(layer, database, extent, attribute)    
-#     bu = glob.glob(os.getcwd()+"//INPUT//REMOVED_BUILDINGS//Scenario"+str(sc)+"//*.shp")
-#     if len(bu)>0:
-#          bu_PICC = os.getcwd()+"//INPUT//REMOVED_BUILDINGS//Scenario"+str(sc)+"//Removed_Buildings_PICC.shp" 
-#          bu_CaBu = os.getcwd()+"//INPUT//REMOVED_BUILDINGS//Scenario"+str(sc)+"//Removed_Buildings_CaBu.shp"
-#          func.shp_to_raster(bu_PICC, os.getcwd()+"//TEMP//REMOVED_BUILDINGS//Scenario"+str(sc)+"//Removed_Buildings_PICC.tiff")
-#          func.shp_to_raster(bu_CaBu, os.getcwd()+"//TEMP//REMOVED_BUILDINGS//Scenario"+str(sc)+"//Removed_Buildings_CaBu.tiff")
-#     else:
-#          print("No buildings were removed in water depth analysis OR No shapefiles in INPUT/REMOVED_BUILDINGS/Scenario"+str(sc))
-#     print("STEP3: Generate Vulnerability rasters 1m")
-#     attribute="Vulne"
-#     Output_tiff = os.getcwd()+"//TEMP//VULNERABILITY//Scenario"+str(sc)+"//Vulnerability_SA.tiff"
-#     func.Comp_Vulnerability(Output_tiff, attribute,sc)
-#     attribute = "Code"
-#     Output_tiff = os.getcwd()+"//TEMP//VULNERABILITY//Scenario"+str(sc)+"//Vulnerability_Code_SA.tiff"
-#     print(Output_tiff)
-#     func.Comp_Vulnerability(Output_tiff, attribute,sc)
-#     print("STEP4: Save Vulnerability files for the area of interest")
-#     func.match_vuln_modrec(os.getcwd() + "//TEMP//DATABASES//CE_IGN_TOP10V/CE_IGN_TOP10V.tiff",
-#                            os.getcwd() + "//TEMP//Masked/River_extent.tiff", os.getcwd()+"//INPUT//WATER_DEPTH//Scenario"+str(sc)+"//T1000.tif")
-#     func.match_vuln_modrec(os.getcwd() + "//TEMP//VULNERABILITY//Scenario"+str(sc)+"//Vulnerability_SA.tiff",
-#                            os.getcwd() + "//OUTPUT//VULNERABILITY//Scenario"+str(sc)+"Vulnerability_"+str(AOI)+".tiff", os.getcwd()+"//INPUT//WATER_DEPTH//Scenario"+str(sc)+"//T1000.tif")
-#     func.match_vuln_modrec(os.getcwd() + "//TEMP//VULNERABILITY//Scenario"+str(sc)+"//Vulnerability_Code_SA.tiff",
-#                            os.getcwd() + "//OUTPUT//VULNERABILITY//Scenario"+str(sc)+"//Vulnerability_Code"+str(AOI)+".tiff", os.getcwd()+"//INPUT//WATER_DEPTH//Scenario"+str(sc)+"//T1000.tif")
-
-# def Vulnerability2(main_dir, attribute):
-#     os.chdir(main_dir)
-#     Output_tiff = os.getcwd()+"//OUTPUT//VULNERABILITY//Vulnerability_Code.tiff"
-#     func.Comp_Vulnerability(Output_tiff, attribute)
-#     #func.match_vuln_modrec(os.getcwd() + "//TEMP//DATABASES//CE_IGN_TOP10V/CE_IGN_TOP10V.tiff",
-#     #                       os.getcwd() + "//TEMP//Masked/River_extent.tiff")
-#     #func.match_vuln_modrec(os.getcwd() + "//OUTPUT//VULNERABILITY//Vulnerability.tiff",
-#     #                       os.getcwd() + "//TEMP//Masked/Vulnerability_extent.tiff")
-#     #func.match_vuln_modrec(os.getcwd() + "//OUTPUT//VULNERABILITY//Vulnerability_Code.tiff",
-#     #                       os.getcwd() + "//TEMP//Masked/Vulnerability_Code_extent.tiff")
-
-# def acceptability(main_dir,area_of_interest):
-#     os.chdir(main_dir)
-#     Vulne = gdal.Open(os.getcwd() + "//TEMP//Masked/Vulnerability_extent.tiff")
-#     Vulne = Vulne.GetRasterBand(1).ReadAsArray()
-#     riv = gdal.Open(os.getcwd() + "//TEMP//Masked/River_extent.tiff")
-#     riv = riv.GetRasterBand(1).ReadAsArray()
-#     list1 = ["2", "5", "15", "25", "50", "100", "1000"]
-#     # sample for saving the raster
-#     # mod1 = rasterio.open("G://00_GT_Resilience//Simulations_Theux//Scen_"+str(scen)+"//Theux_1.3K_sim_T1000_h.tif")
-#     Qfile = pd.read_csv(os.getcwd() + "//INPUT//CSVs//Book2.csv")
-#     # run vul-mod for 4 return intervals
-#     x = glob.glob(os.getcwd() + "//INPUT//WATER_DEPTH//*.tiff")
-#     Area_interest = area_of_interest
-#     for i in range(len(list1)):
-#         mod = gdal.Open(x[i])
-#         mod = mod.GetRasterBand(1).ReadAsArray()
-#         mod[mod == 0] = np.nan
-#         mod[riv == 1] = np.nan
-#         func.VulMod(Qfile, mod, Vulne, list1[i], Area_interest)
-#     ax=locals()
-#     list1=["2","5", "15","25", "50", "100", "1000"]
-#     qs= glob.glob(os.getcwd()+"//TEMP//Q_files//*.tiff")
-#     for i in range(len(list1)):
-#         ax["vm"+str(i)] = gdal.Open(qs[i])
-#         ax["vm"+str(i)]  = ax["vm"+str(i)].GetRasterBand(1).ReadAsArray()
-#     #Remove nans from other Q files for final acceptability computation
-#     for i in range(len(list1)-1):
-#         ax["vm"+str(i)+str(1)] = np.nan_to_num(ax["vm"+str(i)], nan=0)
-#         ax["vm"+str(i)+str(1)][np.isnan(ax["vm"+str(len(list1))])] = np.nan
-#     pond = pd.read_csv(os.getcwd()+"//INPUT//CSVs//Ponderation.csv")
-#     comb = vm6*float(pond.iloc[6,1]) + vm51*float(pond.iloc[5,1]) + vm41*float(pond.iloc[4,1]) + vm31*float(pond.iloc[3,1]) + vm21*float(pond.iloc[2,1]) + vm11*float(pond.iloc[1,1]) +vm01*float(pond.iloc[0,1])
-#     dst_filename = os.getcwd()+"//OUTPUT//ACCEPTABILITY//Acceptability"+str(area_of_interest)+".tiff"
-#     y_pixels, x_pixels = comb.shape  # number of pixels in x
-#     driver = gdal.GetDriverByName('GTiff')
-#     dataset = driver.Create(dst_filename, x_pixels, y_pixels, gdal.GDT_Float32, 1, options=["COMPRESS=LZW"])
-#     dataset.GetRasterBand(1).WriteArray(comb.astype(np.float32))
-#     input_raster = os.getcwd()+"//OUTPUT//ACCEPTABILITY//Acceptability"+str(area_of_interest)+".tiff"
-#     output_raster = os.getcwd()+"//OUTPUT//ACCEPTABILITY//Acceptability"+str(area_of_interest)+"_100m.tiff"
-#     Agg = gdal.Warp(output_raster, input_raster, xRes=100, yRes=100, resampleAlg='Average')
-#     Agg = None